diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index ff458969e3..7648afc930 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -1,65 +1,84 @@ +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("ic") +@ObfuscatedName("iw") +@Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lma;" - ) - static GZipDecompressor gzipDecompressor; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1188846239 - ) - static int field3176; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1207757515 - ) - int groupCount; - @ObfuscatedName("s") - int[] groupIds; - @ObfuscatedName("t") - int[] groupNameHashes; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lmc;" - ) - IntHashTable groupNameHashTable; - @ObfuscatedName("o") - int[] groupCrcs; @ObfuscatedName("x") - int[] groupVersions; - @ObfuscatedName("w") - int[] fileCounts; - @ObfuscatedName("g") - int[][] fileIds; - @ObfuscatedName("m") - int[][] fileNameHashes; - @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lmc;" + descriptor = "Lmw;" ) - IntHashTable[] fileNameHashTables; - @ObfuscatedName("d") - Object[] groups; - @ObfuscatedName("h") - Object[][] files; - @ObfuscatedName("q") + @Export("gzipDecompressor") + static GZipDecompressor gzipDecompressor; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1382012253 + intValue = 910501157 ) - public int hash; + static int field3173; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 775749307 + ) + @Export("groupCount") + int groupCount; + @ObfuscatedName("l") + @Export("groupIds") + int[] groupIds; + @ObfuscatedName("m") + @Export("groupNameHashes") + int[] groupNameHashes; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lmj;" + ) + @Export("groupNameHashTable") + IntHashTable groupNameHashTable; + @ObfuscatedName("q") + @Export("groupCrcs") + int[] groupCrcs; + @ObfuscatedName("k") + @Export("groupVersions") + int[] groupVersions; @ObfuscatedName("c") + @Export("fileCounts") + int[] fileCounts; + @ObfuscatedName("u") + @Export("fileIds") + int[][] fileIds; + @ObfuscatedName("t") + @Export("fileNameHashes") + int[][] fileNameHashes; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "[Lmj;" + ) + @Export("fileNameHashTables") + IntHashTable[] fileNameHashTables; + @ObfuscatedName("o") + @Export("groups") + Object[] groups; + @ObfuscatedName("n") + @Export("files") + Object[][] files; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1565476679 + ) + @Export("hash") + public int hash; + @ObfuscatedName("r") + @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("f") + @ObfuscatedName("y") + @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); // L: 23 - field3176 = 0; // L: 27 + field3173 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { @@ -67,585 +86,651 @@ public abstract class AbstractArchive { this.shallowFiles = var2; // L: 33 } // L: 34 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1234348933" + garbageValue = "-1837792503" ) + @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = GameShell.method1108(var1, var1.length); // L: 37 - Buffer var2 = new Buffer(DevicePcmPlayerProvider.decompressBytes(var1)); // L: 38 - int var3 = var2.readUnsignedByte(); // L: 39 - if (var3 >= 5 && var3 <= 7) { // L: 40 - if (var3 >= 6) { // L: 41 - var2.readInt(); // L: 42 + int var3 = var1.length; // L: 38 + int var2 = class4.method81(var1, 0, var3); // L: 40 + this.hash = var2; // L: 42 + Buffer var4 = new Buffer(UserComparator3.decompressBytes(var1)); // L: 43 + int var5 = var4.readUnsignedByte(); // L: 44 + if (var5 >= 5 && var5 <= 7) { // L: 45 + if (var5 >= 6) { // L: 46 + var4.readInt(); // L: 47 } - int var4 = var2.readUnsignedByte(); // L: 45 - if (var3 >= 7) { // L: 46 - this.groupCount = var2.method5666(); + int var6 = var4.readUnsignedByte(); + if (var5 >= 7) { + this.groupCount = var4.method5653(); } else { - this.groupCount = var2.readUnsignedShort(); // L: 47 + this.groupCount = var4.readUnsignedShort(); } - int var5 = 0; // L: 48 - int var6 = -1; // L: 49 - this.groupIds = new int[this.groupCount]; // L: 50 - int var7; - if (var3 >= 7) { // L: 51 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52 - this.groupIds[var7] = var5 += var2.method5666(); // L: 53 - if (this.groupIds[var7] > var6) { // L: 54 - var6 = this.groupIds[var7]; - } - } - } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58 - this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59 - if (this.groupIds[var7] > var6) { // L: 60 - var6 = this.groupIds[var7]; - } - } - } - - this.groupCrcs = new int[var6 + 1]; // L: 63 - this.groupVersions = new int[var6 + 1]; // L: 64 - this.fileCounts = new int[var6 + 1]; // L: 65 - this.fileIds = new int[var6 + 1][]; // L: 66 - this.groups = new Object[var6 + 1]; // L: 67 - this.files = new Object[var6 + 1][]; // L: 68 - if (var4 != 0) { // L: 69 - this.groupNameHashes = new int[var6 + 1]; // L: 70 - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71 - this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); - } - - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72 - } - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74 - this.groupCrcs[this.groupIds[var7]] = var2.readInt(); - } - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75 - this.groupVersions[this.groupIds[var7]] = var2.readInt(); - } - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76 - this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); - } - - int var8; + int var7 = 0; + int var8 = -1; + this.groupIds = new int[this.groupCount]; int var9; + if (var5 >= 7) { + for (var9 = 0; var9 < this.groupCount; ++var9) { + this.groupIds[var9] = var7 += var4.method5653(); + if (this.groupIds[var9] > var8) { + var8 = this.groupIds[var9]; + } + } + } else { + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 63 + this.groupIds[var9] = var7 += var4.readUnsignedShort(); // L: 64 + if (this.groupIds[var9] > var8) { // L: 65 + var8 = this.groupIds[var9]; + } + } + } + + this.groupCrcs = new int[var8 + 1]; // L: 68 + this.groupVersions = new int[var8 + 1]; // L: 69 + this.fileCounts = new int[var8 + 1]; // L: 70 + this.fileIds = new int[var8 + 1][]; // L: 71 + this.groups = new Object[var8 + 1]; // L: 72 + this.files = new Object[var8 + 1][]; // L: 73 + if (var6 != 0) { // L: 74 + this.groupNameHashes = new int[var8 + 1]; // L: 75 + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 76 + this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); + } + + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 77 + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 79 + this.groupCrcs[this.groupIds[var9]] = var4.readInt(); + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 80 + this.groupVersions[this.groupIds[var9]] = var4.readInt(); + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 81 + this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); + } + int var10; int var11; int var12; - if (var3 >= 7) { // L: 77 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78 - var8 = this.groupIds[var7]; // L: 79 - var9 = this.fileCounts[var8]; // L: 80 - var5 = 0; // L: 81 - var10 = -1; // L: 82 - this.fileIds[var8] = new int[var9]; // L: 83 + int var13; + int var14; + if (var5 >= 7) { // L: 82 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 83 + var10 = this.groupIds[var9]; // L: 84 + var11 = this.fileCounts[var10]; // L: 85 + var7 = 0; // L: 86 + var12 = -1; // L: 87 + this.fileIds[var10] = new int[var11]; // L: 88 - for (var11 = 0; var11 < var9; ++var11) { // L: 84 - var12 = this.fileIds[var8][var11] = var5 += var2.method5666(); // L: 85 - if (var12 > var10) { // L: 86 - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { // L: 89 + var14 = this.fileIds[var10][var13] = var7 += var4.method5653(); // L: 90 + if (var14 > var12) { // L: 91 + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; // L: 88 + this.files[var10] = new Object[var12 + 1]; // L: 93 } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 92 - var8 = this.groupIds[var7]; // L: 93 - var9 = this.fileCounts[var8]; // L: 94 - var5 = 0; // L: 95 - var10 = -1; // L: 96 - this.fileIds[var8] = new int[var9]; // L: 97 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 97 + var10 = this.groupIds[var9]; // L: 98 + var11 = this.fileCounts[var10]; // L: 99 + var7 = 0; // L: 100 + var12 = -1; // L: 101 + this.fileIds[var10] = new int[var11]; // L: 102 - for (var11 = 0; var11 < var9; ++var11) { // L: 98 - var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); // L: 99 - if (var12 > var10) { // L: 100 - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { // L: 103 + var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104 + if (var14 > var12) { // L: 105 + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; // L: 102 + this.files[var10] = new Object[var12 + 1]; // L: 107 } } - if (var4 != 0) { // L: 105 - this.fileNameHashes = new int[var6 + 1][]; // L: 106 - this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107 + if (var6 != 0) { // L: 110 + this.fileNameHashes = new int[var8 + 1][]; // L: 111 + this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 108 - var8 = this.groupIds[var7]; // L: 109 - var9 = this.fileCounts[var8]; // L: 110 - this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 113 + var10 = this.groupIds[var9]; // L: 114 + var11 = this.fileCounts[var10]; // L: 115 + this.fileNameHashes[var10] = new int[this.files[var10].length]; // L: 116 - for (var10 = 0; var10 < var9; ++var10) { // L: 112 - this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); + for (var12 = 0; var12 < var11; ++var12) { // L: 117 + this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); } - this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); // L: 113 + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118 } } } else { throw new RuntimeException(""); } - } // L: 116 + } // L: 121 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "176946518" + garbageValue = "1666992241" ) + @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - } // L: 118 + } // L: 123 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "273690094" + garbageValue = "1866265901" ) + @Export("takeFile") public byte[] takeFile(int var1, int var2) { - return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121 + return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "1965350454" + garbageValue = "-268941937" ) + @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125 - if (this.files[var1][var2] == null) { // L: 126 - boolean var4 = this.buildFiles(var1, var3); // L: 127 - if (!var4) { // L: 128 - this.loadGroup(var1); // L: 129 - var4 = this.buildFiles(var1, var3); // L: 130 - if (!var4) { // L: 131 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 130 + if (this.files[var1][var2] == null) { // L: 131 + boolean var4 = this.buildFiles(var1, var3); // L: 132 + if (!var4) { // L: 133 + this.loadGroup(var1); // L: 134 + var4 = this.buildFiles(var1, var3); // L: 135 + if (!var4) { // L: 136 return null; } } } - byte[] var5 = Script.method2323(this.files[var1][var2], false); // L: 134 + byte[] var5 = CollisionMap.method3712(this.files[var1][var2], false); // L: 139 if (this.shallowFiles) { - this.files[var1][var2] = null; // L: 135 + this.files[var1][var2] = null; // L: 140 } - return var5; // L: 136 + return var5; // L: 141 } else { return null; } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "49" + garbageValue = "-37" ) + @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 140 - if (this.files[var1][var2] != null) { // L: 141 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 145 + if (this.files[var1][var2] != null) { // L: 146 return true; - } else if (this.groups[var1] != null) { // L: 142 + } else if (this.groups[var1] != null) { // L: 147 return true; } else { - this.loadGroup(var1); // L: 143 - return this.groups[var1] != null; // L: 144 + this.loadGroup(var1); // L: 148 + return this.groups[var1] != null; // L: 149 } } else { - return false; // L: 145 + return false; // L: 150 } } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "5" - ) - public boolean method4251(int var1) { - if (this.files.length == 1) { // L: 149 - return this.tryLoadFile(0, var1); - } else if (this.files[var1].length == 1) { - return this.tryLoadFile(var1, 0); // L: 150 - } else { - throw new RuntimeException(); // L: 151 - } - } - - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "2078810359" + garbageValue = "-1001289587" ) - public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { // L: 155 - return true; + public boolean method4301(int var1) { + if (this.files.length == 1) { // L: 154 + return this.tryLoadFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.tryLoadFile(var1, 0); // L: 155 } else { - this.loadGroup(var1); // L: 156 - return this.groups[var1] != null; // L: 157 + throw new RuntimeException(); // L: 156 } } - @ObfuscatedName("w") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "452985431" + ) + @Export("tryLoadGroup") + public boolean tryLoadGroup(int var1) { + if (this.groups[var1] != null) { // L: 160 + return true; + } else { + this.loadGroup(var1); // L: 161 + return this.groups[var1] != null; // L: 162 + } + } + + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-719435847" + garbageValue = "1015322463" ) + @Export("isFullyLoaded") public boolean isFullyLoaded() { - boolean var1 = true; // L: 162 + boolean var1 = true; // L: 167 - for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163 - int var3 = this.groupIds[var2]; // L: 164 - if (this.groups[var3] == null) { // L: 165 - this.loadGroup(var3); // L: 166 - if (this.groups[var3] == null) { // L: 167 + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 168 + int var3 = this.groupIds[var2]; // L: 169 + if (this.groups[var3] == null) { // L: 170 + this.loadGroup(var3); // L: 171 + if (this.groups[var3] == null) { // L: 172 var1 = false; } } } - return var1; // L: 170 + return var1; // L: 175 } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-21407020" + garbageValue = "1168057688" ) + @Export("groupLoadPercent") int groupLoadPercent(int var1) { - return this.groups[var1] != null ? 100 : 0; // L: 174 175 + return this.groups[var1] != null ? 100 : 0; // L: 179 180 } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-1800797786" + garbageValue = "-1769170354" ) + @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { - if (this.files.length == 1) { // L: 179 + if (this.files.length == 1) { // L: 184 return this.takeFile(0, var1); } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); // L: 180 + return this.takeFile(var1, 0); // L: 185 } else { - throw new RuntimeException(); // L: 181 + throw new RuntimeException(); // L: 186 } } - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "-1118526903" + garbageValue = "-1969973246" ) + @Export("getFile") public byte[] getFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185 - if (this.files[var1][var2] == null) { // L: 186 - boolean var3 = this.buildFiles(var1, (int[])null); // L: 187 - if (!var3) { // L: 188 - this.loadGroup(var1); // L: 189 - var3 = this.buildFiles(var1, (int[])null); // L: 190 - if (!var3) { // L: 191 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 190 + if (this.files[var1][var2] == null) { // L: 191 + boolean var3 = this.buildFiles(var1, (int[])null); // L: 192 + if (!var3) { // L: 193 + this.loadGroup(var1); // L: 194 + var3 = this.buildFiles(var1, (int[])null); // L: 195 + if (!var3) { // L: 196 return null; } } } - byte[] var4 = Script.method2323(this.files[var1][var2], false); // L: 194 - return var4; // L: 195 + byte[] var4 = CollisionMap.method3712(this.files[var1][var2], false); // L: 199 + return var4; // L: 200 } else { return null; } } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)[B", - garbageValue = "89" + descriptor = "(II)[B", + garbageValue = "475787728" ) + @Export("getFileFlat") public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { // L: 199 + if (this.files.length == 1) { // L: 204 return this.getFile(0, var1); } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); // L: 200 + return this.getFile(var1, 0); // L: 205 } else { - throw new RuntimeException(); // L: 201 + throw new RuntimeException(); // L: 206 } } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "450530880" + garbageValue = "1308309481" ) + @Export("loadGroup") void loadGroup(int var1) { - } // L: 204 + } // L: 209 - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "-40" + descriptor = "(IS)[I", + garbageValue = "1393" ) + @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { - return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210 + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1433553741" + descriptor = "(IB)I", + garbageValue = "-118" ) + @Export("getGroupFileCount") public int getGroupFileCount(int var1) { - return this.files[var1].length; // L: 214 + return this.files[var1].length; } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2124979087" - ) - public int getGroupCount() { - return this.files.length; // L: 218 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1681224039" - ) - public void clearGroups() { - for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222 - this.groups[var1] = null; - } - - } // L: 223 - @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1439856856" + descriptor = "(I)I", + garbageValue = "1138802356" ) + @Export("getGroupCount") + public int getGroupCount() { + return this.files.length; // L: 223 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1555898760" + ) + @Export("clearGroups") + public void clearGroups() { + for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 227 + this.groups[var1] = null; + } + + } // L: 228 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-237320932" + ) + @Export("clearFilesGroup") public void clearFilesGroup(int var1) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 231 this.files[var1][var2] = null; } - } // L: 227 + } // L: 232 - @ObfuscatedName("u") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-83" + garbageValue = "-2" ) + @Export("clearFiles") public void clearFiles() { - for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230 - if (this.files[var1] != null) { // L: 231 - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232 + for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 235 + if (this.files[var1] != null) { // L: 236 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 237 this.files[var1][var2] = null; } } } - } // L: 235 + } // L: 240 - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I[II)Z", - garbageValue = "303004992" + garbageValue = "453769668" ) + @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { // L: 238 + if (this.groups[var1] == null) { // L: 243 return false; } else { - int var3 = this.fileCounts[var1]; // L: 239 - int[] var4 = this.fileIds[var1]; // L: 240 - Object[] var5 = this.files[var1]; // L: 241 - boolean var6 = true; // L: 242 + int var3 = this.fileCounts[var1]; // L: 244 + int[] var4 = this.fileIds[var1]; // L: 245 + Object[] var5 = this.files[var1]; // L: 246 + boolean var6 = true; // L: 247 - for (int var7 = 0; var7 < var3; ++var7) { // L: 243 - if (var5[var4[var7]] == null) { // L: 244 - var6 = false; // L: 245 + for (int var7 = 0; var7 < var3; ++var7) { // L: 248 + if (var5[var4[var7]] == null) { // L: 249 + var6 = false; // L: 250 break; } } - if (var6) { // L: 249 + if (var6) { // L: 254 return true; } else { byte[] var18; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251 - var18 = Script.method2323(this.groups[var1], false); // L: 256 + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 + var18 = CollisionMap.method3712(this.groups[var1], false); // L: 261 } else { - var18 = Script.method2323(this.groups[var1], true); // L: 252 - Buffer var8 = new Buffer(var18); // L: 253 - var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254 + var18 = CollisionMap.method3712(this.groups[var1], true); // L: 257 + Buffer var8 = new Buffer(var18); // L: 258 + var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 } - byte[] var20 = DevicePcmPlayerProvider.decompressBytes(var18); // L: 259 - if (this.releaseGroups) { // L: 264 + byte[] var20 = UserComparator3.decompressBytes(var18); // L: 264 + if (this.releaseGroups) { // L: 282 this.groups[var1] = null; } - if (var3 > 1) { // L: 265 - int var9 = var20.length; // L: 266 - --var9; - int var10 = var20[var9] & 255; // L: 267 - var9 -= var10 * var3 * 4; // L: 268 - Buffer var11 = new Buffer(var20); // L: 269 - int[] var12 = new int[var3]; // L: 270 - var11.offset = var9; // L: 271 + if (var3 > 1) { // L: 283 + int var9 = var20.length; // L: 284 + --var9; // L: 285 + int var10 = var20[var9] & 255; + var9 -= var10 * var3 * 4; // L: 286 + Buffer var11 = new Buffer(var20); // L: 287 + int[] var12 = new int[var3]; // L: 288 + var11.offset = var9; // L: 289 int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { // L: 272 - var14 = 0; // L: 273 + for (int var13 = 0; var13 < var10; ++var13) { // L: 290 + var14 = 0; // L: 291 - for (var15 = 0; var15 < var3; ++var15) { // L: 274 - var14 += var11.readInt(); // L: 275 - var12[var15] += var14; // L: 276 + for (var15 = 0; var15 < var3; ++var15) { // L: 292 + var14 += var11.readInt(); // L: 293 + var12[var15] += var14; // L: 294 } } - byte[][] var19 = new byte[var3][]; // L: 279 + byte[][] var19 = new byte[var3][]; // L: 297 - for (var14 = 0; var14 < var3; ++var14) { // L: 280 - var19[var14] = new byte[var12[var14]]; // L: 281 - var12[var14] = 0; // L: 282 + for (var14 = 0; var14 < var3; ++var14) { // L: 298 + var19[var14] = new byte[var12[var14]]; // L: 299 + var12[var14] = 0; // L: 300 } - var11.offset = var9; // L: 284 - var14 = 0; // L: 285 + var11.offset = var9; // L: 302 + var14 = 0; // L: 303 - for (var15 = 0; var15 < var10; ++var15) { // L: 286 - int var16 = 0; // L: 287 + for (var15 = 0; var15 < var10; ++var15) { // L: 304 + int var16 = 0; // L: 305 - for (int var17 = 0; var17 < var3; ++var17) { // L: 288 - var16 += var11.readInt(); // L: 289 - System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 290 - var12[var17] += var16; // L: 291 - var14 += var16; // L: 292 + for (int var17 = 0; var17 < var3; ++var17) { // L: 306 + var16 += var11.readInt(); // L: 307 + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 308 + var12[var17] += var16; // L: 309 + var14 += var16; // L: 310 } } - for (var15 = 0; var15 < var3; ++var15) { // L: 295 - if (!this.shallowFiles) { // L: 296 - var5[var4[var15]] = MenuAction.method2140(var19[var15], false); + for (var15 = 0; var15 < var3; ++var15) { // L: 313 + if (!this.shallowFiles) { // L: 314 + var5[var4[var15]] = AbstractByteArrayCopier.method4069(var19[var15], false); } else { - var5[var4[var15]] = var19[var15]; // L: 297 + var5[var4[var15]] = var19[var15]; // L: 315 } } - } else if (!this.shallowFiles) { // L: 301 - var5[var4[0]] = MenuAction.method2140(var20, false); + } else if (!this.shallowFiles) { // L: 319 + var5[var4[0]] = AbstractByteArrayCopier.method4069(var20, false); } else { - var5[var4[0]] = var20; // L: 302 + var5[var4[0]] = var20; // L: 320 } - return true; // L: 304 + return true; // L: 322 } } } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1161611566" + garbageValue = "-840193001" ) + @Export("getGroupId") public int getGroupId(String var1) { - var1 = var1.toLowerCase(); // L: 308 - return this.groupNameHashTable.get(Timer.hashString(var1)); // L: 309 + var1 = var1.toLowerCase(); // L: 326 + return this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 327 } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)I", - garbageValue = "-117" + descriptor = "(ILjava/lang/String;I)I", + garbageValue = "344989810" ) + @Export("getFileId") public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 313 - return this.fileNameHashTables[var1].get(Timer.hashString(var2)); // L: 314 + var2 = var2.toLowerCase(); // L: 331 + return this.fileNameHashTables[var1].get(UrlRequester.hashString(var2)); // L: 332 } - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-1221134152" + garbageValue = "-1115515997" ) + @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 318 - var2 = var2.toLowerCase(); // L: 319 - int var3 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 320 - if (var3 < 0) { // L: 321 + var1 = var1.toLowerCase(); // L: 336 + var2 = var2.toLowerCase(); // L: 337 + int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 338 + if (var3 < 0) { // L: 339 return false; } else { - int var4 = this.fileNameHashTables[var3].get(Timer.hashString(var2)); // L: 322 - return var4 >= 0; // L: 323 + int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 340 + return var4 >= 0; // L: 341 } } @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-406743682" + garbageValue = "-1708275377" ) + @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 328 - var2 = var2.toLowerCase(); // L: 329 - int var3 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 330 - int var4 = this.fileNameHashTables[var3].get(Timer.hashString(var2)); // L: 331 - return this.takeFile(var3, var4); // L: 332 + var1 = var1.toLowerCase(); // L: 346 + var2 = var2.toLowerCase(); // L: 347 + int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 348 + int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 349 + return this.takeFile(var3, var4); // L: 350 } - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "63" + garbageValue = "-77" ) + @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 336 - var2 = var2.toLowerCase(); // L: 337 - int var3 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 338 - int var4 = this.fileNameHashTables[var3].get(Timer.hashString(var2)); // L: 339 - return this.tryLoadFile(var3, var4); // L: 340 + var1 = var1.toLowerCase(); // L: 354 + var2 = var2.toLowerCase(); // L: 355 + int var3 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 356 + int var4 = this.fileNameHashTables[var3].get(UrlRequester.hashString(var2)); // L: 357 + return this.tryLoadFile(var3, var4); // L: 358 } @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "1277602080" + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "-80" ) + @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); // L: 344 - int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 345 - return this.tryLoadGroup(var2); // L: 346 + var1 = var1.toLowerCase(); // L: 362 + int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 363 + return this.tryLoadGroup(var2); // L: 364 } - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "663022777" + garbageValue = "-2009830657" ) + @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); // L: 350 - int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 351 - if (var2 >= 0) { // L: 352 - this.loadRegionFromGroup(var2); // L: 353 + var1 = var1.toLowerCase(); // L: 368 + int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 369 + if (var2 >= 0) { // L: 370 + this.loadRegionFromGroup(var2); // L: 371 } - } // L: 354 + } // L: 372 - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1179908278" + garbageValue = "-2077847342" ) + @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); // L: 357 - int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 358 - return this.groupLoadPercent(var2); // L: 359 + var1 = var1.toLowerCase(); // L: 375 + int var2 = this.groupNameHashTable.get(UrlRequester.hashString(var1)); // L: 376 + return this.groupLoadPercent(var2); // L: 377 } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1262529684" + ) + static void method4397() { + Tiles.Tiles_minPlane = 99; // L: 48 + TileItem.field1273 = new byte[4][104][104]; // L: 49 + NPC.field1161 = new byte[4][104][104]; // L: 50 + Tiles.field531 = new byte[4][104][104]; // L: 51 + UserComparator2.field3859 = new byte[4][104][104]; // L: 52 + UserComparator10.field2000 = new int[4][105][105]; // L: 53 + class299.field3679 = new byte[4][105][105]; // L: 54 + UserComparator10.field1999 = new int[105][105]; // L: 55 + GrandExchangeOfferOwnWorldComparator.Tiles_hue = new int[104]; // L: 56 + class238.Tiles_saturation = new int[104]; // L: 57 + TileItemPile.Tiles_lightness = new int[104]; // L: 58 + class248.Tiles_hueMultiplier = new int[104]; // L: 59 + class1.field1 = new int[104]; // L: 60 + } // L: 61 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Liw;IS)V", + garbageValue = "512" + ) + static void method4386(AbstractArchive var0, int var1) { + if ((var1 & 536870912) != 0) { // L: 212 + SecureRandomFuture.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 213 + } else if ((var1 & 1073741824) != 0) { // L: 215 + SecureRandomFuture.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 216 + } else { + SecureRandomFuture.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 219 + } + + } // L: 221 } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 2f7fab5335..e228016280 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,66 +1,99 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hh") +@Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - @ObfuscatedName("i") + @ObfuscatedName("dn") @ObfuscatedSignature( - descriptor = "[Lct;" + descriptor = "Lid;" ) - static World[] World_worlds; - @ObfuscatedName("g") + @Export("archive11") + static Archive archive11; + @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lid;" ) - static IndexedSprite logoSprite; + @Export("archive14") + static Archive archive14; AbstractByteArrayCopier() { } // L: 4 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-1021172953" + descriptor = "(B)[B", + garbageValue = "-47" ) + @Export("get") abstract byte[] get(); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1366071744" + descriptor = "([BB)V", + garbageValue = "0" ) + @Export("set") abstract void set(byte[] var1); - @ObfuscatedName("ig") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lhq;I)Ljava/lang/String;", - garbageValue = "506679014" + descriptor = "([BZI)Ljava/lang/Object;", + garbageValue = "1848040279" ) - static String method4028(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 9162 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 9163 - while (true) { - int var3 = var0.indexOf("%" + var2); // L: 9165 - if (var3 == -1) { // L: 9166 - break; - } + public static Object method4069(byte[] var0, boolean var1) { + if (var0 == null) { // L: 7 + return null; + } else if (var0.length > 136) { // L: 8 + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 + var2.set(var0); // L: 11 + return var2; // L: 12 + } else { + return var0; // L: 25 + } + } - var0 = var0.substring(0, var3) + ArchiveDiskActionHandler.method4338(GrandExchangeOfferNameComparator.method230(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 9167 - } + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lcf;B)V", + garbageValue = "2" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1538 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1539 + boolean var1 = var0.isMembersOnly(); // L: 1540 + if (var1 != SoundCache.ItemDefinition_inMembersWorld) { // L: 1542 + class200.method3803(); // L: 1543 + SoundCache.ItemDefinition_inMembersWorld = var1; // L: 1544 } } - return var0; // L: 9171 - } + if (var0.properties != Client.worldProperties) { // L: 1548 + AbstractArchive.method4386(GrandExchangeOffer.archive8, var0.properties); // L: 1549 + } - @ObfuscatedName("kk") + UserComparator6.worldHost = var0.host; // L: 1551 + Client.worldId = var0.id; // L: 1552 + Client.worldProperties = var0.properties; // L: 1553 + Coord.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1554 + Coord.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1555 + class41.port3 = Coord.port1; // L: 1556 + } // L: 1557 + + @ObfuscatedName("jp") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1068531314" + descriptor = "(II)V", + garbageValue = "407362763" ) - static final void Clan_leaveChat() { - PacketBufferNode var0 = Client.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 10705 - var0.packetBuffer.writeByte(0); // L: 10706 - Client.packetWriter.addNode(var0); // L: 10707 - } // L: 10708 + static void method4087(int var0) { + GrandExchangeOffer.tempMenuAction = new MenuAction(); // L: 11020 + GrandExchangeOffer.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11021 + GrandExchangeOffer.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11022 + GrandExchangeOffer.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11023 + GrandExchangeOffer.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11024 + GrandExchangeOffer.tempMenuAction.action = Client.menuActions[var0]; // L: 11025 + } // L: 11026 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index cad6100e20..1ba42782a0 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -1,55 +1,80 @@ 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("kj") +@ObfuscatedName("ky") +@Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "[Lls;" - ) - public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("d") - static int AbstractFont_strike; - @ObfuscatedName("h") - static int AbstractFont_underline; - @ObfuscatedName("a") - static int AbstractFont_previousShadow; - @ObfuscatedName("q") - static int AbstractFont_shadow; - @ObfuscatedName("c") - static int AbstractFont_previousColor; - @ObfuscatedName("f") - static int AbstractFont_color; - @ObfuscatedName("y") - static int AbstractFont_alpha; - @ObfuscatedName("v") - static int AbstractFont_justificationTotal; - @ObfuscatedName("j") - static int AbstractFont_justificationCurrent; - @ObfuscatedName("r") - static Random AbstractFont_random; - @ObfuscatedName("u") - static String[] AbstractFont_lines; - @ObfuscatedName("z") - byte[][] pixels; - @ObfuscatedName("k") - int[] advances; - @ObfuscatedName("s") - int[] widths; @ObfuscatedName("t") - int[] heights; - @ObfuscatedName("i") - int[] leftBearings; + @ObfuscatedSignature( + descriptor = "[Lle;" + ) + @Export("AbstractFont_modIconSprites") + public static IndexedSprite[] AbstractFont_modIconSprites; @ObfuscatedName("o") - int[] topBearings; - @ObfuscatedName("x") - public int ascent; - @ObfuscatedName("w") - public int maxAscent; - @ObfuscatedName("g") - public int maxDescent; + @Export("AbstractFont_strike") + static int AbstractFont_strike; @ObfuscatedName("n") + @Export("AbstractFont_underline") + static int AbstractFont_underline; + @ObfuscatedName("x") + @Export("AbstractFont_previousShadow") + static int AbstractFont_previousShadow; + @ObfuscatedName("p") + @Export("AbstractFont_shadow") + static int AbstractFont_shadow; + @ObfuscatedName("r") + @Export("AbstractFont_previousColor") + static int AbstractFont_previousColor; + @ObfuscatedName("y") + @Export("AbstractFont_color") + static int AbstractFont_color; + @ObfuscatedName("s") + @Export("AbstractFont_alpha") + static int AbstractFont_alpha; + @ObfuscatedName("j") + @Export("AbstractFont_justificationTotal") + static int AbstractFont_justificationTotal; + @ObfuscatedName("w") + @Export("AbstractFont_justificationCurrent") + static int AbstractFont_justificationCurrent; + @ObfuscatedName("v") + @Export("AbstractFont_random") + static Random AbstractFont_random; + @ObfuscatedName("d") + @Export("AbstractFont_lines") + static String[] AbstractFont_lines; + @ObfuscatedName("f") + @Export("pixels") + byte[][] pixels; + @ObfuscatedName("b") + @Export("advances") + int[] advances; + @ObfuscatedName("l") + @Export("widths") + int[] widths; + @ObfuscatedName("m") + @Export("heights") + int[] heights; + @ObfuscatedName("z") + @Export("leftBearings") + int[] leftBearings; + @ObfuscatedName("q") + @Export("topBearings") + int[] topBearings; + @ObfuscatedName("k") + @Export("ascent") + public int ascent; + @ObfuscatedName("c") + @Export("maxAscent") + public int maxAscent; + @ObfuscatedName("u") + @Export("maxDescent") + public int maxDescent; + @ObfuscatedName("e") + @Export("kerning") byte[] kerning; static { @@ -98,13 +123,16 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); // L: 53 } // L: 54 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("g") + @ObfuscatedName("k") + @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 57 int var2; @@ -165,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var13 != 32 && var13 != 160) { // L: 89 for (var8 = 0; var8 < 256; ++var8) { // L: 90 if (var8 != 32 && var8 != 160) { // L: 91 - this.kerning[var8 + (var13 << 8)] = (byte)method5464(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 + this.kerning[var8 + (var13 << 8)] = (byte)method5477(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 } } } @@ -176,16 +204,18 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 97 - @ObfuscatedName("n") + @ObfuscatedName("u") + @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 122 var1 = ' '; } - return this.advances[class227.charToByteCp1252(var1) & 255]; // L: 123 + return this.advances[class219.charToByteCp1252(var1) & 255]; // L: 123 } - @ObfuscatedName("d") + @ObfuscatedName("t") + @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 127 return 0; @@ -208,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { // L: 141 if (var7.startsWith("img=")) { // L: 142 try { - int var8 = GrandExchangeOfferTotalQuantityComparator.parseInt(var7.substring(4)); // L: 144 + int var8 = ObjectSound.parseInt(var7.substring(4)); // L: 144 var4 += AbstractFont_modIconSprites[var8].width; // L: 145 var3 = -1; // L: 146 } catch (Exception var10) { // L: 148 @@ -226,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { // L: 154 - var4 += this.advances[(char)(class227.charToByteCp1252(var6) & 255)]; // L: 155 + var4 += this.advances[(char)(class219.charToByteCp1252(var6) & 255)]; // L: 155 if (this.kerning != null && var3 != -1) { // L: 156 var4 += this.kerning[var6 + (var3 << 8)]; } @@ -240,7 +270,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("e") + @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 164 return 0; @@ -290,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; // L: 203 } else if (var16.startsWith("img=")) { // L: 205 try { - int var17 = GrandExchangeOfferTotalQuantityComparator.parseInt(var16.substring(4)); // L: 207 + int var17 = ObjectSound.parseInt(var16.substring(4)); // L: 207 var4 += AbstractFont_modIconSprites[var17].width; // L: 208 var11 = 0; // L: 209 } catch (Exception var20) { // L: 211 @@ -344,7 +375,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("a") + @ObfuscatedName("o") + @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248 int var4 = 0; // L: 249 @@ -359,12 +391,14 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; // L: 254 } - @ObfuscatedName("q") + @ObfuscatedName("n") + @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258 } - @ObfuscatedName("j") + @ObfuscatedName("p") + @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 279 this.reset(var4, var5); // L: 280 @@ -373,6 +407,7 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 282 @ObfuscatedName("r") + @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 285 this.reset(var4, var5); // L: 286 @@ -381,7 +416,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 289 - @ObfuscatedName("u") + @ObfuscatedName("y") + @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 292 this.reset(var4, var5); // L: 293 @@ -389,7 +425,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 295 - @ObfuscatedName("p") + @ObfuscatedName("s") + @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 298 this.reset(var4, var5); // L: 299 @@ -397,7 +434,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 301 - @ObfuscatedName("b") + @ObfuscatedName("j") + @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) { // L: 304 return 0; @@ -457,7 +495,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("l") + @ObfuscatedName("d") + @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 339 this.reset(var4, var5); // L: 340 @@ -471,7 +510,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 344 - @ObfuscatedName("e") + @ObfuscatedName("a") + @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 347 this.reset(var4, var5); // L: 348 @@ -487,7 +527,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 356 - @ObfuscatedName("ab") + @ObfuscatedName("g") + @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 359 this.reset(var4, var5); // L: 360 @@ -506,7 +547,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 366 - @ObfuscatedName("ag") + @ObfuscatedName("h") + @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 369 this.reset(var4, var5); // L: 370 @@ -526,7 +568,8 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 380 - @ObfuscatedName("ao") + @ObfuscatedName("ab") + @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 383 AbstractFont_underline = -1; // L: 384 @@ -539,92 +582,105 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; // L: 389 } // L: 390 - @ObfuscatedName("ae") + @ObfuscatedName("ac") + @Export("decodeTag") void decodeTag(String var1) { try { + int var2; + String var3; if (var1.startsWith("col=")) { // L: 394 - AbstractFont_color = class228.method4190(var1.substring(4), 16); - } else if (var1.equals("/col")) { // L: 395 + var3 = var1.substring(4); // L: 396 + var2 = SecureRandomCallable.parseIntCustomRadix(var3, 16, true); // L: 398 + AbstractFont_color = var2; // L: 400 + } else if (var1.equals("/col")) { // L: 402 AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { // L: 396 - AbstractFont_strike = class228.method4190(var1.substring(4), 16); - } else if (var1.equals("str")) { // L: 397 + } else if (var1.startsWith("str=")) { // L: 403 + var3 = var1.substring(4); // L: 405 + var2 = SecureRandomCallable.parseIntCustomRadix(var3, 16, true); // L: 407 + AbstractFont_strike = var2; // L: 409 + } else if (var1.equals("str")) { // L: 411 AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { // L: 398 + } else if (var1.equals("/str")) { // L: 412 AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { // L: 399 - AbstractFont_underline = class228.method4190(var1.substring(2), 16); - } else if (var1.equals("u")) { // L: 400 + } else if (var1.startsWith("u=")) { // L: 413 + var3 = var1.substring(2); // L: 415 + var2 = SecureRandomCallable.parseIntCustomRadix(var3, 16, true); // L: 417 + AbstractFont_underline = var2; // L: 419 + } else if (var1.equals("u")) { // L: 421 AbstractFont_underline = 0; - } else if (var1.equals("/u")) { // L: 401 + } else if (var1.equals("/u")) { // L: 422 AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { // L: 402 - AbstractFont_shadow = class228.method4190(var1.substring(5), 16); - } else if (var1.equals("shad")) { // L: 403 + } else if (var1.startsWith("shad=")) { // L: 423 + var3 = var1.substring(5); // L: 425 + var2 = SecureRandomCallable.parseIntCustomRadix(var3, 16, true); // L: 427 + AbstractFont_shadow = var2; // L: 429 + } else if (var1.equals("shad")) { // L: 431 AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { // L: 404 + } else if (var1.equals("/shad")) { // L: 432 AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { // L: 405 - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); + } else if (var1.equals("br")) { + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 433 } - } catch (Exception var3) { // L: 407 + } catch (Exception var5) { // L: 435 } - } // L: 408 + } // L: 436 - @ObfuscatedName("ap") + @ObfuscatedName("ao") + @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; // L: 411 - boolean var4 = false; // L: 412 + int var3 = 0; // L: 439 + boolean var4 = false; // L: 440 - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 413 - char var6 = var1.charAt(var5); // L: 414 - if (var6 == '<') { // L: 415 + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 441 + char var6 = var1.charAt(var5); // L: 442 + if (var6 == '<') { // L: 443 var4 = true; - } else if (var6 == '>') { // L: 416 + } else if (var6 == '>') { // L: 444 var4 = false; - } else if (!var4 && var6 == ' ') { // L: 417 + } else if (!var4 && var6 == ' ') { // L: 445 ++var3; } } - if (var3 > 0) { // L: 419 + if (var3 > 0) { // L: 447 AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } // L: 420 + } // L: 448 - @ObfuscatedName("au") + @ObfuscatedName("af") + @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; // L: 423 - int var4 = -1; // L: 424 - int var5 = -1; // L: 425 + var3 -= this.ascent; // L: 451 + int var4 = -1; // L: 452 + int var5 = -1; // L: 453 - for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 426 - if (var1.charAt(var6) != 0) { // L: 427 - char var7 = (char)(class227.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428 - if (var7 == '<') { // L: 429 - var4 = var6; // L: 430 + for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 454 + if (var1.charAt(var6) != 0) { // L: 455 + char var7 = (char)(class219.charToByteCp1252(var1.charAt(var6)) & 255); // L: 456 + if (var7 == '<') { // L: 457 + var4 = var6; // L: 458 } else { int var9; - if (var7 == '>' && var4 != -1) { // L: 433 - String var8 = var1.substring(var4 + 1, var6); // L: 434 - var4 = -1; // L: 435 - if (var8.equals("lt")) { // L: 436 + if (var7 == '>' && var4 != -1) { // L: 461 + String var8 = var1.substring(var4 + 1, var6); // L: 462 + var4 = -1; // L: 463 + if (var8.equals("lt")) { // L: 464 var7 = '<'; } else { - if (!var8.equals("gt")) { // L: 437 - if (var8.startsWith("img=")) { // L: 438 + if (!var8.equals("gt")) { // L: 465 + if (var8.startsWith("img=")) { // L: 466 try { - var9 = GrandExchangeOfferTotalQuantityComparator.parseInt(var8.substring(4)); // L: 440 - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 441 - var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 442 - var2 += var10.width; // L: 443 - var5 = -1; // L: 444 - } catch (Exception var14) { // L: 446 + var9 = ObjectSound.parseInt(var8.substring(4)); // L: 468 + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 469 + var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 470 + var2 += var10.width; // L: 471 + var5 = -1; // L: 472 + } catch (Exception var14) { // L: 474 } } else { - this.decodeTag(var8); // L: 450 + this.decodeTag(var8); // L: 478 } continue; } @@ -633,102 +689,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { // L: 454 + if (var7 == 160) { // L: 482 var7 = ' '; } - if (var4 == -1) { // L: 455 - if (this.kerning != null && var5 != -1) { // L: 456 + if (var4 == -1) { // L: 483 + if (this.kerning != null && var5 != -1) { // L: 484 var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; // L: 457 - var9 = this.heights[var7]; // L: 458 - if (var7 != ' ') { // L: 459 - if (AbstractFont_alpha == 256) { // L: 460 - if (AbstractFont_shadow != -1) { // L: 461 + int var12 = this.widths[var7]; // L: 485 + var9 = this.heights[var7]; // L: 486 + if (var7 != ' ') { // L: 487 + if (AbstractFont_alpha == 256) { // L: 488 + if (AbstractFont_shadow != -1) { // L: 489 AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 462 + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 490 } else { - if (AbstractFont_shadow != -1) { // L: 465 + if (AbstractFont_shadow != -1) { // L: 493 AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 466 + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 494 } - } else if (AbstractFont_justificationTotal > 0) { // L: 470 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 471 - var2 += AbstractFont_justificationCurrent >> 8; // L: 472 - AbstractFont_justificationCurrent &= 255; // L: 473 + } else if (AbstractFont_justificationTotal > 0) { // L: 498 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 499 + var2 += AbstractFont_justificationCurrent >> 8; // L: 500 + AbstractFont_justificationCurrent &= 255; // L: 501 } - int var13 = this.advances[var7]; // L: 476 - if (AbstractFont_strike != -1) { // L: 477 + int var13 = this.advances[var7]; // L: 504 + if (AbstractFont_strike != -1) { // L: 505 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 478 + if (AbstractFont_underline != -1) { // L: 506 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; // L: 479 - var5 = var7; // L: 480 + var2 += var13; // L: 507 + var5 = var7; // L: 508 } } } } - } // L: 483 + } // L: 511 - @ObfuscatedName("aa") + @ObfuscatedName("av") + @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; // L: 486 - int var6 = -1; // L: 487 - int var7 = -1; // L: 488 - int var8 = 0; // L: 489 + var3 -= this.ascent; // L: 514 + int var6 = -1; // L: 515 + int var7 = -1; // L: 516 + int var8 = 0; // L: 517 - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 490 - if (var1.charAt(var9) != 0) { // L: 491 - char var10 = (char)(class227.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492 - if (var10 == '<') { // L: 493 - var6 = var9; // L: 494 + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 518 + if (var1.charAt(var9) != 0) { // L: 519 + char var10 = (char)(class219.charToByteCp1252(var1.charAt(var9)) & 255); // L: 520 + if (var10 == '<') { // L: 521 + var6 = var9; // L: 522 } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { // L: 497 - String var11 = var1.substring(var6 + 1, var9); // L: 498 - var6 = -1; // L: 499 - if (var11.equals("lt")) { // L: 500 + if (var10 == '>' && var6 != -1) { // L: 525 + String var11 = var1.substring(var6 + 1, var9); // L: 526 + var6 = -1; // L: 527 + if (var11.equals("lt")) { // L: 528 var10 = '<'; } else { - if (!var11.equals("gt")) { // L: 501 - if (var11.startsWith("img=")) { // L: 502 + if (!var11.equals("gt")) { // L: 529 + if (var11.startsWith("img=")) { // L: 530 try { - if (var4 != null) { // L: 505 + if (var4 != null) { // L: 533 var12 = var4[var8]; } else { - var12 = 0; // L: 506 + var12 = 0; // L: 534 } - if (var5 != null) { // L: 508 + if (var5 != null) { // L: 536 var13 = var5[var8]; } else { - var13 = 0; // L: 509 + var13 = 0; // L: 537 } - ++var8; // L: 510 - var14 = GrandExchangeOfferTotalQuantityComparator.parseInt(var11.substring(4)); // L: 511 - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 512 - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 513 - var2 += var15.width; // L: 514 - var7 = -1; // L: 515 - } catch (Exception var19) { // L: 517 + ++var8; // L: 538 + var14 = ObjectSound.parseInt(var11.substring(4)); // L: 539 + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 540 + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 541 + var2 += var15.width; // L: 542 + var7 = -1; // L: 543 + } catch (Exception var19) { // L: 545 } } else { - this.decodeTag(var11); // L: 521 + this.decodeTag(var11); // L: 549 } continue; } @@ -737,70 +794,70 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { // L: 525 + if (var10 == 160) { // L: 553 var10 = ' '; } - if (var6 == -1) { // L: 526 - if (this.kerning != null && var7 != -1) { // L: 527 + if (var6 == -1) { // L: 554 + if (this.kerning != null && var7 != -1) { // L: 555 var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; // L: 528 - var12 = this.heights[var10]; // L: 529 - if (var4 != null) { // L: 531 + int var17 = this.widths[var10]; // L: 556 + var12 = this.heights[var10]; // L: 557 + if (var4 != null) { // L: 559 var13 = var4[var8]; } else { - var13 = 0; // L: 532 + var13 = 0; // L: 560 } - if (var5 != null) { // L: 534 + if (var5 != null) { // L: 562 var14 = var5[var8]; } else { - var14 = 0; // L: 535 + var14 = 0; // L: 563 } - ++var8; // L: 536 - if (var10 != ' ') { // L: 537 - if (AbstractFont_alpha == 256) { // L: 538 - if (AbstractFont_shadow != -1) { // L: 539 + ++var8; // L: 564 + if (var10 != ' ') { // L: 565 + if (AbstractFont_alpha == 256) { // L: 566 + if (AbstractFont_shadow != -1) { // L: 567 AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 540 + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 568 } else { - if (AbstractFont_shadow != -1) { // L: 543 + if (AbstractFont_shadow != -1) { // L: 571 AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 544 + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 572 } - } else if (AbstractFont_justificationTotal > 0) { // L: 548 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 549 - var2 += AbstractFont_justificationCurrent >> 8; // L: 550 - AbstractFont_justificationCurrent &= 255; // L: 551 + } else if (AbstractFont_justificationTotal > 0) { // L: 576 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 577 + var2 += AbstractFont_justificationCurrent >> 8; // L: 578 + AbstractFont_justificationCurrent &= 255; // L: 579 } - int var18 = this.advances[var10]; // L: 554 - if (AbstractFont_strike != -1) { // L: 555 + int var18 = this.advances[var10]; // L: 582 + if (AbstractFont_strike != -1) { // L: 583 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 556 + if (AbstractFont_underline != -1) { // L: 584 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; // L: 557 - var7 = var10; // L: 558 + var2 += var18; // L: 585 + var7 = var10; // L: 586 } } } } - } // L: 561 + } // L: 589 - @ObfuscatedName("m") - static int method5464(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("c") + static int method5477(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; // L: 100 int var8 = var7 + var4[var5]; // L: 101 int var9 = var2[var6]; // L: 102 @@ -835,7 +892,8 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; // L: 118 } - @ObfuscatedName("c") + @ObfuscatedName("x") + @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 262 int var2 = 0; // L: 263 @@ -864,152 +922,156 @@ public abstract class AbstractFont extends Rasterizer2D { } @ObfuscatedName("ar") + @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; // L: 567 - int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 568 - int var8 = 0; // L: 569 - int var9 = 0; // L: 570 + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 595 + int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 596 + int var8 = 0; // L: 597 + int var9 = 0; // L: 598 int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 571 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 572 - var4 -= var10; // L: 573 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 574 - var9 += var3 * var10; // L: 575 - var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 576 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 599 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 600 + var4 -= var10; // L: 601 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 602 + var9 += var3 * var10; // L: 603 + var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 604 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 578 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 606 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 579 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 580 - var3 -= var10; // L: 581 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 582 - var9 += var10; // L: 583 - var6 += var10; // L: 584 - var8 += var10; // L: 585 - var7 += var10; // L: 586 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 607 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 608 + var3 -= var10; // L: 609 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 610 + var9 += var10; // L: 611 + var6 += var10; // L: 612 + var8 += var10; // L: 613 + var7 += var10; // L: 614 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 588 - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 589 - var3 -= var10; // L: 590 - var8 += var10; // L: 591 - var7 += var10; // L: 592 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 616 + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 617 + var3 -= var10; // L: 618 + var8 += var10; // L: 619 + var7 += var10; // L: 620 } - if (var3 > 0 && var4 > 0) { // L: 594 - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 595 + if (var3 > 0 && var4 > 0) { // L: 622 + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 623 } - } // L: 596 + } // L: 624 - @ObfuscatedName("at") + @ObfuscatedName("ay") + @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); // L: 599 - var5 = -(var5 & 3); // L: 600 + int var9 = -(var5 >> 2); // L: 627 + var5 = -(var5 & 3); // L: 628 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 601 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 629 int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 602 - if (var1[var3++] != 0) { // L: 603 + for (var11 = var9; var11 < 0; ++var11) { // L: 630 + if (var1[var3++] != 0) { // L: 631 var0[var4++] = var2; } else { - ++var4; // L: 604 + ++var4; // L: 632 } - if (var1[var3++] != 0) { // L: 605 + if (var1[var3++] != 0) { // L: 633 var0[var4++] = var2; } else { - ++var4; // L: 606 + ++var4; // L: 634 } - if (var1[var3++] != 0) { // L: 607 + if (var1[var3++] != 0) { // L: 635 var0[var4++] = var2; } else { - ++var4; // L: 608 + ++var4; // L: 636 } - if (var1[var3++] != 0) { // L: 609 + if (var1[var3++] != 0) { // L: 637 var0[var4++] = var2; } else { - ++var4; // L: 610 + ++var4; // L: 638 } } - for (var11 = var5; var11 < 0; ++var11) { // L: 612 - if (var1[var3++] != 0) { // L: 613 + for (var11 = var5; var11 < 0; ++var11) { // L: 640 + if (var1[var3++] != 0) { // L: 641 var0[var4++] = var2; } else { - ++var4; // L: 614 + ++var4; // L: 642 } } - var4 += var7; // L: 616 - var3 += var8; // L: 617 + var4 += var7; // L: 644 + var3 += var8; // L: 645 } - } // L: 619 + } // L: 647 - @ObfuscatedName("aq") + @ObfuscatedName("ah") + @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; // L: 622 - int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 623 - int var9 = 0; // L: 624 - int var10 = 0; // L: 625 + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 650 + int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 651 + int var9 = 0; // L: 652 + int var10 = 0; // L: 653 int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 626 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 627 - var4 -= var11; // L: 628 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 629 - var10 += var3 * var11; // L: 630 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 631 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 654 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 655 + var4 -= var11; // L: 656 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 657 + var10 += var3 * var11; // L: 658 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 659 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 633 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 661 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 634 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 635 - var3 -= var11; // L: 636 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 637 - var10 += var11; // L: 638 - var7 += var11; // L: 639 - var9 += var11; // L: 640 - var8 += var11; // L: 641 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 662 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 663 + var3 -= var11; // L: 664 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 665 + var10 += var11; // L: 666 + var7 += var11; // L: 667 + var9 += var11; // L: 668 + var8 += var11; // L: 669 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 643 - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 644 - var3 -= var11; // L: 645 - var9 += var11; // L: 646 - var8 += var11; // L: 647 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 671 + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 672 + var3 -= var11; // L: 673 + var9 += var11; // L: 674 + var8 += var11; // L: 675 } - if (var3 > 0 && var4 > 0) { // L: 649 - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 650 + if (var3 > 0 && var4 > 0) { // L: 677 + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 678 } - } // L: 651 + } // L: 679 - @ObfuscatedName("al") + @ObfuscatedName("az") + @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 654 - var9 = 256 - var9; // L: 655 + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 682 + var9 = 256 - var9; // L: 683 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 656 - for (int var11 = -var5; var11 < 0; ++var11) { // L: 657 - if (var1[var3++] != 0) { // L: 658 - int var12 = var0[var4]; // L: 659 - var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 660 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 684 + for (int var11 = -var5; var11 < 0; ++var11) { // L: 685 + if (var1[var3++] != 0) { // L: 686 + int var12 = var0[var4]; // L: 687 + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 688 } else { - ++var4; // L: 662 + ++var4; // L: 690 } } - var4 += var7; // L: 664 - var3 += var8; // L: 665 + var4 += var7; // L: 692 + var3 += var8; // L: 693 } - } // L: 667 + } // L: 695 } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 70bcd635c5..4011b7a2a5 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -1,44 +1,58 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("ly") +@Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("s") + @ObfuscatedName("rq") + @ObfuscatedGetter( + intValue = 18535251 + ) + static int field3890; + @ObfuscatedName("l") + @Export("pixels") public int[] pixels; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1282553935 + intValue = -1124244957 ) + @Export("width") public int width; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1198737713 + intValue = 1951124213 ) + @Export("height") public int height; protected AbstractRasterProvider() { } // L: 8 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1964598850" + garbageValue = "-1818523436" ) + @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "147756616" + garbageValue = "868198553" ) + @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1832212731" + garbageValue = "-1020738827" ) + @Export("apply") public final void apply() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 } // L: 12 diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index b2ef6e6733..98fb22d2ac 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -1,63 +1,60 @@ import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("lv") +@Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } // L: 7 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-147773206" + garbageValue = "1983450651" ) + @Export("close") public abstract void close(); + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "1" + ) + @Export("readUnsignedByte") + public abstract int readUnsignedByte() throws IOException; + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "933186835" + ) + @Export("available") + public abstract int available() throws IOException; + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-916126565" + ) + @Export("isAvailable") + public abstract boolean isAvailable(int var1) throws IOException; + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "([BIII)I", + garbageValue = "1049423117" + ) + @Export("read") + public abstract int read(byte[] var1, int var2, int var3) throws IOException; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-99" - ) - public abstract int readUnsignedByte() throws IOException; - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "12" - ) - public abstract int available() throws IOException; - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-78" - ) - public abstract boolean isAvailable(int var1) throws IOException; - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-1533815985" - ) - public abstract int read(byte[] var1, int var2, int var3) throws IOException; - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "52" + descriptor = "([BIII)V", + garbageValue = "1456512196" ) + @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1292618906" - ) - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = Client.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8130 - var2.packetBuffer.method5654(var1); // L: 8131 - var2.packetBuffer.method5663(var0); // L: 8132 - Client.packetWriter.addNode(var2); // L: 8133 - } // L: 8134 } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index fbb3d73e4c..10a4aec25f 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -1,8 +1,12 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dp") +@ObfuscatedName("dn") +@Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("position") int position; AbstractSound() { diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index d75521987f..7862f132c9 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,22 +1,32 @@ 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("jn") +@ObfuscatedName("jz") +@Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("gd") - static byte[][] regionLandArchives; - @ObfuscatedName("k") + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -905985897 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("b") + @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } // L: 8 - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "-9" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "1982456763" ) + @Export("addComparator") final void addComparator(Comparator var1) { if (this.nextComparator == null) { // L: 11 this.nextComparator = var1; // L: 12 @@ -26,11 +36,12 @@ public abstract class AbstractUserComparator implements Comparator { } // L: 17 - @ObfuscatedName("w") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljc;Ljc;I)I", - garbageValue = "1339061941" + descriptor = "(Ljh;Ljh;S)I", + garbageValue = "-16147" ) + @Export("compareUser") protected final int compareUser(User var1, User var2) { return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); // L: 20 21 } @@ -38,144 +49,4 @@ public abstract class AbstractUserComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); // L: 25 } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lic;III)Llp;", - garbageValue = "-2098090850" - ) - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); // L: 96 - boolean var3; - if (var4 == null) { // L: 97 - var3 = false; // L: 98 - } else { - Occluder.SpriteBuffer_decode(var4); // L: 101 - var3 = true; // L: 102 - } - - return !var3 ? null : AttackOption.method2155(); // L: 104 105 - } - - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "(Lhq;IIII)V", - garbageValue = "-1377715845" - ) - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - RouteStrategy.playPcmPlayers(); // L: 10551 - SpriteMask var4 = var0.getSpriteMask(false); // L: 10552 - if (var4 != null) { // L: 10553 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 10554 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 10555 - int var5 = Client.camAngleY & 2047; // L: 10556 - int var6 = WorldMapLabelSize.localPlayer.x / 32 + 48; // L: 10557 - int var7 = 464 - WorldMapLabelSize.localPlayer.y / 32; // L: 10558 - ApproximateRouteStrategy.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 10559 - - int var8; - int var10; - int var17; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 10560 - var17 = Client.mapIconXs[var8] * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10561 - var10 = Client.mapIconYs[var8] * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10562 - HealthBar.drawSpriteOnMinimap(var1, var2, var17, var10, Client.mapIcons[var8], var4); // L: 10563 - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 10565 - for (var17 = 0; var17 < 104; ++var17) { // L: 10566 - NodeDeque var15 = Client.groundItems[Huffman.Client_plane][var8][var17]; // L: 10567 - if (var15 != null) { // L: 10568 - var11 = var8 * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10569 - var12 = var17 * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10570 - HealthBar.drawSpriteOnMinimap(var1, var2, var11, var12, class235.mapDotSprites[0], var4); // L: 10571 - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 10575 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 10576 - if (var9 != null && var9.isVisible()) { // L: 10577 - NPCDefinition var19 = var9.definition; // L: 10578 - if (var19 != null && var19.transforms != null) { // L: 10579 - var19 = var19.transform(); - } - - if (var19 != null && var19.drawMapDot && var19.isInteractable) { // L: 10580 - var11 = var9.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10581 - var12 = var9.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10582 - HealthBar.drawSpriteOnMinimap(var1, var2, var11, var12, class235.mapDotSprites[1], var4); // L: 10583 - } - } - } - - var8 = Players.Players_count; // L: 10587 - int[] var18 = Players.Players_indices; // L: 10588 - - for (var10 = 0; var10 < var8; ++var10) { // L: 10589 - Player var16 = Client.players[var18[var10]]; // L: 10590 - if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != WorldMapLabelSize.localPlayer) { // L: 10591 - var12 = var16.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10592 - int var13 = var16.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10593 - boolean var14 = false; // L: 10594 - if (WorldMapLabelSize.localPlayer.team != 0 && var16.team != 0 && var16.team == WorldMapLabelSize.localPlayer.team) { // L: 10595 - var14 = true; - } - - if (var16.isFriend()) { // L: 10596 - HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[3], var4); - } else if (var14) { // L: 10597 - HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[4], var4); - } else if (var16.isClanMember()) { // L: 10598 - HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[5], var4); - } else { - HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[2], var4); // L: 10599 - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 10602 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 10603 - NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; // L: 10604 - if (var20 != null) { // L: 10605 - var11 = var20.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10606 - var12 = var20.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10607 - Coord.worldToMinimap(var1, var2, var11, var12, VarbitDefinition.mapMarkerSprites[1], var4); // L: 10608 - } - } - - if (Client.hintArrowType == 2) { // L: 10611 - var10 = Client.hintArrowX * 4 - WorldMapManager.baseX * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10612 - var11 = Client.hintArrowY * 4 - WorldMapLabel.baseY * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10613 - Coord.worldToMinimap(var1, var2, var10, var11, VarbitDefinition.mapMarkerSprites[1], var4); // L: 10614 - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 10616 - Player var21 = Client.players[Client.hintArrowPlayerIndex]; // L: 10617 - if (var21 != null) { // L: 10618 - var11 = var21.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10619 - var12 = var21.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10620 - Coord.worldToMinimap(var1, var2, var11, var12, VarbitDefinition.mapMarkerSprites[1], var4); // L: 10621 - } - } - } - - if (Client.destinationX != 0) { // L: 10625 - var10 = Client.destinationX * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10626 - var11 = Client.destinationY * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10627 - HealthBar.drawSpriteOnMinimap(var1, var2, var10, var11, VarbitDefinition.mapMarkerSprites[0], var4); // L: 10628 - } - - if (!WorldMapLabelSize.localPlayer.isHidden) { // L: 10630 - 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); // L: 10632 - } - - Client.field883[var3] = true; // L: 10633 - } - } // L: 10634 } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 4b482ded32..ef8522ade7 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,171 +1,187 @@ import java.util.LinkedList; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("an") +@ObfuscatedName("av") +@Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("gz") - static byte[][] regionMapArchives; - @ObfuscatedName("hc") + @ObfuscatedName("ge") @ObfuscatedGetter( - intValue = -1751628859 + intValue = -1795954439 ) - static int cameraZ; + static int field198; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 256317953 + ) + @Export("regionXLow") + int regionXLow; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -985241173 + ) + @Export("regionYLow") + int regionYLow; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1287028281 + ) + @Export("regionX") + int regionX; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1006344441 + ) + @Export("regionY") + int regionY; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -79159629 + intValue = -1534728703 ) - int regionXLow; + @Export("minPlane") + int minPlane; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -622931363 + ) + @Export("planes") + int planes; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 522527831 - ) - int regionYLow; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -2063226565 - ) - int regionX; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 480521769 - ) - int regionY; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 946227363 - ) - int minPlane; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1771727323 - ) - int planes; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 10575415 + intValue = -1787627211 ) + @Export("groupId") int groupId; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -466273533 + intValue = 953400525 ) + @Export("fileId") int fileId; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("floorOverlayIds") short[][][] floorOverlayIds; + @ObfuscatedName("e") + byte[][][] field196; + @ObfuscatedName("o") + byte[][][] field187; @ObfuscatedName("n") - byte[][][] field198; - @ObfuscatedName("d") - byte[][][] field191; - @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[[[[Laa;" + descriptor = "[[[[Laz;" ) + @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("a") - boolean field182; - @ObfuscatedName("q") - boolean field194; + @ObfuscatedName("x") + boolean field202; + @ObfuscatedName("p") + boolean field200; AbstractWorldMapData() { this.groupId = -1; // L: 14 this.fileId = -1; // L: 15 new LinkedList(); - this.field182 = false; - this.field194 = false; + this.field202 = false; // L: 26 + this.field200 = false; // L: 27 } // L: 29 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "728123848" + descriptor = "(Lkb;I)V", + garbageValue = "-1024222647" ) + @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "83" + garbageValue = "15" ) + @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field182 && this.field194; // L: 32 + return this.field202 && this.field200; // L: 32 } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lic;B)V", - garbageValue = "-109" + descriptor = "(Liw;B)V", + garbageValue = "-18" ) + @Export("loadGeography") void loadGeography(AbstractArchive var1) { if (!this.isFullyLoaded()) { // L: 36 byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 if (var2 != null) { // L: 38 this.readGeography(new Buffer(var2)); // L: 39 - this.field182 = true; // L: 40 - this.field194 = true; // L: 41 + this.field202 = true; // L: 40 + this.field200 = true; // L: 41 } } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2117739140" - ) - void reset() { - this.floorUnderlayIds = null; // L: 46 - this.floorOverlayIds = null; // L: 47 - this.field198 = null; // L: 48 - this.field191 = null; // L: 49 - this.decorations = null; // L: 50 - this.field182 = false; // L: 51 - this.field194 = false; // L: 52 - } // L: 53 + } // L: 43 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IILkf;I)V", - garbageValue = "-1176902168" + descriptor = "(I)V", + garbageValue = "-246521616" ) + @Export("reset") + void reset() { + this.floorUnderlayIds = null; // L: 46 + this.floorOverlayIds = null; // L: 47 + this.field196 = null; // L: 48 + this.field187 = null; // L: 49 + this.decorations = null; // L: 50 + this.field202 = false; // L: 51 + this.field200 = false; // L: 52 + } // L: 53 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IILkb;I)V", + garbageValue = "1303493953" + ) + @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); // L: 56 if (var4 != 0) { // L: 57 if ((var4 & 1) != 0) { // L: 60 - this.method329(var1, var2, var3, var4); // L: 61 + this.method337(var1, var2, var3, var4); // L: 61 } else { - this.method335(var1, var2, var3, var4); + this.method343(var1, var2, var3, var4); // L: 64 } } - } // L: 58 + } // L: 58 66 - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IILkf;II)V", - garbageValue = "1697201731" + descriptor = "(IILkb;IB)V", + garbageValue = "96" ) - void method329(int var1, int var2, Buffer var3, int var4) { - boolean var5 = (var4 & 2) != 0; - if (var5) { - this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + void method337(int var1, int var2, Buffer var3, int var4) { + boolean var5 = (var4 & 2) != 0; // L: 69 + if (var5) { // L: 70 + this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71 } this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 } // L: 74 - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IILkf;II)V", - garbageValue = "2061843342" + descriptor = "(IILkb;II)V", + garbageValue = "1646413468" ) - void method335(int var1, int var2, Buffer var3, int var4) { - int var5 = ((var4 & 24) >> 3) + 1; - boolean var6 = (var4 & 2) != 0; + void method343(int var1, int var2, Buffer var3, int var4) { + int var5 = ((var4 & 24) >> 3) + 1; // L: 77 + boolean var6 = (var4 & 2) != 0; // L: 78 boolean var7 = (var4 & 4) != 0; // L: 79 this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 int var8; @@ -175,26 +191,26 @@ public abstract class AbstractWorldMapData { var8 = var3.readUnsignedByte(); // L: 82 for (var9 = 0; var9 < var8; ++var9) { // L: 83 - int var14 = var3.readUnsignedByte(); // L: 84 - if (var14 != 0) { // L: 85 - this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 - var11 = var3.readUnsignedByte(); // L: 87 - this.field198[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field191[var9][var1][var2] = (byte)(var11 & 3); // L: 89 + int var14 = var3.readUnsignedByte(); + if (var14 != 0) { + this.floorOverlayIds[var9][var1][var2] = (short)var14; + var11 = var3.readUnsignedByte(); + this.field196[var9][var1][var2] = (byte)(var11 >> 2); + this.field187[var9][var1][var2] = (byte)(var11 & 3); } } } - if (var7) { // L: 93 - for (var8 = 0; var8 < var5; ++var8) { // L: 94 - var9 = var3.readUnsignedByte(); // L: 95 - if (var9 != 0) { // L: 96 - WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 + if (var7) { + for (var8 = 0; var8 < var5; ++var8) { + var9 = var3.readUnsignedByte(); + if (var9 != 0) { + WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; - for (var11 = 0; var11 < var9; ++var11) { // L: 100 - int var12 = var3.method5634(); // L: 101 - int var13 = var3.readUnsignedByte(); // L: 102 - var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 + for (var11 = 0; var11 < var9; ++var11) { + int var12 = var3.method5851(); + int var13 = var3.readUnsignedByte(); + var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } } } @@ -202,171 +218,150 @@ public abstract class AbstractWorldMapData { } // L: 107 - @ObfuscatedName("a") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1414029315" + descriptor = "(B)I", + garbageValue = "3" ) + @Export("getRegionX") int getRegionX() { - return this.regionX; // L: 112 + return this.regionX; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1685122418" + descriptor = "(B)I", + garbageValue = "66" ) + @Export("getRegionY") int getRegionY() { return this.regionY; // L: 116 } - @ObfuscatedName("z") - public static String method331(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 - if (var0 % 37L == 0L) { // L: 17 - return null; - } else { - int var2 = 0; // L: 18 - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 19 20 22 - ++var2; // L: 21 - } - - StringBuilder var5 = new StringBuilder(var2); // L: 24 - - while (var0 != 0L) { // L: 25 - long var6 = var0; // L: 26 - var0 /= 37L; // L: 27 - var5.append(class298.base37Table[(int)(var6 - 37L * var0)]); // L: 28 - } - - return var5.reverse().toString(); // L: 30 - } + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Ljk;", + garbageValue = "1003321139" + ) + @Export("ItemDefinition_get") + public static ItemDefinition ItemDefinition_get(int var0) { + ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); // L: 84 + if (var1 != null) { // L: 85 + return var1; } else { - return null; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Llp;IIII)V", - garbageValue = "-224536193" - ) - static void method353(Sprite var0, int var1, int var2, int var3) { - WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, MenuAction.method2139(var1, var2, var3), var0.pixels.length * 4); // L: 42 - } // L: 43 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "396183986" - ) - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; // L: 63 - int[] var3 = new int[4]; // L: 64 - var2[0] = var0; // L: 65 - var3[0] = var1; // L: 66 - int var4 = 1; // L: 67 - - for (int var5 = 0; var5 < 4; ++var5) { // L: 68 - if (World.World_sortOption1[var5] != var0) { // L: 69 - var2[var4] = World.World_sortOption1[var5]; // L: 70 - var3[var4] = World.World_sortOption2[var5]; // L: 71 - ++var4; // L: 72 - } - } - - World.World_sortOption1 = var2; // L: 75 - World.World_sortOption2 = var3; // L: 76 - FloorDecoration.sortWorlds(AbstractByteArrayCopier.World_worlds, 0, AbstractByteArrayCopier.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 - } // L: 78 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1078037762" - ) - static int method351(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3185 - Client.logoutTimer = 250; // L: 3186 - return 1; // L: 3187 - } else { - return 2; // L: 3189 - } - } - - @ObfuscatedName("fc") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1467299516" - ) - static final void method354() { - if (Huffman.Client_plane != Client.field902) { // L: 3319 - Client.field902 = Huffman.Client_plane; // L: 3320 - int var0 = Huffman.Client_plane; // L: 3321 - int[] var1 = ApproximateRouteStrategy.sceneMinimapSprite.pixels; // L: 3323 - int var2 = var1.length; // L: 3324 - - int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 3325 - var1[var3] = 0; + byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0); // L: 86 + var1 = new ItemDefinition(); // L: 87 + var1.id = var0; // L: 88 + if (var2 != null) { // L: 89 + var1.decode(new Buffer(var2)); } - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { // L: 3326 - var4 = (103 - var3) * 2048 + 24628; // L: 3327 - - for (var5 = 1; var5 < 103; ++var5) { // L: 3328 - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 3329 - ScriptEvent.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 3330 - ScriptEvent.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; // L: 3331 - } + var1.post(); // L: 90 + if (var1.noteTemplate != -1) { // L: 91 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); } - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3334 - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3335 - ApproximateRouteStrategy.sceneMinimapSprite.setRaster(); // L: 3336 - - int var6; - for (var5 = 1; var5 < 103; ++var5) { // L: 3337 - for (var6 = 1; var6 < 103; ++var6) { // L: 3338 - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 3339 - ChatChannel.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 3340 - ChatChannel.drawObject(var0 + 1, var6, var5, var3, var4); - } - } + if (var1.notedId != -1) { // L: 92 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); } - Client.mapIconCount = 0; // L: 3343 + if (var1.placeholderTemplate != -1) { // L: 93 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } - for (var5 = 0; var5 < 104; ++var5) { // L: 3344 - for (var6 = 0; var6 < 104; ++var6) { // L: 3345 - long var7 = ScriptEvent.scene.getFloorDecorationTag(Huffman.Client_plane, var5, var6); // L: 3346 - if (0L != var7) { // L: 3347 - int var9 = UserComparator9.Entity_unpackID(var7); // L: 3348 - int var10 = MidiPcmStream.getObjectDefinition(var9).mapIconId; // L: 3349 - if (var10 >= 0) { // L: 3350 - Client.mapIcons[Client.mapIconCount] = WorldMapSection0.WorldMapElement_get(var10).getSpriteBool(false); // L: 3351 - Client.mapIconXs[Client.mapIconCount] = var5; // L: 3352 - Client.mapIconYs[Client.mapIconCount] = var6; // L: 3353 - ++Client.mapIconCount; // L: 3354 + if (!SoundCache.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 + var1.name = "Members object"; // L: 95 + var1.isTradable = false; // L: 96 + var1.groundActions = null; // L: 97 + var1.inventoryActions = null; // L: 98 + var1.shiftClickIndex = -1; // L: 99 + var1.team = 0; // L: 100 + if (var1.params != null) { // L: 101 + boolean var3 = false; // L: 102 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 103 + ParamDefinition var5 = TileItem.getParamDefinition((int)var4.key); // L: 104 + if (var5.autoDisable) { // L: 105 + var4.remove(); + } else { + var3 = true; // L: 106 } } + + if (!var3) { // L: 108 + var1.params = null; + } } } - WorldMapSprite.rasterProvider.apply(); // L: 3359 + ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); // L: 111 + return var1; // L: 112 } + } - } // L: 3362 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-47710105" + ) + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 143 + } + + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1953135448" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 4415 + byte var2 = 4; // L: 4416 + int var3 = var2 + 6; // L: 4417 + int var4 = var2 + 6; // L: 4418 + int var5 = WorldMapCacheName.fontPlain12.lineWidth(var0, 250); // L: 4419 + int var6 = WorldMapCacheName.fontPlain12.lineCount(var0, 250) * 13; // L: 4420 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 0); // L: 4421 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); // L: 4422 + WorldMapCacheName.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4423 + int var7 = var3 - var2; // L: 4424 + int var8 = var4 - var2; // L: 4425 + int var9 = var2 + var2 + var5; // L: 4426 + int var10 = var2 + var6 + var2; // L: 4427 + + int var11; + for (var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4429 + 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) { // L: 4430 + Client.field834[var11] = true; + } + } + + if (var1) { // L: 4433 + class22.rasterProvider.drawFull(0, 0); // L: 4434 + } else { + var11 = var3; // L: 4437 + int var12 = var4; // L: 4438 + int var13 = var5; // L: 4439 + int var14 = var6; // L: 4440 + + for (int var15 = 0; var15 < Client.rootWidgetCount; ++var15) { // L: 4442 + if (Client.rootWidgetWidths[var15] + Client.rootWidgetXs[var15] > var11 && Client.rootWidgetXs[var15] < var11 + var13 && Client.rootWidgetHeights[var15] + Client.rootWidgetYs[var15] > var12 && Client.rootWidgetYs[var15] < var14 + var12) { // L: 4443 + Client.field758[var15] = true; + } + } + } + + } + } // L: 4447 + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-16" + ) + static void method375() { + Client.menuOptionsCount = 0; // L: 7729 + Client.isMenuOpen = false; // L: 7730 + } // L: 7731 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 3e63dc8039..c0809d439f 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -1,83 +1,95 @@ -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("az") +@ObfuscatedName("am") +@Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lfa;" + @ObfuscatedName("si") + @ObfuscatedGetter( + intValue = -2092651161 ) - static Clock clock; - @ObfuscatedName("bp") + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("gx") @ObfuscatedSignature( - descriptor = "[Lls;" + descriptor = "[Lle;" ) - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("x") + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhg;" + descriptor = "Lhw;" ) + @Export("coord2") public final Coord coord2; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lhg;" + descriptor = "Lhw;" ) + @Export("coord1") public final Coord coord1; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 857445445 + intValue = 1323341995 ) + @Export("screenX") int screenX; - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -161924757 + intValue = 276589985 ) + @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lhg;Lhg;)V" + descriptor = "(Lhw;Lhw;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; // L: 13 this.coord2 = var2; // L: 14 } // L: 15 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1613828162" + descriptor = "(B)I", + garbageValue = "24" ) + @Export("getElement") public abstract int getElement(); - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Laq;", - garbageValue = "499378708" + descriptor = "(I)Lai;", + garbageValue = "-669051823" ) + @Export("getLabel") abstract WorldMapLabel getLabel(); + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1627026836" + ) + @Export("getSubWidth") + abstract int getSubWidth(); + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "190840278" + ) + @Export("getSubHeight") + abstract int getSubHeight(); + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "182515130" - ) - abstract int getSubWidth(); - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2001682063" - ) - abstract int getSubHeight(); - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1932387399" + descriptor = "(IIB)Z", + garbageValue = "24" ) + @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { if (this.elementFitsScreen(var1, var2)) { // L: 18 return true; // L: 19 @@ -86,57 +98,60 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-446281234" - ) - boolean hasValidElement() { - return this.getElement() >= 0; - } - @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-125" + descriptor = "(I)Z", + garbageValue = "50327739" ) + @Export("hasValidElement") + boolean hasValidElement() { + return this.getElement() >= 0; // L: 33 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "0" + ) + @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { - if (!this.hasValidElement()) { + if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = WorldMapSection0.WorldMapElement_get(this.getElement()); // L: 38 + WorldMapElement var3 = class194.WorldMapElement_get(this.getElement()); // L: 38 int var4 = this.getSubWidth(); // L: 39 int var5 = this.getSubHeight(); // L: 40 - switch(var3.horizontalAlignment.value) { + switch(var3.horizontalAlignment.value) { // L: 41 case 0: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44 - return false; + if (var1 >= this.screenX && var1 < var4 + this.screenX) { // L: 49 + break; } - break; + + return false; case 1: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 54 + if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 44 return false; } break; case 2: - if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 49 + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 54 return false; } } switch(var3.verticalAlignment.value) { // L: 58 case 0: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 61 + if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 71 return false; } break; case 1: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 66 + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 66 return false; } break; case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 71 + if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 61 return false; } } @@ -145,73 +160,40 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("r") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "706174732" + garbageValue = "290939531" ) + @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { WorldMapLabel var3 = this.getLabel(); // L: 79 if (var3 == null) { // L: 80 return false; // L: 81 } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83 - return var2 >= this.screenY && var2 <= this.screenY + var3.height; // L: 84 + return var2 >= this.screenY && var2 <= var3.height + this.screenY; // L: 84 } else { return false; // L: 85 } } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)[Lcd;", - garbageValue = "1037177959" + descriptor = "(CLgb;I)I", + garbageValue = "-816252921" ) - static AttackOption[] method679() { - return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 10925 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "379993437" - ) - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { // L: 22 - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25 - RandomAccessFile var3 = null; // L: 26 - - try { - File var4 = new File(var2.getParent()); // L: 28 - if (!var4.exists()) { // L: 29 - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); // L: 30 - int var5 = var3.read(); // L: 31 - var3.seek(0L); // L: 32 - var3.write(var5); // L: 33 - var3.seek(0L); // L: 34 - var3.close(); // L: 35 - FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36 - return var2; // L: 37 - } - } catch (Exception var8) { - try { - if (var3 != null) { // L: 41 - var3.close(); // L: 42 - var3 = null; // L: 43 - } - } catch (Exception var7) { // L: 46 - } - - throw new RuntimeException(); // L: 48 - } - } + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 104 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105 + var0 = Character.toLowerCase(var0); // L: 106 + var2 = (var0 << 4) + 1; // L: 107 } + + if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 + var2 = 1762; + } + + return var2; // L: 110 } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 46057db2be..e55ef1e7ad 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -3,23 +3,29 @@ import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.io.SyncFailedException; +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("my") +@ObfuscatedName("mr") +@Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("file") RandomAccessFile file; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 3150548694811435977L + longValue = 7305467514372323617L ) + @Export("maxSize") final long maxSize; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -5153103964935494605L + longValue = 6565072637966942499L ) + @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { @@ -43,17 +49,19 @@ public final class AccessFile { this.file.seek(0L); // L: 23 } // L: 24 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); // L: 27 this.offset = var1; // L: 28 } // L: 29 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1923920098" + garbageValue = "1653357535" ) + @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { if (this.offset + (long)var3 > this.maxSize) { // L: 32 this.file.seek(this.maxSize); // L: 33 @@ -65,20 +73,22 @@ public final class AccessFile { } } // L: 39 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "53" + descriptor = "(I)V", + garbageValue = "115800567" ) + @Export("close") public final void close() throws IOException { this.closeSync(false); // L: 42 } // L: 43 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-152121757" + garbageValue = "1735365545" ) + @Export("closeSync") public final void closeSync(boolean var1) throws IOException { if (this.file != null) { // L: 46 if (var1) { // L: 47 @@ -94,20 +104,22 @@ public final class AccessFile { } // L: 56 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-78" + descriptor = "(I)J", + garbageValue = "836289418" ) + @Export("length") public final long length() throws IOException { return this.file.length(); // L: 59 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "-2147147589" + descriptor = "([BIIB)I", + garbageValue = "119" ) + @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { int var4 = this.file.read(var1, var2, var3); // L: 63 if (var4 > 0) { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index d66866e2f8..ef1315ae42 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -1,277 +1,323 @@ +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("cs") +@Implements("Actor") public abstract class Actor extends Entity { - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -2072659501 + intValue = -952501591 ) + @Export("x") int x; - @ObfuscatedName("an") - boolean isWalking; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = 1621996049 - ) - int y; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = -572229331 - ) - int rotation; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = -1380153545 - ) - int field1014; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 1649860163 - ) - int playerCycle; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -1340931717 - ) - int idleSequence; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 1622912625 - ) - int turnLeftSequence; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 1928797643 - ) - int turnRightSequence; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = 214300391 - ) - int walkSequence; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = 1491970759 - ) - int walkBackSequence; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -433468795 + intValue = 1794864455 ) - int walkLeftSequence; + @Export("y") + int y; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = -780515937 + ) + @Export("rotation") + int rotation; + @ObfuscatedName("ay") + @Export("isWalking") + boolean isWalking; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -955529005 + ) + int field1011; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = 788781121 + ) + @Export("playerCycle") + int playerCycle; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 790102969 + ) + @Export("idleSequence") + int idleSequence; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 457621463 + ) + @Export("turnLeftSequence") + int turnLeftSequence; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = -276318067 + ) + @Export("turnRightSequence") + int turnRightSequence; @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1020521095 + intValue = 1230196885 ) + @Export("walkSequence") + int walkSequence; + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = 560375303 + ) + @Export("walkBackSequence") + int walkBackSequence; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -1465864773 + ) + @Export("walkLeftSequence") + int walkLeftSequence; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = -994348101 + ) + @Export("walkRightSequence") int walkRightSequence; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = -974301415 + ) + @Export("runSequence") + int runSequence; + @ObfuscatedName("am") + @Export("overheadText") + String overheadText; + @ObfuscatedName("aa") + @Export("isAutoChatting") + boolean isAutoChatting; + @ObfuscatedName("at") + boolean field974; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1963413453 - ) - int runSequence; - @ObfuscatedName("az") - String overheadText; - @ObfuscatedName("ad") - boolean isAutoChatting; - @ObfuscatedName("ai") - boolean field986; - @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = 885225201 + intValue = 1009044477 ) + @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 592862521 + intValue = 852014531 ) + @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 231964227 + intValue = -762307729 ) + @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("ak") + @ObfuscatedName("ap") + @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ac") + @ObfuscatedName("ad") + @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bl") + @ObfuscatedName("bb") + @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bc") + @ObfuscatedName("bf") + @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bz") - int[] hitSplatTypes2; - @ObfuscatedName("bj") - int[] hitSplatValues2; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Ljv;" - ) - IterableNodeDeque healthBars; - @ObfuscatedName("bi") - @ObfuscatedGetter( - intValue = -1685554577 - ) - int targetIndex; - @ObfuscatedName("bg") - boolean false0; - @ObfuscatedName("br") - @ObfuscatedGetter( - intValue = 171916113 - ) - int field1000; @ObfuscatedName("bp") - @ObfuscatedGetter( - intValue = 450756931 + @Export("hitSplatTypes2") + int[] hitSplatTypes2; + @ObfuscatedName("bg") + @Export("hitSplatValues2") + int[] hitSplatValues2; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Ljs;" ) - int movementSequence; + @Export("healthBars") + IterableNodeDeque healthBars; + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -49521303 + ) + @Export("targetIndex") + int targetIndex; + @ObfuscatedName("bl") + @Export("false0") + boolean false0; @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1637238895 - ) - int movementFrame; - @ObfuscatedName("bw") - @ObfuscatedGetter( - intValue = 784527629 - ) - int movementFrameCycle; - @ObfuscatedName("be") - @ObfuscatedGetter( - intValue = -218661123 - ) - int sequence; - @ObfuscatedName("bu") - @ObfuscatedGetter( - intValue = 1658984867 - ) - int sequenceFrame; - @ObfuscatedName("ba") - @ObfuscatedGetter( - intValue = -1886437137 - ) - int sequenceFrameCycle; - @ObfuscatedName("bm") - @ObfuscatedGetter( - intValue = 1364114839 - ) - int sequenceDelay; - @ObfuscatedName("bd") - @ObfuscatedGetter( - intValue = -1619964879 - ) - int field1009; - @ObfuscatedName("bb") - @ObfuscatedGetter( - intValue = 1569897565 - ) - int spotAnimation; - @ObfuscatedName("bx") - @ObfuscatedGetter( - intValue = -475440643 - ) - int spotAnimationFrame; - @ObfuscatedName("bq") - @ObfuscatedGetter( - intValue = -822724081 - ) - int spotAnimationFrameCycle; - @ObfuscatedName("by") - @ObfuscatedGetter( - intValue = 1684193507 - ) - int field1013; - @ObfuscatedName("bo") - @ObfuscatedGetter( - intValue = 1581183769 + intValue = 81504171 ) int field1003; - @ObfuscatedName("bk") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1750260439 + intValue = 1355414019 ) - int field997; - @ObfuscatedName("bv") + @Export("movementSequence") + int movementSequence; + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 681617707 + intValue = 878455421 ) - int field1015; - @ObfuscatedName("bf") + @Export("movementFrame") + int movementFrame; + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 653700287 + intValue = 570882557 ) - int field1016; + @Export("movementFrameCycle") + int movementFrameCycle; @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1078271285 + intValue = -254649357 ) - int field1017; + @Export("sequence") + int sequence; + @ObfuscatedName("bw") + @ObfuscatedGetter( + intValue = 1925242573 + ) + @Export("sequenceFrame") + int sequenceFrame; + @ObfuscatedName("bm") + @ObfuscatedGetter( + intValue = 1589867689 + ) + @Export("sequenceFrameCycle") + int sequenceFrameCycle; + @ObfuscatedName("by") + @ObfuscatedGetter( + intValue = 1211840765 + ) + @Export("sequenceDelay") + int sequenceDelay; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = -192373127 + ) + int field1022; + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = 1626363285 + ) + @Export("spotAnimation") + int spotAnimation; + @ObfuscatedName("br") + @ObfuscatedGetter( + intValue = -1912022721 + ) + @Export("spotAnimationFrame") + int spotAnimationFrame; @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1924227991 + intValue = 806708579 ) - int field1026; - @ObfuscatedName("cg") + @Export("spotAnimationFrameCycle") + int spotAnimationFrameCycle; + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1759966281 + intValue = 419210595 + ) + int field1015; + @ObfuscatedName("bh") + @ObfuscatedGetter( + intValue = -1288579003 + ) + int field1016; + @ObfuscatedName("bk") + @ObfuscatedGetter( + intValue = 2146213825 + ) + int field1017; + @ObfuscatedName("bx") + @ObfuscatedGetter( + intValue = -972516227 + ) + int field1018; + @ObfuscatedName("bi") + @ObfuscatedGetter( + intValue = -180985593 ) int field1019; - @ObfuscatedName("ca") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -480648449 + intValue = 1137308257 ) - int field1027; - @ObfuscatedName("ct") + int field1020; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1077536781 + intValue = 740782339 ) - int npcCycle; - @ObfuscatedName("cv") + int field1009; + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -446174757 - ) - int defaultHeight; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = -1431847965 - ) - int orientation; - @ObfuscatedName("cr") - @ObfuscatedGetter( - intValue = -813760125 + intValue = 968395653 ) int field1024; - @ObfuscatedName("cn") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -2006946605 + intValue = 1324873521 ) - int field1025; - @ObfuscatedName("ci") + int field1023; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -775156313 + intValue = 2110040743 ) - int pathLength; - @ObfuscatedName("cm") - int[] pathX; - @ObfuscatedName("cu") - int[] pathY; - @ObfuscatedName("cw") - byte[] pathTraversed; - @ObfuscatedName("cq") + @Export("npcCycle") + int npcCycle; + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 829057405 + intValue = 1789811467 ) - int field1032; + @Export("defaultHeight") + int defaultHeight; + @ObfuscatedName("cp") + @ObfuscatedGetter( + intValue = 501904063 + ) + @Export("orientation") + int orientation; @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1400209301 + intValue = -816252921 ) - int field973; + int field1027; + @ObfuscatedName("cl") + @ObfuscatedGetter( + intValue = -1271802057 + ) + int field1028; + @ObfuscatedName("ci") + @ObfuscatedGetter( + intValue = -1827352877 + ) + @Export("pathLength") + int pathLength; + @ObfuscatedName("cy") + @Export("pathX") + int[] pathX; + @ObfuscatedName("cx") + @Export("pathY") + int[] pathY; + @ObfuscatedName("ca") + @Export("pathTraversed") + byte[] pathTraversed; + @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = 1285644013 + ) + int field978; + @ObfuscatedName("cw") + @ObfuscatedGetter( + intValue = 392864233 + ) + int field1034; Actor() { this.isWalking = false; // L: 13 - this.field1014 = 1; // L: 14 + this.field1011 = 1; // L: 14 this.idleSequence = -1; // L: 16 this.turnLeftSequence = -1; // L: 17 this.turnRightSequence = -1; // L: 18 @@ -281,7 +327,7 @@ public abstract class Actor extends Entity { this.walkRightSequence = -1; // L: 22 this.runSequence = -1; // L: 23 this.overheadText = null; // L: 24 - this.field986 = false; // L: 26 + this.field974 = false; // L: 26 this.overheadTextCyclesRemaining = 100; // L: 27 this.overheadTextColor = 0; // L: 28 this.overheadTextEffect = 0; // L: 29 @@ -294,7 +340,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); // L: 37 this.targetIndex = -1; // L: 38 this.false0 = false; // L: 39 - this.field1000 = -1; // L: 40 + this.field1003 = -1; // L: 40 this.movementSequence = -1; // L: 41 this.movementFrame = 0; // L: 42 this.movementFrameCycle = 0; // L: 43 @@ -302,46 +348,48 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; // L: 45 this.sequenceFrameCycle = 0; // L: 46 this.sequenceDelay = 0; // L: 47 - this.field1009 = 0; // L: 48 + this.field1022 = 0; // L: 48 this.spotAnimation = -1; // L: 49 this.spotAnimationFrame = 0; // L: 50 this.spotAnimationFrameCycle = 0; // L: 51 this.npcCycle = 0; // L: 61 this.defaultHeight = 200; // L: 62 - this.field1024 = 0; // L: 64 - this.field1025 = 32; // L: 65 + this.field1027 = 0; // L: 64 + this.field1028 = 32; // L: 65 this.pathLength = 0; // L: 66 this.pathX = new int[10]; // L: 67 this.pathY = new int[10]; // L: 68 this.pathTraversed = new byte[10]; // L: 69 - this.field1032 = 0; // L: 70 - this.field973 = 0; // L: 71 + this.field978 = 0; // L: 70 + this.field1034 = 0; // L: 71 } // L: 73 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "68470795" + garbageValue = "2035007323" ) + @Export("isVisible") boolean isVisible() { return false; // L: 81 } - @ObfuscatedName("bc") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-15" + garbageValue = "-104" ) - final void method1797() { + final void method1845() { this.pathLength = 0; // L: 76 - this.field973 = 0; // L: 77 + this.field1034 = 0; // L: 77 } // L: 78 - @ObfuscatedName("bz") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "733671711" + descriptor = "(IIIIIIB)V", + garbageValue = "82" ) + @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; // L: 85 boolean var8 = true; // L: 86 @@ -359,9 +407,9 @@ public abstract class Actor extends Entity { int var10 = -1; // L: 92 int var11 = 0; // L: 93 if (var1 >= 0) { // L: 94 - HitSplatDefinition var12 = MusicPatchNode.method3929(var1); // L: 95 - var10 = var12.field3365; // L: 96 - var11 = var12.field3356; // L: 97 + HitSplatDefinition var12 = class258.method4654(var1); // L: 95 + var10 = var12.field3361; // L: 96 + var11 = var12.field3370; // L: 97 } int var14; @@ -417,519 +465,124 @@ public abstract class Actor extends Entity { } } // L: 138 - @ObfuscatedName("bj") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "-47" + descriptor = "(IIIIIIS)V", + garbageValue = "-1764" ) + @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = class204.method3780(var1); // L: 141 - HealthBar var8 = null; // L: 142 - HealthBar var9 = null; // L: 143 - int var10 = var7.int2; // L: 144 - int var11 = 0; // L: 145 - - HealthBar var12; - for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 146 - ++var11; // L: 147 - if (var12.definition.field3314 == var7.field3314) { // L: 148 - var12.put(var2 + var4, var5, var6, var3); // L: 149 - return; // L: 150 - } - - if (var12.definition.int1 <= var7.int1) { // L: 152 - var8 = var12; - } - - if (var12.definition.int2 > var10) { // L: 153 - var9 = var12; // L: 154 - var10 = var12.definition.int2; // L: 155 - } - } - - if (var9 != null || var11 < 4) { // L: 158 - var12 = new HealthBar(var7); // L: 159 - if (var8 == null) { // L: 160 - this.healthBars.addLast(var12); - } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 161 - } - - var12.put(var2 + var4, var5, var6, var3); // L: 162 - if (var11 >= 4) { // L: 163 - var9.remove(); - } - - } - } // L: 164 - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-28" - ) - final void removeHealthBar(int var1) { - HealthBarDefinition var2 = class204.method3780(var1); // L: 167 - - for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 168 - if (var2 == var3.definition) { // L: 169 - var3.remove(); // L: 170 - return; // L: 171 - } - } - - } // L: 174 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1035211538" - ) - public static void method1810() { - ObjectDefinition.ObjectDefinition_cached.clear(); // L: 416 - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 417 - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); // L: 418 - ObjectDefinition.ObjectDefinition_cachedModels.clear(); // L: 419 - } // L: 420 - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "736101233" - ) - static int method1798(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 1913 - if (class60.friendSystem.field1099 == 0) { // L: 1914 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (class60.friendSystem.field1099 == 1) { // L: 1915 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.friendsList.getSize(); // L: 1916 - } - - return 1; // L: 1917 + HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 143 + HealthBarDefinition var7; + if (var8 != null) { // L: 144 + var7 = var8; // L: 145 } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1920 - if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.friendsList.getSize()) { // L: 1921 - Friend var8 = (Friend)class60.friendSystem.friendsList.get(var3); // L: 1922 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var8.getName(); // L: 1923 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 1924 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1927 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1928 - } - - return 1; // L: 1930 - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1933 - if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.friendsList.getSize()) { // L: 1934 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class60.friendSystem.friendsList.get(var3)).world; // L: 1935 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1937 - } - - return 1; // L: 1938 - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1941 - if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.friendsList.getSize()) { // L: 1942 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class60.friendSystem.friendsList.get(var3)).rank; // L: 1943 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1945 - } - - return 1; // L: 1946 - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1949 - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1950 - class279.method5092(var5, var6); // L: 1951 - return 1; // L: 1952 - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1955 - class60.friendSystem.addFriend(var5); // L: 1956 - return 1; // L: 1957 - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1960 - class60.friendSystem.removeFriend(var5); // L: 1961 - return 1; // L: 1962 - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1965 - class60.friendSystem.addIgnore(var5); // L: 1966 - return 1; // L: 1967 - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1970 - class60.friendSystem.removeIgnore(var5); // L: 1971 - return 1; // L: 1972 - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1975 - var5 = SecureRandomCallable.method1202(var5); // L: 1976 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.isFriended(new Username(var5, WorldMapAreaData.loginType), false) ? 1 : 0; // L: 1977 - return 1; // L: 1978 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (Entity.clanChat != null) { // L: 1981 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Entity.clanChat.name; // L: 1982 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1984 - } - - return 1; // L: 1985 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (Entity.clanChat != null) { // L: 1988 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Entity.clanChat.getSize(); // L: 1989 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1991 - } - - return 1; // L: 1992 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1995 - if (Entity.clanChat != null && var3 < Entity.clanChat.getSize()) { // L: 1996 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Entity.clanChat.get(var3).getUsername().getName(); // L: 1997 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1999 - } - - return 1; // L: 2000 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2003 - if (Entity.clanChat != null && var3 < Entity.clanChat.getSize()) { // L: 2004 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Entity.clanChat.get(var3)).getWorld(); // L: 2005 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2007 - } - - return 1; // L: 2008 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2011 - if (Entity.clanChat != null && var3 < Entity.clanChat.getSize()) { // L: 2012 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Entity.clanChat.get(var3)).rank; // L: 2013 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2015 - } - - return 1; // L: 2016 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Entity.clanChat != null ? Entity.clanChat.minKick : 0; // L: 2019 - return 1; // L: 2020 - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2023 - Frames.clanKickUser(var5); // L: 2024 - return 1; // L: 2025 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Entity.clanChat != null ? Entity.clanChat.rank * 996591213 * 253506405 : 0; // L: 2028 - return 1; // L: 2029 - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2032 - MusicPatchNode.Clan_joinChat(var5); // L: 2033 - return 1; // L: 2034 - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - AbstractByteArrayCopier.Clan_leaveChat(); // L: 2037 - return 1; // L: 2038 - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!class60.friendSystem.method1972()) { // L: 2041 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.ignoreList.getSize(); // L: 2042 - } - - return 1; // L: 2043 - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2046 - if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.ignoreList.getSize()) { // L: 2047 - Ignored var4 = (Ignored)class60.friendSystem.ignoreList.get(var3); // L: 2048 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2049 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2050 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2053 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2054 - } - - return 1; // L: 2056 - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2059 - var5 = SecureRandomCallable.method1202(var5); // L: 2060 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.isIgnored(new Username(var5, WorldMapAreaData.loginType)) ? 1 : 0; // L: 2061 - return 1; // L: 2062 - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2065 - if (Entity.clanChat != null && var3 < Entity.clanChat.getSize() && Entity.clanChat.get(var3).getUsername().equals(WorldMapLabelSize.localPlayer.username)) { // L: 2066 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2067 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2069 - } - - return 1; // L: 2070 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (Entity.clanChat != null && Entity.clanChat.owner != null) { // L: 2073 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Entity.clanChat.owner; // L: 2074 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2076 - } - - return 1; // L: 2077 - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2080 - if (Entity.clanChat != null && var3 < Entity.clanChat.getSize() && ((ClanMate)Entity.clanChat.get(var3)).isFriend()) { // L: 2081 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2082 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2084 - } - - return 1; // L: 2085 - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - class60.friendSystem.friendsList.removeComparator(); // L: 2096 - return 1; // L: 2097 - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2100 - class60.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2101 - return 1; // L: 2102 - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2105 - class60.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2106 - return 1; // L: 2107 - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2110 - class60.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2111 - return 1; // L: 2112 - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2115 - class60.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2116 - return 1; // L: 2117 - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2120 - class60.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2121 - return 1; // L: 2122 - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2125 - class60.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2126 - return 1; // L: 2127 - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2130 - class60.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2131 - return 1; // L: 2132 - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2135 - class60.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2136 - return 1; // L: 2137 - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2140 - class60.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2141 - return 1; // L: 2142 - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2145 - class60.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2146 - return 1; // L: 2147 - } else if (var0 == 3639) { - class60.friendSystem.friendsList.sort(); // L: 2150 - return 1; // L: 2151 - } else if (var0 == 3640) { - class60.friendSystem.ignoreList.removeComparator(); // L: 2154 - return 1; // L: 2155 - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2158 - class60.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2159 - return 1; // L: 2160 - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2163 - class60.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2164 - return 1; // L: 2165 - } else if (var0 == 3643) { - class60.friendSystem.ignoreList.sort(); // L: 2168 - return 1; // L: 2169 - } else if (var0 == 3644) { - if (Entity.clanChat != null) { // L: 2172 - Entity.clanChat.removeComparator(); // L: 2173 - } - - return 1; // L: 2175 - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2178 - if (Entity.clanChat != null) { // L: 2179 - Entity.clanChat.addComparator(new UserComparator1(var7)); // L: 2180 - } - - return 1; // L: 2182 - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2185 - if (Entity.clanChat != null) { // L: 2186 - Entity.clanChat.addComparator(new UserComparator2(var7)); // L: 2187 - } - - return 1; // L: 2189 - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2192 - if (Entity.clanChat != null) { // L: 2193 - Entity.clanChat.addComparator(new UserComparator3(var7)); // L: 2194 - } - - return 1; // L: 2196 - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2199 - if (Entity.clanChat != null) { // L: 2200 - Entity.clanChat.addComparator(new UserComparator4(var7)); // L: 2201 - } - - return 1; // L: 2203 - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2206 - if (Entity.clanChat != null) { // L: 2207 - Entity.clanChat.addComparator(new UserComparator5(var7)); // L: 2208 - } - - return 1; // L: 2210 - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2213 - if (Entity.clanChat != null) { // L: 2214 - Entity.clanChat.addComparator(new UserComparator6(var7)); // L: 2215 - } - - return 1; // L: 2217 - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2220 - if (Entity.clanChat != null) { // L: 2221 - Entity.clanChat.addComparator(new UserComparator7(var7)); // L: 2222 - } - - return 1; // L: 2224 - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2227 - if (Entity.clanChat != null) { // L: 2228 - Entity.clanChat.addComparator(new UserComparator8(var7)); // L: 2229 - } - - return 1; // L: 2231 - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2234 - if (Entity.clanChat != null) { // L: 2235 - Entity.clanChat.addComparator(new UserComparator9(var7)); // L: 2236 - } - - return 1; // L: 2238 - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2241 - if (Entity.clanChat != null) { // L: 2242 - Entity.clanChat.addComparator(new UserComparator10(var7)); // L: 2243 - } - - return 1; // L: 2245 - } else if (var0 == 3655) { - if (Entity.clanChat != null) { // L: 2248 - Entity.clanChat.sort(); // L: 2249 - } - - return 1; // L: 2251 - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2254 - class60.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2255 - return 1; // L: 2256 - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2259 - if (Entity.clanChat != null) { // L: 2260 - Entity.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2261 - } - - return 1; // L: 2263 - } else { - return 2; // L: 2265 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2088 - if (Entity.clanChat != null && var3 < Entity.clanChat.getSize() && ((ClanMate)Entity.clanChat.get(var3)).isIgnored()) { // L: 2089 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2090 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2092 - } - - return 1; // L: 2093 - } + byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 148 + var8 = new HealthBarDefinition(); // L: 149 + if (var9 != null) { // L: 150 + var8.decode(new Buffer(var9)); } + + HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); // L: 151 + var7 = var8; // L: 152 + } + + var8 = var7; // L: 154 + HealthBar var14 = null; // L: 155 + HealthBar var10 = null; // L: 156 + int var11 = var7.int2; // L: 157 + int var12 = 0; // L: 158 + + HealthBar var13; + for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { // L: 159 + ++var12; // L: 160 + if (var13.definition.field3310 == var8.field3310) { // L: 161 + var13.put(var2 + var4, var5, var6, var3); // L: 162 + return; // L: 163 + } + + if (var13.definition.int1 <= var8.int1) { // L: 165 + var14 = var13; + } + + if (var13.definition.int2 > var11) { // L: 166 + var10 = var13; // L: 167 + var11 = var13.definition.int2; // L: 168 + } + } + + if (var10 != null || var12 < 4) { // L: 171 + var13 = new HealthBar(var8); // L: 172 + if (var14 == null) { // L: 173 + this.healthBars.addLast(var13); + } else { + IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); // L: 174 + } + + var13.put(var2 + var4, var5, var6, var3); // L: 175 + if (var12 >= 4) { // L: 176 + var10.remove(); + } + + } + } // L: 177 + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1931669108" + ) + @Export("removeHealthBar") + final void removeHealthBar(int var1) { + HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); // L: 182 + HealthBarDefinition var2; + if (var3 != null) { // L: 183 + var2 = var3; // L: 184 + } else { + byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); // L: 187 + var3 = new HealthBarDefinition(); // L: 188 + if (var4 != null) { // L: 189 + var3.decode(new Buffer(var4)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); // L: 190 + var2 = var3; // L: 191 + } + + var3 = var2; // L: 193 + + for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { // L: 194 + if (var3 == var5.definition) { // L: 195 + var5.remove(); // L: 196 + return; // L: 197 + } + } + + } // L: 200 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)Lft;", + garbageValue = "17" + ) + public static Clock method1864() { + try { + return new NanoClock(); // L: 8 + } catch (Throwable var1) { // L: 10 + return new MilliClock(); // L: 11 } } - @ObfuscatedName("fx") + @ObfuscatedName("fn") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-48" + descriptor = "(I)V", + garbageValue = "-1341349782" ) - static final void method1805() { - class2.method41(); // L: 2529 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 2531 - KitDefinition.KitDefinition_cached.clear(); // L: 2534 - method1810(); // L: 2536 - NPCDefinition.NpcDefinition_cached.clear(); // L: 2538 - NPCDefinition.NpcDefinition_cachedModels.clear(); // L: 2539 - GameObject.method3412(); // L: 2541 - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2543 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2544 - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2547 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2548 - NetSocket.method3626(); // L: 2550 - GrandExchangeEvents.method143(); // L: 2551 - HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 2553 - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 2554 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 2555 - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 2558 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 2559 - ArchiveDiskAction.method4233(); // L: 2561 - CollisionMap.method3653(); // L: 2562 - Varps.method4066(); // L: 2563 - PlayerAppearance.PlayerAppearance_cachedModels.clear(); // L: 2565 - SecureRandomCallable.method1203(); // L: 2567 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2568 - Script.Script_cached.clear(); // L: 2569 - class182.archive0.clearFiles(); // L: 2570 - Client.archive1.clearFiles(); // L: 2571 - WorldMapID.archive3.clearFiles(); // L: 2572 - GrandExchangeOfferUnitPriceComparator.archive4.clearFiles(); // L: 2573 - WorldMapLabel.archive5.clearFiles(); // L: 2574 - CollisionMap.archive6.clearFiles(); // L: 2575 - WorldMapSection1.archive7.clearFiles(); // L: 2576 - Huffman.archive8.clearFiles(); // L: 2577 - UrlRequester.archive9.clearFiles(); // L: 2578 - Occluder.archive10.clearFiles(); // L: 2579 - GrandExchangeEvent.archive11.clearFiles(); // L: 2580 - ApproximateRouteStrategy.archive12.clearFiles(); // L: 2581 - } // L: 2582 - - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-1341362245" - ) - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 3963 - byte var2 = 4; // L: 3964 - int var3 = var2 + 6; // L: 3965 - int var4 = var2 + 6; // L: 3966 - int var5 = ItemDefinition.fontPlain12.lineWidth(var0, 250); // L: 3967 - int var6 = ItemDefinition.fontPlain12.lineCount(var0, 250) * 13; // L: 3968 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 0); // L: 3969 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var2 + var6, 16777215); // L: 3970 - ItemDefinition.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 3971 - int var7 = var3 - var2; // L: 3972 - int var8 = var4 - var2; // L: 3973 - int var9 = var5 + var2 + var2; // L: 3974 - int var10 = var2 + var6 + var2; // L: 3975 - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 3977 - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 3978 - Client.field882[var11] = true; - } - } - - if (var1) { // L: 3981 - WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 3982 - } else { - HealthBarUpdate.method1817(var3, var4, var5, var6); // L: 3985 - } - - } - } // L: 3987 + static void method1855() { + PacketBufferNode var0 = class4.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); // L: 4218 + var0.packetBuffer.writeByte(UrlRequester.getWindowedMode()); // L: 4219 + var0.packetBuffer.writeShort(ItemContainer.canvasWidth); // L: 4220 + var0.packetBuffer.writeShort(HealthBar.canvasHeight); // L: 4221 + Client.packetWriter.addNode(var0); // L: 4222 + } // L: 4223 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index b203524157..44033dbf6c 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -1,43 +1,53 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("es") +@ObfuscatedName("er") +@Implements("Animation") public class Animation { - @ObfuscatedName("z") - static int[] field1659; - @ObfuscatedName("k") - static int[] field1658; - @ObfuscatedName("s") - static int[] field1667; - @ObfuscatedName("t") - static int[] field1660; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Leh;" - ) - Skeleton skeleton; - @ObfuscatedName("o") - int transformCount; - @ObfuscatedName("x") - int[] transformSkeletonLabels; - @ObfuscatedName("w") - int[] transformXs; - @ObfuscatedName("g") - int[] transformYs; + @ObfuscatedName("f") + static int[] field1662; + @ObfuscatedName("b") + static int[] field1661; + @ObfuscatedName("l") + static int[] field1669; @ObfuscatedName("m") + static int[] field1663; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lei;" + ) + @Export("skeleton") + Skeleton skeleton; + @ObfuscatedName("q") + @Export("transformCount") + int transformCount; + @ObfuscatedName("k") + @Export("transformSkeletonLabels") + int[] transformSkeletonLabels; + @ObfuscatedName("c") + @Export("transformXs") + int[] transformXs; + @ObfuscatedName("u") + @Export("transformYs") + int[] transformYs; + @ObfuscatedName("t") + @Export("transformZs") int[] transformZs; - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1659 = new int[500]; // L: 8 - field1658 = new int[500]; // L: 9 - field1667 = new int[500]; // L: 10 - field1660 = new int[500]; // L: 11 + field1662 = new int[500]; // L: 8 + field1661 = new int[500]; // L: 9 + field1669 = new int[500]; // L: 10 + field1663 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLeh;)V" + descriptor = "([BLei;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; // L: 12 @@ -59,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { // L: 32 for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33 if (this.skeleton.transformTypes[var10] == 0) { // L: 34 - field1659[var7] = var10; // L: 35 - field1658[var7] = 0; // L: 36 - field1667[var7] = 0; // L: 37 - field1660[var7] = 0; // L: 38 + field1662[var7] = var10; // L: 35 + field1661[var7] = 0; // L: 36 + field1669[var7] = 0; // L: 37 + field1663[var7] = 0; // L: 38 ++var7; // L: 39 break; } } } - field1659[var7] = var8; // L: 44 + field1662[var7] = var8; // L: 44 short var11 = 0; // L: 45 if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } if ((var9 & 1) != 0) { // L: 47 - field1658[var7] = var4.readShortSmart(); + field1661[var7] = var4.readShortSmart(); } else { - field1658[var7] = var11; // L: 48 + field1661[var7] = var11; // L: 48 } if ((var9 & 2) != 0) { // L: 49 - field1667[var7] = var4.readShortSmart(); + field1669[var7] = var4.readShortSmart(); } else { - field1667[var7] = var11; // L: 50 + field1669[var7] = var11; // L: 50 } if ((var9 & 4) != 0) { // L: 51 - field1660[var7] = var4.readShortSmart(); + field1663[var7] = var4.readShortSmart(); } else { - field1660[var7] = var11; // L: 52 + field1663[var7] = var11; // L: 52 } var6 = var8; // L: 53 @@ -111,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; // L: 65 for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field1659[var8]; // L: 67 - this.transformXs[var8] = field1658[var8]; // L: 68 - this.transformYs[var8] = field1667[var8]; // L: 69 - this.transformZs[var8] = field1660[var8]; // L: 70 + this.transformSkeletonLabels[var8] = field1662[var8]; // L: 67 + this.transformXs[var8] = field1661[var8]; // L: 68 + this.transformYs[var8] = field1669[var8]; // L: 69 + this.transformZs[var8] = field1663[var8]; // L: 70 } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 4ef074e3e4..de77421852 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,156 +1,670 @@ -import java.awt.FontMetrics; +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("bv") +@ObfuscatedName("bx") +@Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("qm") + @ObfuscatedName("d") + static String field642; + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lid;" ) - static Sprite sceneMinimapSprite; - @ObfuscatedName("an") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("dp") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive12; + @Export("archive6") + static Archive archive6; ApproximateRouteStrategy() { - } // L: 10971 + } // L: 11760 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIILft;I)Z", - garbageValue = "-1274441547" + descriptor = "(IIILfh;I)Z", + garbageValue = "-1510519179" ) + @Export("hasArrived") protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 10974 + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11763 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)[Lix;", - garbageValue = "64" + descriptor = "(IB)I", + garbageValue = "14" ) - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.field3131}; // L: 20 + @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[] var3 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); + var2 = new VarbitDefinition(); + if (var3 != null) { + var2.decode(new Buffer(var3)); + } + + VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); + var1 = var2; + } + + int var7 = var1.baseVar; + int var4 = var1.startBit; + int var5 = var1.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + return Varps.Varps_main[var7] >> var4 & var6; // L: 42 } - @ObfuscatedName("t") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1823919909" + descriptor = "(IIILgm;Lfh;Z[I[II)I", + garbageValue = "-1489955053" ) - static int method1274(int var0, Script var1, boolean var2) { - int var4; + public static int method1321(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 430 - Interpreter.Interpreter_intStackSize -= 3; // L: 431 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 432 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 433 - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 434 - if (var4 == 0) { // L: 435 - throw new RuntimeException(); // L: 436 - } else { - Widget var6 = TileItem.getWidget(var9); // L: 438 - if (var6.children == null) { // L: 439 - var6.children = new Widget[var11 + 1]; + for (int var8 = 0; var8 < 128; ++var8) { + for (var9 = 0; var9 < 128; ++var9) { + class182.directions[var8][var9] = 0; + class182.distances[var8][var9] = 99999999; + } + } + + int var10; + int var11; + byte var12; + byte var13; + int var14; + int var15; + byte var16; + int var17; + int[][] var18; + int var19; + int var20; + int var21; + int var22; + boolean var28; + boolean var29; + int var30; + int var31; + int var33; + if (var2 == 1) { + var10 = var0; // L: 29 + var11 = var1; + var12 = 64; // L: 31 + var13 = 64; // L: 32 + var14 = var0 - var12; // L: 33 + var15 = var1 - var13; // L: 34 + class182.directions[var12][var13] = 99; // L: 35 + class182.distances[var12][var13] = 0; // L: 36 + var16 = 0; // L: 37 + var17 = 0; // L: 38 + class182.bufferX[var16] = var0; // L: 39 + var33 = var16 + 1; + class182.bufferY[var16] = var1; // L: 40 + var18 = var4.flags; // L: 41 + + while (true) { + if (var17 == var33) { // L: 44 + Ignored.field3637 = var10; // L: 116 + class182.field2122 = var11; // L: 117 + var29 = false; // L: 118 + break; } - if (var6.children.length <= var11) { // L: 440 - Widget[] var7 = new Widget[var11 + 1]; // L: 441 - - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 442 - var7[var8] = var6.children[var8]; - } - - var6.children = var7; // L: 443 + var10 = class182.bufferX[var17]; // L: 45 + var11 = class182.bufferY[var17]; // L: 46 + var17 = var17 + 1 & 4095; // L: 47 + var30 = var10 - var14; // L: 48 + var31 = var11 - var15; // L: 49 + var19 = var10 - var4.xInset; // L: 50 + var20 = var11 - var4.yInset; // L: 51 + if (var3.hasArrived(1, var10, var11, var4)) { // L: 52 + Ignored.field3637 = var10; // L: 53 + class182.field2122 = var11; // L: 54 + var29 = true; // L: 55 + break; } - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 445 - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); // L: 446 - var12.type = var4; // L: 447 - var12.parentId = var12.id = var6.id; // L: 448 - var12.childIndex = var11; // L: 449 - var12.isIf3 = true; // L: 450 - var6.children[var11] = var12; // L: 451 - if (var2) { // L: 452 - Canvas.field438 = var12; - } else { - class3.field12 = var12; // L: 453 - } + var21 = class182.distances[var30][var31] + 1; // L: 58 + if (var30 > 0 && class182.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) { // L: 59 + class182.bufferX[var33] = var10 - 1; // L: 60 + class182.bufferY[var33] = var11; // L: 61 + var33 = var33 + 1 & 4095; // L: 62 + class182.directions[var30 - 1][var31] = 2; // L: 63 + class182.distances[var30 - 1][var31] = var21; // L: 64 + } - class52.invalidateWidget(var6); // L: 454 - return 1; // L: 455 + if (var30 < 127 && class182.directions[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) { // L: 66 + class182.bufferX[var33] = var10 + 1; // L: 67 + class182.bufferY[var33] = var11; // L: 68 + var33 = var33 + 1 & 4095; // L: 69 + class182.directions[var30 + 1][var31] = 8; // L: 70 + class182.distances[var30 + 1][var31] = var21; // L: 71 + } + + if (var31 > 0 && class182.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 73 + class182.bufferX[var33] = var10; // L: 74 + class182.bufferY[var33] = var11 - 1; // L: 75 + var33 = var33 + 1 & 4095; // L: 76 + class182.directions[var30][var31 - 1] = 1; // L: 77 + class182.distances[var30][var31 - 1] = var21; // L: 78 + } + + if (var31 < 127 && class182.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 80 + class182.bufferX[var33] = var10; // L: 81 + class182.bufferY[var33] = var11 + 1; // L: 82 + var33 = var33 + 1 & 4095; // L: 83 + class182.directions[var30][var31 + 1] = 4; // L: 84 + class182.distances[var30][var31 + 1] = var21; // L: 85 + } + + if (var30 > 0 && var31 > 0 && class182.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 87 + class182.bufferX[var33] = var10 - 1; // L: 88 + class182.bufferY[var33] = var11 - 1; // L: 89 + var33 = var33 + 1 & 4095; // L: 90 + class182.directions[var30 - 1][var31 - 1] = 3; // L: 91 + class182.distances[var30 - 1][var31 - 1] = var21; // L: 92 + } + + if (var30 < 127 && var31 > 0 && class182.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 94 + class182.bufferX[var33] = var10 + 1; // L: 95 + class182.bufferY[var33] = var11 - 1; // L: 96 + var33 = var33 + 1 & 4095; // L: 97 + class182.directions[var30 + 1][var31 - 1] = 9; // L: 98 + class182.distances[var30 + 1][var31 - 1] = var21; // L: 99 + } + + if (var30 > 0 && var31 < 127 && class182.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 101 + class182.bufferX[var33] = var10 - 1; // L: 102 + class182.bufferY[var33] = var11 + 1; // L: 103 + var33 = var33 + 1 & 4095; // L: 104 + class182.directions[var30 - 1][var31 + 1] = 6; // L: 105 + class182.distances[var30 - 1][var31 + 1] = var21; // L: 106 + } + + if (var30 < 127 && var31 < 127 && class182.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 108 + class182.bufferX[var33] = var10 + 1; // L: 109 + class182.bufferY[var33] = var11 + 1; // L: 110 + var33 = var33 + 1 & 4095; // L: 111 + class182.directions[var30 + 1][var31 + 1] = 12; // L: 112 + class182.distances[var30 + 1][var31 + 1] = var21; // L: 113 } } + + var28 = var29; // L: 120 + } else if (var2 == 2) { // L: 122 + var10 = var0; // L: 125 + var11 = var1; // L: 126 + var12 = 64; // L: 127 + var13 = 64; // L: 128 + var14 = var0 - var12; // L: 129 + var15 = var1 - var13; // L: 130 + class182.directions[var12][var13] = 99; // L: 131 + class182.distances[var12][var13] = 0; // L: 132 + var16 = 0; // L: 133 + var17 = 0; // L: 134 + class182.bufferX[var16] = var0; // L: 135 + var33 = var16 + 1; + class182.bufferY[var16] = var1; // L: 136 + var18 = var4.flags; // L: 137 + + while (true) { + if (var33 == var17) { // L: 138 + Ignored.field3637 = var10; // L: 238 + class182.field2122 = var11; // L: 239 + var29 = false; // L: 240 + break; + } + + var10 = class182.bufferX[var17]; // L: 139 + var11 = class182.bufferY[var17]; // L: 140 + var17 = var17 + 1 & 4095; // L: 141 + var30 = var10 - var14; // L: 142 + var31 = var11 - var15; // L: 143 + var19 = var10 - var4.xInset; // L: 144 + var20 = var11 - var4.yInset; // L: 145 + if (var3.hasArrived(2, var10, var11, var4)) { // L: 146 + Ignored.field3637 = var10; // L: 147 + class182.field2122 = var11; // L: 148 + var29 = true; // L: 149 + break; + } + + var21 = class182.distances[var30][var31] + 1; // L: 152 + if (var30 > 0 && class182.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0) { // L: 153 154 155 156 + class182.bufferX[var33] = var10 - 1; // L: 157 + class182.bufferY[var33] = var11; // L: 158 + var33 = var33 + 1 & 4095; // L: 159 + class182.directions[var30 - 1][var31] = 2; // L: 160 + class182.distances[var30 - 1][var31] = var21; // L: 161 + } + + if (var30 < 126 && class182.directions[var30 + 1][var31] == 0 && (var18[var19 + 2][var20] & 19136899) == 0 && (var18[var19 + 2][var20 + 1] & 19136992) == 0) { // L: 163 164 165 166 + class182.bufferX[var33] = var10 + 1; // L: 167 + class182.bufferY[var33] = var11; // L: 168 + var33 = var33 + 1 & 4095; // L: 169 + class182.directions[var30 + 1][var31] = 8; // L: 170 + class182.distances[var30 + 1][var31] = var21; // L: 171 + } + + if (var31 > 0 && class182.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0) { // L: 173 174 175 176 + class182.bufferX[var33] = var10; // L: 177 + class182.bufferY[var33] = var11 - 1; // L: 178 + var33 = var33 + 1 & 4095; // L: 179 + class182.directions[var30][var31 - 1] = 1; // L: 180 + class182.distances[var30][var31 - 1] = var21; // L: 181 + } + + if (var31 < 126 && class182.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 2] & 19136824) == 0 && (var18[var19 + 1][var20 + 2] & 19136992) == 0) { // L: 183 184 185 186 + class182.bufferX[var33] = var10; // L: 187 + class182.bufferY[var33] = var11 + 1; // L: 188 + var33 = var33 + 1 & 4095; // L: 189 + class182.directions[var30][var31 + 1] = 4; // L: 190 + class182.distances[var30][var31 + 1] = var21; // L: 191 + } + + if (var30 > 0 && var31 > 0 && class182.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20] & 19136830) == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19][var20 - 1] & 19136911) == 0) { // L: 193 194 195 196 197 + class182.bufferX[var33] = var10 - 1; // L: 198 + class182.bufferY[var33] = var11 - 1; // L: 199 + var33 = var33 + 1 & 4095; // L: 200 + class182.directions[var30 - 1][var31 - 1] = 3; // L: 201 + class182.distances[var30 - 1][var31 - 1] = var21; // L: 202 + } + + if (var30 < 126 && var31 > 0 && class182.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136911) == 0 && (var18[var19 + 2][var20 - 1] & 19136899) == 0 && (var18[var19 + 2][var20] & 19136995) == 0) { // L: 204 205 206 207 208 + class182.bufferX[var33] = var10 + 1; // L: 209 + class182.bufferY[var33] = var11 - 1; // L: 210 + var33 = var33 + 1 & 4095; // L: 211 + class182.directions[var30 + 1][var31 - 1] = 9; // L: 212 + class182.distances[var30 + 1][var31 - 1] = var21; // L: 213 + } + + if (var30 > 0 && var31 < 126 && class182.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136830) == 0 && (var18[var19 - 1][var20 + 2] & 19136824) == 0 && (var18[var19][var20 + 2] & 19137016) == 0) { // L: 215 216 217 218 219 + class182.bufferX[var33] = var10 - 1; // L: 220 + class182.bufferY[var33] = var11 + 1; // L: 221 + var33 = var33 + 1 & 4095; // L: 222 + class182.directions[var30 - 1][var31 + 1] = 6; // L: 223 + class182.distances[var30 - 1][var31 + 1] = var21; // L: 224 + } + + if (var30 < 126 && var31 < 126 && class182.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 2] & 19137016) == 0 && (var18[var19 + 2][var20 + 2] & 19136992) == 0 && (var18[var19 + 2][var20 + 1] & 19136995) == 0) { // L: 226 227 228 229 230 + class182.bufferX[var33] = var10 + 1; // L: 231 + class182.bufferY[var33] = var11 + 1; // L: 232 + var33 = var33 + 1 & 4095; // L: 233 + class182.directions[var30 + 1][var31 + 1] = 12; // L: 234 + class182.distances[var30 + 1][var31 + 1] = var21; // L: 235 + } + } + + var28 = var29; // L: 242 } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 457 - var3 = var2 ? Canvas.field438 : class3.field12; // L: 458 - Widget var10 = TileItem.getWidget(var3.id); // L: 459 - var10.children[var3.childIndex] = null; // L: 460 - class52.invalidateWidget(var10); // L: 461 - return 1; // L: 462 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 464 - var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 465 - var3.children = null; // L: 466 - class52.invalidateWidget(var3); // L: 467 - return 1; // L: 468 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 470 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 483 - var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 484 - if (var3 != null) { // L: 485 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 486 - if (var2) { // L: 487 - Canvas.field438 = var3; - } else { - class3.field12 = var3; // L: 488 + var10 = var0; // L: 247 + var11 = var1; // L: 248 + var12 = 64; // L: 249 + var13 = 64; // L: 250 + var14 = var0 - var12; // L: 251 + var15 = var1 - var13; // L: 252 + class182.directions[var12][var13] = 99; // L: 253 + class182.distances[var12][var13] = 0; // L: 254 + var16 = 0; // L: 255 + var17 = 0; // L: 256 + class182.bufferX[var16] = var0; // L: 257 + var33 = var16 + 1; + class182.bufferY[var16] = var1; // L: 258 + var18 = var4.flags; // L: 259 + + label761: + while (true) { + label759: + while (true) { + do { + do { + do { + label736: + do { + if (var17 == var33) { // L: 260 + Ignored.field3637 = var10; // L: 380 + class182.field2122 = var11; // L: 381 + var29 = false; // L: 382 + break label761; + } + + var10 = class182.bufferX[var17]; // L: 261 + var11 = class182.bufferY[var17]; // L: 262 + var17 = var17 + 1 & 4095; // L: 263 + var30 = var10 - var14; // L: 264 + var31 = var11 - var15; // L: 265 + var19 = var10 - var4.xInset; // L: 266 + var20 = var11 - var4.yInset; // L: 267 + if (var3.hasArrived(var2, var10, var11, var4)) { // L: 268 + Ignored.field3637 = var10; // L: 269 + class182.field2122 = var11; // L: 270 + var29 = true; // L: 271 + break label761; + } + + var21 = class182.distances[var30][var31] + 1; // L: 274 + if (var30 > 0 && class182.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + var2 - 1] & 19136824) == 0) { // L: 275 276 277 278 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class182.bufferX[var33] = var10 - 1; // L: 282 + class182.bufferY[var33] = var11; // L: 283 + var33 = var33 + 1 & 4095; // L: 284 + class182.directions[var30 - 1][var31] = 2; // L: 285 + class182.distances[var30 - 1][var31] = var21; // L: 286 + break; + } + + if ((var18[var19 - 1][var22 + var20] & 19136830) != 0) { // L: 280 + break; + } + + ++var22; // L: 279 + } + } + + if (var30 < 128 - var2 && class182.directions[var30 + 1][var31] == 0 && (var18[var19 + var2][var20] & 19136899) == 0 && (var18[var19 + var2][var20 + var2 - 1] & 19136992) == 0) { // L: 288 289 290 291 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class182.bufferX[var33] = var10 + 1; // L: 295 + class182.bufferY[var33] = var11; // L: 296 + var33 = var33 + 1 & 4095; // L: 297 + class182.directions[var30 + 1][var31] = 8; // L: 298 + class182.distances[var30 + 1][var31] = var21; // L: 299 + break; + } + + if ((var18[var19 + var2][var20 + var22] & 19136995) != 0) { // L: 293 + break; + } + + ++var22; // L: 292 + } + } + + if (var31 > 0 && class182.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + var2 - 1][var20 - 1] & 19136899) == 0) { // L: 301 302 303 304 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class182.bufferX[var33] = var10; // L: 308 + class182.bufferY[var33] = var11 - 1; // L: 309 + var33 = var33 + 1 & 4095; // L: 310 + class182.directions[var30][var31 - 1] = 1; // L: 311 + class182.distances[var30][var31 - 1] = var21; // L: 312 + break; + } + + if ((var18[var22 + var19][var20 - 1] & 19136911) != 0) { // L: 306 + break; + } + + ++var22; // L: 305 + } + } + + if (var31 < 128 - var2 && class182.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + var2] & 19136824) == 0 && (var18[var19 + var2 - 1][var20 + var2] & 19136992) == 0) { // L: 314 315 316 317 + var22 = 1; + + while (true) { + if (var22 >= var2 - 1) { + class182.bufferX[var33] = var10; // L: 321 + class182.bufferY[var33] = var11 + 1; // L: 322 + var33 = var33 + 1 & 4095; // L: 323 + class182.directions[var30][var31 + 1] = 4; // L: 324 + class182.distances[var30][var31 + 1] = var21; // L: 325 + break; + } + + if ((var18[var19 + var22][var20 + var2] & 19137016) != 0) { // L: 319 + break; + } + + ++var22; // L: 318 + } + } + + if (var30 > 0 && var31 > 0 && class182.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0) { // L: 327 328 329 + var22 = 1; + + while (true) { + if (var22 >= var2) { + class182.bufferX[var33] = var10 - 1; // L: 334 + class182.bufferY[var33] = var11 - 1; // L: 335 + var33 = var33 + 1 & 4095; // L: 336 + class182.directions[var30 - 1][var31 - 1] = 3; // L: 337 + class182.distances[var30 - 1][var31 - 1] = var21; // L: 338 + break; + } + + if ((var18[var19 - 1][var22 + (var20 - 1)] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 - 1] & 19136911) != 0) { // L: 331 332 + break; + } + + ++var22; // L: 330 + } + } + + if (var30 < 128 - var2 && var31 > 0 && class182.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + var2][var20 - 1] & 19136899) == 0) { // L: 340 341 342 + var22 = 1; + + while (true) { + if (var22 >= var2) { + class182.bufferX[var33] = var10 + 1; // L: 347 + class182.bufferY[var33] = var11 - 1; // L: 348 + var33 = var33 + 1 & 4095; // L: 349 + class182.directions[var30 + 1][var31 - 1] = 9; // L: 350 + class182.distances[var30 + 1][var31 - 1] = var21; // L: 351 + break; + } + + if ((var18[var19 + var2][var22 + (var20 - 1)] & 19136995) != 0 || (var18[var22 + var19][var20 - 1] & 19136911) != 0) { // L: 344 345 + break; + } + + ++var22; // L: 343 + } + } + + if (var30 > 0 && var31 < 128 - var2 && class182.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + var2] & 19136824) == 0) { // L: 353 354 355 + for (var22 = 1; var22 < var2; ++var22) { // L: 356 + if ((var18[var19 - 1][var22 + var20] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 + var2] & 19137016) != 0) { // L: 357 358 + continue label736; + } + } + + class182.bufferX[var33] = var10 - 1; // L: 360 + class182.bufferY[var33] = var11 + 1; // L: 361 + var33 = var33 + 1 & 4095; // L: 362 + class182.directions[var30 - 1][var31 + 1] = 6; // L: 363 + class182.distances[var30 - 1][var31 + 1] = var21; // L: 364 + } + } while(var30 >= 128 - var2); // L: 366 + } while(var31 >= 128 - var2); + } while(class182.directions[var30 + 1][var31 + 1] != 0); // L: 367 + } while((var18[var19 + var2][var20 + var2] & 19136992) != 0); // L: 368 + + for (var22 = 1; var22 < var2; ++var22) { // L: 369 + if ((var18[var19 + var22][var20 + var2] & 19137016) != 0 || (var18[var19 + var2][var22 + var20] & 19136995) != 0) { // L: 370 371 + continue label759; } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 490 } - return 1; // L: 491 - } else { - return 2; // L: 493 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 471 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 472 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 473 - Widget var5 = SecureRandomCallable.getWidgetChild(var9, var4); // L: 474 - if (var5 != null && var4 != -1) { // L: 475 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 476 - if (var2) { // L: 477 - Canvas.field438 = var5; - } else { - class3.field12 = var5; // L: 478 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 480 + class182.bufferX[var33] = var10 + 1; // L: 373 + class182.bufferY[var33] = var11 + 1; // L: 374 + var33 = var33 + 1 & 4095; // L: 375 + class182.directions[var30 + 1][var31 + 1] = 12; // L: 376 + class182.distances[var30 + 1][var31 + 1] = var21; // L: 377 } + } - return 1; // L: 481 + var28 = var29; // L: 384 + } + + var9 = var0 - 64; // L: 386 + var10 = var1 - 64; // L: 387 + var11 = Ignored.field3637; // L: 388 + var30 = class182.field2122; // L: 389 + if (!var28) { // L: 390 + var31 = Integer.MAX_VALUE; // L: 392 + var14 = Integer.MAX_VALUE; // L: 393 + byte var32 = 10; // L: 394 + var33 = var3.approxDestinationX; // L: 395 + var17 = var3.approxDestinationY; // L: 396 + int var27 = var3.approxDestinationSizeX; // L: 397 + var19 = var3.approxDestinationSizeY; // L: 398 + + for (var20 = var33 - var32; var20 <= var32 + var33; ++var20) { // L: 399 + for (var21 = var17 - var32; var21 <= var17 + var32; ++var21) { // L: 400 + var22 = var20 - var9; // L: 401 + int var23 = var21 - var10; // L: 402 + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class182.distances[var22][var23] < 100) { // L: 403 404 + int var24 = 0; // L: 405 + if (var20 < var33) { // L: 406 + var24 = var33 - var20; + } else if (var20 > var27 + var33 - 1) { // L: 407 + var24 = var20 - (var33 + var27 - 1); + } + + int var25 = 0; // L: 408 + if (var21 < var17) { // L: 409 + var25 = var17 - var21; + } else if (var21 > var19 + var17 - 1) { // L: 410 + var25 = var21 - (var17 + var19 - 1); + } + + int var26 = var25 * var25 + var24 * var24; // L: 411 + if (var26 < var31 || var31 == var26 && class182.distances[var22][var23] < var14) { // L: 412 + var31 = var26; // L: 413 + var14 = class182.distances[var22][var23]; // L: 414 + var11 = var20; // L: 415 + var30 = var21; // L: 416 + } + } + } + } + + if (var31 == Integer.MAX_VALUE) { // L: 422 + return -1; } } - } - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1053633300" - ) - static String method1273(int var0) { - if (var0 < 0) { // L: 8283 - return ""; + if (var0 == var11 && var30 == var1) { // L: 426 + return 0; } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 8284 8285 + var13 = 0; // L: 427 + class182.bufferX[var13] = var11; // L: 430 + var31 = var13 + 1; + class182.bufferY[var13] = var30; // L: 431 + + for (var14 = var15 = class182.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class182.directions[var11 - var9][var30 - var10]) { // L: 432 433 443 + if (var14 != var15) { // L: 434 + var15 = var14; // L: 435 + class182.bufferX[var31] = var11; // L: 436 + class182.bufferY[var31++] = var30; // L: 437 + } + + if ((var14 & 2) != 0) { // L: 439 + ++var11; + } else if ((var14 & 8) != 0) { // L: 440 + --var11; + } + + if ((var14 & 1) != 0) { // L: 441 + ++var30; + } else if ((var14 & 4) != 0) { // L: 442 + --var30; + } + } + + var33 = 0; // L: 445 + + while (var31-- > 0) { // L: 446 + var6[var33] = class182.bufferX[var31]; // L: 447 + var7[var33++] = class182.bufferY[var31]; // L: 448 + if (var33 >= var6.length) { // L: 449 + break; + } + } + + return var33; // L: 451 } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-1942502942" + ) + public static String method1324(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 11 + return ""; + } else if (var2 == 1) { // L: 12 + CharSequence var10 = var0[var1]; // L: 13 + return var10 == null ? "null" : var10.toString(); // L: 14 15 + } else { + int var3 = var2 + var1; // L: 17 + int var4 = 0; // L: 18 + + for (int var5 = var1; var5 < var3; ++var5) { // L: 19 + CharSequence var9 = var0[var5]; // L: 20 + if (var9 == null) { // L: 21 + var4 += 4; + } else { + var4 += var9.length(); // L: 22 + } + } + + StringBuilder var8 = new StringBuilder(var4); // L: 24 + + for (int var6 = var1; var6 < var3; ++var6) { // L: 25 + CharSequence var7 = var0[var6]; // L: 26 + if (var7 == null) { // L: 27 + var8.append("null"); + } else { + var8.append(var7); // L: 28 + } + } + + return var8.toString(); // L: 30 + } + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "16" + ) + static final void method1317() { + int[] var0 = Players.Players_indices; // L: 3667 + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3668 + Player var4 = Client.players[var0[var1]]; // L: 3669 + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3670 + --var4.overheadTextCyclesRemaining; // L: 3671 + if (var4.overheadTextCyclesRemaining == 0) { // L: 3672 + var4.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3675 + int var2 = Client.npcIndices[var1]; // L: 3676 + NPC var3 = Client.npcs[var2]; // L: 3677 + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3678 + --var3.overheadTextCyclesRemaining; // L: 3679 + if (var3.overheadTextCyclesRemaining == 0) { // L: 3680 + var3.overheadText = null; + } + } + } + + } // L: 3683 } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index dce6e2b045..5d25daf3e2 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -1,601 +1,470 @@ import java.util.zip.CRC32; +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("iw") +@ObfuscatedName("id") +@Implements("Archive") public class Archive extends AbstractArchive { @ObfuscatedName("ao") + @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Llt;" ) + @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Llt;" ) + @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1943179967 + intValue = -1087109335 ) + @Export("index") int index; - @ObfuscatedName("e") - volatile boolean field3185; + @ObfuscatedName("i") + volatile boolean field3180; @ObfuscatedName("ab") - boolean field3186; - @ObfuscatedName("ag") + boolean field3183; + @ObfuscatedName("ac") + @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 865644011 + intValue = -861635571 ) + @Export("indexCrc") int indexCrc; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -193414103 + intValue = 711915875 ) + @Export("indexVersion") int indexVersion; - @ObfuscatedName("am") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 196080105 + intValue = 833914621 ) - int field3191; + int field3188; static { Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Llz;Llz;IZZZ)V" + descriptor = "(Llt;Llt;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { - super(var4, var5); // L: 23 - this.field3185 = false; // L: 14 - this.field3186 = false; // L: 15 - this.field3191 = -1; // L: 20 + super(var4, var5); + this.field3180 = false; // L: 14 + this.field3183 = false; // L: 15 + this.field3188 = -1; this.archiveDisk = var1; // L: 24 this.masterDisk = var2; // L: 25 this.index = var3; // L: 26 - this.field3186 = var6; // L: 27 - Widget.method4174(this, this.index); // L: 28 + this.field3183 = var6; // L: 27 + class236.method4263(this, this.index); // L: 28 } // L: 29 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "176946518" + garbageValue = "1666992241" ) + @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - SecureRandomCallable.method1204(this.index, var1); - } + WorldMapSection3.method870(this.index, var1); // L: 54 + } // L: 55 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-21407020" + garbageValue = "1168057688" ) + @Export("groupLoadPercent") int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 200 + if (super.groups[var1] != null) { + return 100; + } else if (this.validGroups[var1]) { return 100; } else { - return this.validGroups[var1] ? 100 : World.method1845(this.index, var1); // L: 201 202 + int var3 = this.index; + long var4 = (long)((var3 << 16) + var1); + int var2; + if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) { + var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; // L: 231 + } else { + var2 = 0; // L: 228 + } + + return var2; // L: 233 } } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "450530880" + garbageValue = "1308309481" ) + @Export("loadGroup") void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 48 - ArchiveDisk var2 = this.archiveDisk; // L: 49 - byte[] var4 = null; // L: 52 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 53 - for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 54 - if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 55 - var4 = var6.data; // L: 56 - break; // L: 57 + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 58 + ArchiveDisk var2 = this.archiveDisk; // L: 59 + byte[] var4 = null; // L: 62 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 63 + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 64 + if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 65 + var4 = var6.data; // L: 66 + break; // L: 67 } } } - if (var4 != null) { // L: 61 - this.load(var2, var1, var4, true); // L: 62 + if (var4 != null) { // L: 71 + this.load(var2, var1, var4, true); // L: 72 } else { - byte[] var5 = var2.read(var1); // L: 65 - this.load(var2, var1, var5, true); // L: 66 + byte[] var5 = var2.read(var1); // L: 75 + this.load(var2, var1, var5, true); // L: 76 } } else { - Varps.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 69 + VarcInt.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 79 } - } // L: 70 + } // L: 80 - @ObfuscatedName("cy") + @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1735619365" + garbageValue = "-1771311633" ) - public boolean method4340() { - return this.field3185; // L: 32 + public boolean method4420() { + return this.field3180; // L: 32 } - @ObfuscatedName("cb") + @ObfuscatedName("df") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-121154638" + garbageValue = "853852990" ) + @Export("percentage") public int percentage() { - if (this.field3185) { // L: 36 + if (this.field3180) { // L: 36 return 100; } else if (super.groups != null) { // L: 37 return 99; } else { - int var1 = World.method1845(255, this.index); // L: 38 - if (var1 >= 100) { // L: 39 - var1 = 99; - } - - return var1; // L: 40 - } - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1573806265" - ) - void loadIndex(int var1, int var2) { - this.indexCrc = var1; // L: 73 - this.indexVersion = var2; // L: 74 - if (this.masterDisk != null) { // L: 75 - int var3 = this.index; // L: 76 - ArchiveDisk var4 = this.masterDisk; // L: 77 - byte[] var6 = null; // L: 80 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 81 - for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 82 - if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { // L: 83 - var6 = var8.data; // L: 84 - break; // L: 85 - } - } - } - - if (var6 != null) { // L: 89 - this.load(var4, var3, var6, true); // L: 90 + int var2 = this.index; // L: 39 + long var3 = (long)(var2 + 16711680); // L: 41 + int var1; + if (NetCache.NetCache_currentResponse != null && var3 == NetCache.NetCache_currentResponse.key) { // L: 42 + var1 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; // L: 46 } else { - byte[] var7 = var4.read(var3); // L: 93 - this.load(var4, var3, var7, true); // L: 94 + var1 = 0; // L: 43 } - } else { - Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 97 + + int var5 = var1; // L: 48 + if (var1 >= 100) { // L: 49 + var5 = 99; + } + + return var5; // L: 50 } - - } // L: 98 - - @ObfuscatedName("dx") - @ObfuscatedSignature( - descriptor = "(I[BZZB)V", - garbageValue = "-85" - ) - void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 101 - if (this.field3185) { // L: 102 - throw new RuntimeException(); // L: 103 - } - - if (this.masterDisk != null) { // L: 105 - Calendar.method4039(this.index, var2, this.masterDisk); - } - - this.decodeIndex(var2); // L: 106 - this.loadAllLocal(); // L: 107 - } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 110 - var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 111 - if (this.archiveDisk != null) { // L: 112 - ArchiveDisk var5 = this.archiveDisk; // L: 113 - ArchiveDiskAction var6 = new ArchiveDiskAction(); // L: 115 - var6.type = 0; // L: 116 - var6.key = (long)var1; // L: 117 - var6.data = var2; // L: 118 - var6.archiveDisk = var5; // L: 119 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 120 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var6); // L: 121 - } // L: 122 - - WorldMapArea.method415(); // L: 123 - this.validGroups[var1] = true; // L: 125 - } - - if (var4) { // L: 127 - super.groups[var1] = MenuAction.method2140(var2, false); - } - } - - } // L: 129 - - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "(Llz;I[BZI)V", - garbageValue = "-2086018580" - ) - void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { - int var5; - if (var1 == this.masterDisk) { // L: 132 - if (this.field3185) { // L: 133 - throw new RuntimeException(); // L: 134 - } - - if (var3 == null) { // L: 136 - Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 137 - return; // L: 138 - } - - Archive_crc.reset(); // L: 140 - Archive_crc.update(var3, 0, var3.length); // L: 141 - var5 = (int)Archive_crc.getValue(); // L: 142 - if (var5 != this.indexCrc) { // L: 143 - Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 144 - return; // L: 145 - } - - Buffer var9 = new Buffer(DevicePcmPlayerProvider.decompressBytes(var3)); // L: 147 - int var7 = var9.readUnsignedByte(); // L: 148 - if (var7 != 5 && var7 != 6) { // L: 149 - throw new RuntimeException(var7 + "," + this.index + "," + var2); - } - - int var8 = 0; // L: 150 - if (var7 >= 6) { // L: 151 - var8 = var9.readInt(); - } - - if (var8 != this.indexVersion) { // L: 152 - Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 153 - return; // L: 154 - } - - this.decodeIndex(var3); // L: 156 - this.loadAllLocal(); // L: 157 - } else { - if (!var4 && var2 == this.field3191) { // L: 160 - this.field3185 = true; // L: 161 - } - - if (var3 == null || var3.length <= 2) { // L: 163 - this.validGroups[var2] = false; // L: 164 - if (this.field3186 || var4) { // L: 165 - Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; // L: 166 - } - - Archive_crc.reset(); // L: 168 - Archive_crc.update(var3, 0, var3.length - 2); // L: 169 - var5 = (int)Archive_crc.getValue(); // L: 170 - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 171 - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 172 - this.validGroups[var2] = false; // L: 173 - if (this.field3186 || var4) { // L: 174 - Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); - } - - return; // L: 175 - } - - this.validGroups[var2] = true; // L: 177 - if (var4) { // L: 178 - super.groups[var2] = MenuAction.method2140(var3, false); - } - } - - } // L: 180 - - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1665634170" - ) - void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 183 - - int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 184 - this.validGroups[var1] = false; - } - - if (this.archiveDisk == null) { // L: 185 - this.field3185 = true; // L: 186 - } else { - this.field3191 = -1; // L: 189 - - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 190 - if (super.fileCounts[var1] > 0) { // L: 191 - FaceNormal.method3388(var1, this.archiveDisk, this); // L: 192 - this.field3191 = var1; // L: 193 - } - } - - if (this.field3191 == -1) { // L: 196 - this.field3185 = true; - } - - } - } // L: 187 197 - - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1146197798" - ) - public boolean method4349(int var1) { - return this.validGroups[var1]; // L: 206 } @ObfuscatedName("dd") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1915493362" + descriptor = "(III)V", + garbageValue = "2008218250" ) - public boolean method4350(int var1) { - return this.getGroupFileIds(var1) != null; // L: 210 + @Export("loadIndex") + void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 83 + this.indexVersion = var2; // L: 84 + if (this.masterDisk != null) { // L: 85 + int var3 = this.index; // L: 86 + ArchiveDisk var4 = this.masterDisk; // L: 87 + byte[] var6 = null; // L: 90 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 91 + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 92 + if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { // L: 93 + var6 = var8.data; // L: 94 + break; // L: 95 + } + } + } + + if (var6 != null) { // L: 99 + this.load(var4, var3, var6, true); // L: 100 + } else { + byte[] var7 = var4.read(var3); // L: 103 + this.load(var4, var3, var7, true); // L: 104 + } + } else { + VarcInt.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 107 + } + + } // L: 108 + + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "(I[BZZI)V", + garbageValue = "-1937939642" + ) + @Export("write") + void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 111 + if (this.field3180) { // L: 112 + throw new RuntimeException(); // L: 113 + } + + if (this.masterDisk != null) { // L: 115 + UrlRequester.method3417(this.index, var2, this.masterDisk); + } + + this.decodeIndex(var2); // L: 116 + this.loadAllLocal(); // L: 117 + } else { + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 120 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 121 + if (this.archiveDisk != null) { // L: 122 + UrlRequester.method3417(var1, var2, this.archiveDisk); // L: 123 + this.validGroups[var1] = true; // L: 124 + } + + if (var4) { + super.groups[var1] = AbstractByteArrayCopier.method4069(var2, false); // L: 126 + } + } + + } // L: 128 + + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "(Llt;I[BZI)V", + garbageValue = "-1033218148" + ) + @Export("load") + public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + int var5; + if (var1 == this.masterDisk) { // L: 131 + if (this.field3180) { // L: 132 + throw new RuntimeException(); // L: 133 + } + + if (var3 == null) { // L: 135 + VarcInt.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 136 + return; // L: 137 + } + + Archive_crc.reset(); // L: 139 + Archive_crc.update(var3, 0, var3.length); // L: 140 + var5 = (int)Archive_crc.getValue(); // L: 141 + if (var5 != this.indexCrc) { // L: 142 + VarcInt.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 143 + return; // L: 144 + } + + Buffer var9 = new Buffer(UserComparator3.decompressBytes(var3)); // L: 146 + int var7 = var9.readUnsignedByte(); // L: 147 + if (var7 != 5 && var7 != 6) { // L: 148 + throw new RuntimeException(var7 + "," + this.index + "," + var2); + } + + int var8 = 0; // L: 149 + if (var7 >= 6) { // L: 150 + var8 = var9.readInt(); + } + + if (var8 != this.indexVersion) { // L: 151 + VarcInt.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 152 + return; // L: 153 + } + + this.decodeIndex(var3); // L: 155 + this.loadAllLocal(); // L: 156 + } else { + if (!var4 && var2 == this.field3188) { // L: 159 + this.field3180 = true; // L: 160 + } + + if (var3 == null || var3.length <= 2) { // L: 162 + this.validGroups[var2] = false; // L: 163 + if (this.field3183 || var4) { // L: 164 + VarcInt.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + return; // L: 165 + } + + Archive_crc.reset(); // L: 167 + Archive_crc.update(var3, 0, var3.length - 2); // L: 168 + var5 = (int)Archive_crc.getValue(); // L: 169 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 170 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 171 + this.validGroups[var2] = false; // L: 172 + if (this.field3183 || var4) { // L: 173 + VarcInt.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + } + + return; // L: 174 + } + + this.validGroups[var2] = true; // L: 176 + if (var4) { // L: 177 + super.groups[var2] = AbstractByteArrayCopier.method4069(var3, false); + } + } + + } // L: 179 + + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1835807428" + ) + @Export("loadAllLocal") + void loadAllLocal() { + this.validGroups = new boolean[super.groups.length]; // L: 182 + + int var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 183 + this.validGroups[var1] = false; + } + + if (this.archiveDisk == null) { // L: 184 + this.field3180 = true; // L: 185 + } else { + this.field3188 = -1; // L: 188 + + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 189 + if (super.fileCounts[var1] > 0) { // L: 190 + ArchiveDisk var2 = this.archiveDisk; // L: 191 + ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 194 + var4.type = 1; // L: 195 + var4.key = (long)var1; // L: 196 + var4.archiveDisk = var2; // L: 197 + var4.archive = this; // L: 198 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 199 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 200 + } // L: 201 + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 203 + if (ArchiveDiskActionHandler.field3176 == 0) { // L: 204 + class105.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 205 + class105.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 206 + class105.ArchiveDiskActionHandler_thread.start(); // L: 207 + class105.ArchiveDiskActionHandler_thread.setPriority(5); // L: 208 + } + + ArchiveDiskActionHandler.field3176 = 600; // L: 210 + } + + this.field3188 = var1; // L: 214 + } + } + + if (this.field3188 == -1) { // L: 217 + this.field3180 = true; + } + + } + } // L: 186 + + @ObfuscatedName("do") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1907030186" + ) + public boolean method4411(int var1) { + return this.validGroups[var1]; // L: 237 } - @ObfuscatedName("db") + @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-18" + descriptor = "(IB)Z", + garbageValue = "0" ) + public boolean method4416(int var1) { + return this.getGroupFileIds(var1) != null; // L: 241 + } + + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "2047" + ) + @Export("loadPercent") public int loadPercent() { - int var1 = 0; // L: 214 - int var2 = 0; // L: 215 + int var1 = 0; // L: 245 + int var2 = 0; // L: 246 int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 216 - if (super.fileCounts[var3] > 0) { // L: 217 - var1 += 100; // L: 218 - var2 += this.groupLoadPercent(var3); // L: 219 + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 247 + if (super.fileCounts[var3] > 0) { // L: 248 + var1 += 100; // L: 249 + var2 += this.groupLoadPercent(var3); // L: 250 } } - if (var1 == 0) { // L: 222 + if (var1 == 0) { // L: 253 return 100; } else { - var3 = var2 * 100 / var1; // L: 223 - return var3; // L: 224 + var3 = var2 * 100 / var1; // L: 254 + return var3; // L: 255 } } - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(S)Lgb;", - garbageValue = "-18940" + descriptor = "(DDII)[D", + garbageValue = "-2056845281" ) - public static PacketBufferNode method4385() { - PacketBufferNode var0 = ItemContainer.method1226(); // L: 42 - var0.clientPacket = null; // L: 43 - var0.clientPacketLength = 0; // L: 44 - var0.packetBuffer = new PacketBuffer(5000); // L: 45 - return var0; // L: 46 + public static double[] method4445(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; // L: 18 + double[] var6 = new double[var5]; // L: 19 + int var7 = -var4; + + for (int var8 = 0; var7 <= var4; ++var8) { + var6[var8] = Script.method2356((double)var7, var0, var2); // L: 21 + ++var7; // L: 20 + } + + return var6; // L: 23 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "961891121" + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "-1832830458" ) - public static boolean method4386(int var0) { - return (var0 >> 20 & 1) != 0; // L: 21 + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 218 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 219 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 220 + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; // L: 221 + } else if (var0.equals("Z")) { // L: 222 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 223 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 224 + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; // L: 225 + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 226 227 + } } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(Lky;I)V", - garbageValue = "2129310615" - ) - static final void method4357(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field702; ++var1) { // L: 6858 - int var2 = Client.field721[var1]; // L: 6859 - NPC var3 = Client.npcs[var2]; // L: 6860 - int var4 = var0.readUnsignedByte(); // L: 6861 - int var5; - int var6; - int var7; - int var8; - if ((var4 & 128) != 0) { // L: 6862 - var5 = var0.method5639(); // L: 6863 - int var9; - int var10; - int var11; - if (var5 > 0) { // L: 6864 - for (var6 = 0; var6 < var5; ++var6) { // L: 6865 - var8 = -1; // L: 6867 - var9 = -1; // L: 6868 - var10 = -1; // L: 6869 - var7 = var0.readUShortSmart(); // L: 6870 - if (var7 == 32767) { // L: 6871 - var7 = var0.readUShortSmart(); // L: 6872 - var9 = var0.readUShortSmart(); // L: 6873 - var8 = var0.readUShortSmart(); // L: 6874 - var10 = var0.readUShortSmart(); // L: 6875 - } else if (var7 != 32766) { // L: 6877 - var9 = var0.readUShortSmart(); // L: 6878 - } else { - var7 = -1; // L: 6880 - } - - var11 = var0.readUShortSmart(); // L: 6881 - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 6882 - } - } - - var6 = var0.readUnsignedByte(); // L: 6885 - if (var6 > 0) { // L: 6886 - for (var7 = 0; var7 < var6; ++var7) { // L: 6887 - var8 = var0.readUShortSmart(); // L: 6888 - var9 = var0.readUShortSmart(); // L: 6889 - if (var9 != 32767) { // L: 6890 - var10 = var0.readUShortSmart(); // L: 6891 - var11 = var0.method5612(); // L: 6892 - int var12 = var9 > 0 ? var0.method5639() : var11; // L: 6893 - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 6894 - } else { - var3.removeHealthBar(var8); // L: 6896 - } - } - } - } - - if ((var4 & 16) != 0) { // L: 6900 - var3.targetIndex = var0.method5656(); // L: 6901 - if (var3.targetIndex == 65535) { // L: 6902 - var3.targetIndex = -1; - } - } - - if ((var4 & 8) != 0) { // L: 6904 - var3.field997 = var0.method5650(); // L: 6905 - var3.field1016 = var0.method5730(); // L: 6906 - var3.field1015 = var0.method5649(); // L: 6907 - var3.field1017 = var0.method5649(); // L: 6908 - var3.field1026 = var0.method5657() + Client.cycle; // L: 6909 - var3.field1019 = var0.method5657() + Client.cycle; // L: 6910 - var3.field1027 = var0.readUnsignedShort(); // L: 6911 - var3.pathLength = 1; // L: 6912 - var3.field973 = 0; // L: 6913 - var3.field997 += var3.pathX[0]; // L: 6914 - var3.field1016 += var3.pathY[0]; // L: 6915 - var3.field1015 += var3.pathX[0]; // L: 6916 - var3.field1017 += var3.pathY[0]; // L: 6917 - } - - if ((var4 & 2) != 0) { // L: 6919 - var3.definition = Skeleton.getNpcDefinition(var0.readUnsignedShort()); // L: 6920 - var3.field1014 = var3.definition.size; // L: 6921 - var3.field1025 = var3.definition.rotation; // L: 6922 - var3.walkSequence = var3.definition.walkSequence; // L: 6923 - var3.walkBackSequence = var3.definition.walkBackSequence; // L: 6924 - var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 6925 - var3.walkRightSequence = var3.definition.walkRightSequence; // L: 6926 - var3.idleSequence = var3.definition.idleSequence; // L: 6927 - var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 6928 - var3.turnRightSequence = var3.definition.turnRightSequence; // L: 6929 - } - - if ((var4 & 4) != 0) { // L: 6931 - var5 = var0.readUnsignedShort(); // L: 6932 - if (var5 == 65535) { // L: 6933 - var5 = -1; - } - - var6 = var0.method5639(); // L: 6934 - if (var5 == var3.sequence && var5 != -1) { // L: 6935 - var7 = WorldMapRegion.SequenceDefinition_get(var5).field3535; // L: 6936 - if (var7 == 1) { // L: 6937 - var3.sequenceFrame = 0; // L: 6938 - var3.sequenceFrameCycle = 0; // L: 6939 - var3.sequenceDelay = var6; // L: 6940 - var3.field1009 = 0; // L: 6941 - } - - if (var7 == 2) { // L: 6943 - var3.field1009 = 0; // L: 6944 - } - } else if (var5 == -1 || var3.sequence == -1 || WorldMapRegion.SequenceDefinition_get(var5).field3537 >= WorldMapRegion.SequenceDefinition_get(var3.sequence).field3537) { // L: 6947 - var3.sequence = var5; // L: 6948 - var3.sequenceFrame = 0; // L: 6949 - var3.sequenceFrameCycle = 0; // L: 6950 - var3.sequenceDelay = var6; // L: 6951 - var3.field1009 = 0; // L: 6952 - var3.field973 = var3.pathLength; // L: 6953 - } - } - - if ((var4 & 1) != 0) { // L: 6957 - var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 6958 - var3.overheadTextCyclesRemaining = 100; // L: 6959 - } - - if ((var4 & 32) != 0) { // L: 6961 - var3.spotAnimation = var0.method5655(); // L: 6962 - var5 = var0.method5678(); // L: 6963 - var3.field1003 = var5 >> 16; // L: 6964 - var3.field1013 = (var5 & 65535) + Client.cycle; // L: 6965 - var3.spotAnimationFrame = 0; // L: 6966 - var3.spotAnimationFrameCycle = 0; // L: 6967 - if (var3.field1013 > Client.cycle) { // L: 6968 - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { // L: 6969 - var3.spotAnimation = -1; - } - } - - if ((var4 & 64) != 0) { // L: 6971 - var5 = var0.method5656(); // L: 6972 - var6 = var0.method5655(); // L: 6973 - var7 = var3.x - (var5 - WorldMapManager.baseX - WorldMapManager.baseX) * 64; // L: 6974 - var8 = var3.y - (var6 - WorldMapLabel.baseY - WorldMapLabel.baseY) * 64; // L: 6975 - if (var7 != 0 || var8 != 0) { // L: 6976 - var3.field1000 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } - } - } - - } // L: 6979 - - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1501250507" - ) - static void method4383(int var0, String var1) { - int var2 = Players.Players_count; // L: 8057 - int[] var3 = Players.Players_indices; // L: 8058 - boolean var4 = false; // L: 8059 - Username var5 = new Username(var1, WorldMapAreaData.loginType); // L: 8060 - - for (int var6 = 0; var6 < var2; ++var6) { // L: 8061 - Player var7 = Client.players[var3[var6]]; // L: 8062 - if (var7 != null && var7 != WorldMapLabelSize.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8063 - PacketBufferNode var8; - if (var0 == 1) { // L: 8064 - var8 = Client.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher); // L: 8066 - var8.packetBuffer.method5665(var3[var6]); // L: 8067 - var8.packetBuffer.method5644(0); // L: 8068 - Client.packetWriter.addNode(var8); // L: 8069 - } else if (var0 == 4) { // L: 8071 - var8 = Client.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8073 - var8.packetBuffer.method5653(var3[var6]); // L: 8074 - var8.packetBuffer.writeIntME(0); // L: 8075 - Client.packetWriter.addNode(var8); // L: 8076 - } else if (var0 == 6) { // L: 8078 - var8 = Client.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); // L: 8080 - var8.packetBuffer.method5665(var3[var6]); // L: 8081 - var8.packetBuffer.writeIntME(0); // L: 8082 - Client.packetWriter.addNode(var8); // L: 8083 - } else if (var0 == 7) { // L: 8085 - var8 = Client.getPacketBufferNode(ClientPacket.field2343, Client.packetWriter.isaacCipher); // L: 8087 - var8.packetBuffer.writeIntME(0); // L: 8088 - var8.packetBuffer.method5654(var3[var6]); // L: 8089 - Client.packetWriter.addNode(var8); // L: 8090 - } - - var4 = true; // L: 8092 - break; - } - } - - if (!var4) { // L: 8096 - WorldMapRectangle.addGameMessage(4, "", "Unable to find " + var1); - } - - } // L: 8097 } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index fa014c0930..978d96546e 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -1,32 +1,40 @@ import java.io.EOFException; 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("lz") +@ObfuscatedName("lt") +@Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "Lmz;" ) + @Export("datFile") BufferedFile datFile; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lmz;" ) + @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 728284557 + intValue = -1350468833 ) + @Export("archive") int archive; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -669464675 + intValue = -893482237 ) + @Export("maxEntrySize") int maxEntrySize; static { @@ -46,11 +54,12 @@ public final class ArchiveDisk { this.maxEntrySize = var4; // L: 17 } // L: 18 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "881928186" + garbageValue = "-1607590310" ) + @Export("read") public byte[] read(int var1) { synchronized(this.datFile) { // L: 21 try { @@ -72,8 +81,9 @@ public final class ArchiveDisk { } else { byte[] var5 = new byte[var3]; // L: 30 int var6 = 0; // L: 31 + int var7 = 0; // L: 32 - for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65 + while (var6 < var3) { // L: 33 if (var4 == 0) { // L: 34 var10000 = null; return (byte[])var10000; @@ -110,23 +120,25 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; // L: 58 } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 + if (var9 == var1 && var7 == var10 && var12 == this.archive) { // L: 60 + if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { // L: 61 + int var14 = var13 + var8; // L: 62 + + for (int var15 = var13; var15 < var14; ++var15) { // L: 63 + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; // L: 64 + ++var7; // L: 65 + continue; // L: 66 + } + var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61 - var10000 = null; - return (byte[])var10000; - } - - int var14 = var13 + var8; // L: 62 - - for (int var15 = var13; var15 < var14; ++var15) { // L: 63 - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; // L: 64 + var10000 = null; + return (byte[])var10000; } byte[] var20 = var5; @@ -139,17 +151,18 @@ public final class ArchiveDisk { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I[BII)Z", - garbageValue = "749770493" + garbageValue = "1540899198" ) + @Export("write") public boolean write(int var1, byte[] var2, int var3) { synchronized(this.datFile) { // L: 76 if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77 boolean var5 = this.write0(var1, var2, var3, true); // L: 80 - if (!var5) { // L: 81 - var5 = this.write0(var1, var2, var3, false); + if (!var5) { + var5 = this.write0(var1, var2, var3, false); // L: 81 } return var5; // L: 82 @@ -159,11 +172,12 @@ public final class ArchiveDisk { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I[BIZB)Z", - garbageValue = "-74" + descriptor = "(I[BIZI)Z", + garbageValue = "158294442" ) + @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { synchronized(this.datFile) { // L: 87 try { @@ -202,7 +216,7 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { // L: 111 - label171: { + label169: { int var9 = 0; // L: 112 int var10; if (var4) { // L: 113 @@ -213,7 +227,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 } catch (EOFException var17) { // L: 122 - break label171; // L: 123 + break label169; // L: 123 } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 @@ -224,7 +238,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 } catch (EOFException var16) { // L: 134 - break label171; // L: 135 + break label169; // L: 135 } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 @@ -251,7 +265,7 @@ public final class ArchiveDisk { ++var9; } - if (var6 == var9) { // L: 149 + if (var9 == var6) { // L: 149 ++var9; } } @@ -271,7 +285,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160 ArchiveDisk_buffer[8] = (byte)var9; // L: 161 ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162 - this.datFile.seek(520L * (long)var6); // L: 163 + this.datFile.seek((long)var6 * 520L); // L: 163 this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164 var10 = var3 - var7; // L: 165 if (var10 > 510) { // L: 166 @@ -293,7 +307,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); // L: 177 ArchiveDisk_buffer[6] = (byte)var9; // L: 178 ArchiveDisk_buffer[7] = (byte)this.archive; // L: 179 - this.datFile.seek(520L * (long)var6); // L: 180 + this.datFile.seek((long)var6 * 520L); // L: 180 this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181 var10 = var3 - var7; // L: 182 if (var10 > 512) { // L: 183 @@ -322,14 +336,4 @@ public final class ArchiveDisk { public String toString() { return "" + this.archive; // L: 198 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IIIIB)I", - garbageValue = "-60" - ) - static final int method5991(int var0, int var1, int var2, int var3) { - int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 844 - return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 845 - } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index f38cc85f59..951834d0fd 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -1,201 +1,43 @@ +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("ig") +@ObfuscatedName("iv") +@Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1337486671 + intValue = -1593246089 ) + @Export("type") int type; - @ObfuscatedName("k") - byte[] data; - @ObfuscatedName("s") + @ObfuscatedName("b") + @Export("data") + public byte[] data; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Llt;" ) - ArchiveDisk archiveDisk; - @ObfuscatedName("t") + @Export("archiveDisk") + public ArchiveDisk archiveDisk; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lid;" ) - Archive archive; + @Export("archive") + public Archive archive; ArchiveDiskAction() { } // L: 12 - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1294779949" + descriptor = "(B)I", + garbageValue = "23" ) - public static void method4233() { - StructDefinition.StructDefinition_cached.clear(); // L: 71 - } // L: 72 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1420745273" - ) - static int method4231(int var0, Script var1, boolean var2) { - int var6; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 2736 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2737 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).name; // L: 2738 - return 1; // L: 2739 - } else { - int var4; - ItemDefinition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 2741 - Interpreter.Interpreter_intStackSize -= 2; // L: 2742 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2743 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2744 - var5 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2745 - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 2746 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2747 - } - - return 1; // L: 2748 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 2750 - Interpreter.Interpreter_intStackSize -= 2; // L: 2751 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2752 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2753 - var5 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2754 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 2755 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2756 - } - - return 1; // L: 2757 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 2759 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2760 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).price; // L: 2761 - return 1; // L: 2762 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 2764 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2765 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 2766 - return 1; // L: 2767 - } else { - ItemDefinition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 2769 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2770 - var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2771 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 2772 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2773 - } - - return 1; // L: 2774 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 2776 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2777 - var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2778 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 2779 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2780 - } - - return 1; // L: 2781 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 2783 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2784 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 2785 - return 1; // L: 2786 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 2788 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2789 - var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2790 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 2791 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2792 - } - - return 1; // L: 2793 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 2795 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2796 - var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2797 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 2798 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2799 - } - - return 1; // L: 2800 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 2802 - String var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2803 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2804 - findItemDefinitions(var3, var4 == 1); // L: 2805 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class204.foundItemIdCount; // L: 2806 - return 1; // L: 2807 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 2809 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 2814 - ScriptEvent.foundItemIndex = 0; // L: 2815 - return 1; // L: 2816 - } else { - return 2; // L: 2818 - } - } else { - if (Messages.foundItemIds != null && ScriptEvent.foundItemIndex < class204.foundItemIdCount) { // L: 2810 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Messages.foundItemIds[++ScriptEvent.foundItemIndex - 1] & '\uffff'; // L: 2811 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; // L: 2812 - } - } - } + static final int method4291() { + return ViewportMouse.ViewportMouse_x; // L: 91 } - - @ObfuscatedName("kb") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "-1075762777" - ) - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 10783 - short[] var2 = new short[16]; // L: 10784 - int var3 = 0; // L: 10785 - - for (int var4 = 0; var4 < class227.ItemDefinition_fileCount; ++var4) { // L: 10786 - ItemDefinition var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var4); // L: 10787 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 10788 10789 10790 - if (var3 >= 250) { // L: 10791 - class204.foundItemIdCount = -1; // L: 10792 - Messages.foundItemIds = null; // L: 10793 - return; // L: 10794 - } - - if (var3 >= var2.length) { // L: 10796 - short[] var6 = new short[var2.length * 2]; // L: 10797 - - for (int var7 = 0; var7 < var3; ++var7) { // L: 10798 - var6[var7] = var2[var7]; - } - - var2 = var6; // L: 10799 - } - - var2[var3++] = (short)var4; // L: 10801 - } - } - - Messages.foundItemIds = var2; // L: 10803 - ScriptEvent.foundItemIndex = 0; // L: 10804 - class204.foundItemIdCount = var3; // L: 10805 - String[] var8 = new String[class204.foundItemIdCount]; // L: 10806 - - for (int var5 = 0; var5 < class204.foundItemIdCount; ++var5) { // L: 10807 - var8[var5] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2[var5]).name; - } - - short[] var10 = Messages.foundItemIds; // L: 10808 - class69.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 10810 - } // L: 10812 } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 5c3e618617..7ce701d201 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -1,135 +1,109 @@ +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("ip") +@ObfuscatedName("il") +@Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lja;" ) - static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("k") + @Export("ArchiveDiskActionHandler_requestQueue") + public static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lja;" ) - static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("s") + @Export("ArchiveDiskActionHandler_responseQueue") + public static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1967146285 + intValue = -1765623667 ) - public static int field3179; - @ObfuscatedName("i") + public static int field3176; + @ObfuscatedName("m") + @Export("ArchiveDiskActionHandler_lock") public static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - static IndexedSprite worldSelectRightSprite; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3179 = 0; + field3176 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); - } + } // L: 12 ArchiveDiskActionHandler() { - } + } // L: 15 public void run() { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 68 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 69 - } // L: 70 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 43 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 44 + } // L: 45 - if (var1 != null) { // L: 71 - if (var1.type == 0) { // L: 72 - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 73 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 74 - var1.remove(); // L: 75 - } // L: 76 - } else if (var1.type == 1) { // L: 78 - var1.data = var1.archiveDisk.read((int)var1.key); // L: 79 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 80 - ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 81 - } // L: 82 + if (var1 != null) { // L: 46 + if (var1.type == 0) { // L: 47 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 48 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 49 + var1.remove(); // L: 50 + } // L: 51 + } else if (var1.type == 1) { // L: 53 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 54 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 55 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 56 + } // L: 57 } - synchronized(ArchiveDiskActionHandler_lock) { // L: 84 - if (field3179 <= 1) { // L: 85 - field3179 = 0; // L: 86 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 87 - return; // L: 88 + synchronized(ArchiveDiskActionHandler_lock) { // L: 59 + if (field3176 <= 1) { // L: 60 + field3176 = 0; // L: 61 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 62 + return; // L: 63 } - field3179 = 600; // L: 90 + field3176 = 600; // L: 65 } } else { - class227.sleepExact(100L); // L: 94 - synchronized(ArchiveDiskActionHandler_lock) { // L: 95 - if (field3179 <= 1) { // L: 96 - field3179 = 0; // L: 97 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 98 - return; // L: 99 + WorldMapSection3.sleepExact(100L); // L: 69 + synchronized(ArchiveDiskActionHandler_lock) { // L: 70 + if (field3176 <= 1) { // L: 71 + field3176 = 0; // L: 72 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 73 + return; // L: 74 } - --field3179; // L: 101 + --field3176; // L: 76 } } } - } catch (Exception var13) { // L: 106 - Decimator.RunException_sendStackTrace((String)null, var13); // L: 107 + } catch (Exception var13) { // L: 81 + PacketWriter.RunException_sendStackTrace((String)null, var13); // L: 82 } - } // L: 109 + } // L: 84 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;Lic;IZI)Lef;", - garbageValue = "2091199656" + descriptor = "(B)[Lgw;", + garbageValue = "0" ) - public static Frames method4337(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; // L: 11 - int[] var5 = var0.getGroupFileIds(var2); // L: 12 - - for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 - byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 - if (var7 == null) { // L: 15 - var4 = false; // L: 16 - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 - byte[] var9; - if (var3) { // L: 21 - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); // L: 22 - } - - if (var9 == null) { // L: 23 - var4 = false; - } - } - } - - if (!var4) { // L: 25 - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); // L: 27 - } catch (Exception var11) { // L: 29 - return null; // L: 30 - } - } + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2215, ServerPacket.field2202, ServerPacket.field2175, ServerPacket.field2145, ServerPacket.field2146, ServerPacket.field2147, ServerPacket.field2148, ServerPacket.field2142, ServerPacket.field2150, ServerPacket.field2218, ServerPacket.field2152, ServerPacket.field2178, ServerPacket.field2154, ServerPacket.field2155, ServerPacket.field2156, ServerPacket.field2170, ServerPacket.field2158, ServerPacket.field2159, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2162, ServerPacket.field2163, ServerPacket.field2149, ServerPacket.field2186, ServerPacket.field2166, ServerPacket.field2153, ServerPacket.field2168, ServerPacket.field2197, ServerPacket.field2144, ServerPacket.field2171, ServerPacket.field2172, ServerPacket.field2173, ServerPacket.field2174, ServerPacket.field2165, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2200, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2181, ServerPacket.field2182, ServerPacket.field2183, ServerPacket.field2227, ServerPacket.field2185, ServerPacket.field2221, ServerPacket.field2190, ServerPacket.field2167, ServerPacket.field2199, ServerPacket.field2211, ServerPacket.field2191, ServerPacket.field2187, ServerPacket.field2193, ServerPacket.field2194, ServerPacket.field2195, ServerPacket.field2196, ServerPacket.field2220, ServerPacket.field2198, ServerPacket.field2219, ServerPacket.field2143, ServerPacket.field2201, ServerPacket.field2216, ServerPacket.field2203, ServerPacket.field2204, ServerPacket.field2205, ServerPacket.field2206, ServerPacket.field2207, ServerPacket.field2188, ServerPacket.field2209, ServerPacket.field2210, ServerPacket.field2230, ServerPacket.field2212, ServerPacket.field2213, ServerPacket.field2214, ServerPacket.field2189, ServerPacket.field2151, ServerPacket.field2217, ServerPacket.field2192, ServerPacket.field2157, ServerPacket.field2164, ServerPacket.field2184, ServerPacket.field2222, ServerPacket.field2223, ServerPacket.field2169, ServerPacket.field2225, ServerPacket.field2226, ServerPacket.field2224}; // L: 95 } - @ObfuscatedName("iv") + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "46" + descriptor = "(Lid;Ljava/lang/String;B)V", + garbageValue = "125" ) - static final String method4338(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 9327 9328 - } + static void method4404(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1893 + Client.archiveLoaders.add(var2); // L: 1894 + Client.field953 += var2.groupCount; // L: 1895 + } // L: 1896 } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index d581520283..91dec869f3 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.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("bd") +@ObfuscatedName("bq") +@Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "[Llp;" + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = 3333293732747841481L ) - static Sprite[] crossSprites; - @ObfuscatedName("k") + static long field565; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lid;" ) + @Export("archive") final Archive archive; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -412619053 + intValue = -30883449 ) + @Export("groupCount") final int groupCount; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 486257523 + intValue = 1222733201 ) + @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Liw;Ljava/lang/String;)V" + descriptor = "(Lid;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; // L: 9 @@ -34,16 +40,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); // L: 13 } // L: 14 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1957084823" + garbageValue = "1049083276" ) + @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; // L: 17 for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 - if (!this.archive.method4350(var1) || this.archive.method4349(var1)) { + if (!this.archive.method4416(var1) || this.archive.method4411(var1)) { ++this.loadedCount; // L: 19 } } @@ -51,43 +58,76 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; // L: 21 } - @ObfuscatedName("fp") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2074712023" + descriptor = "(III)Lco;", + garbageValue = "-2052034218" ) - static final void method1208() { - if (Client.logoutTimer > 0) { // L: 2585 - ViewportMouse.logOut(); // L: 2586 + static Script method1240(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 59 + if (var2 != null) { // L: 60 + return var2; // L: 61 } else { - Client.timer.method5098(); // L: 2589 - CollisionMap.updateGameState(40); // L: 2590 - MouseHandler.field508 = Client.packetWriter.getSocket(); // L: 2591 - Client.packetWriter.removeSocket(); // L: 2592 - } - } // L: 2587 2593 + String var3 = String.valueOf(var0); // L: 63 + int var4 = ViewportMouse.archive12.getGroupId(var3); // L: 64 + if (var4 == -1) { // L: 65 + return null; // L: 66 + } else { + byte[] var5 = ViewportMouse.archive12.takeFileFlat(var4); // L: 68 + if (var5 != null) { // L: 69 + if (var5.length <= 1) { // L: 70 + return null; // L: 71 + } - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-513803575" - ) - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 4975 - int var4 = var1 >> 7; // L: 4976 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 4977 - int var5 = var2; // L: 4978 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 4979 - var5 = var2 + 1; + var2 = ClientPacket.newScript(var5); // L: 73 + if (var2 != null) { // L: 74 + Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 75 + return var2; // L: 76 + } + } + + return null; // L: 79 } - - int var6 = var0 & 127; // L: 4980 - int var7 = var1 & 127; // L: 4981 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 4982 - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; // L: 4983 - return var8 * (128 - var7) + var9 * var7 >> 7; // L: 4984 - } else { - return 0; } } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(Lbi;ZI)V", + garbageValue = "-788560949" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4830 + var0.isUnanimated = false; // L: 4831 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 4832 4833 + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; // L: 4835 + int var3 = var0.y >> 7; // L: 4836 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4837 + long var4 = GrandExchangeOfferOwnWorldComparator.calculateTag(0, 0, 0, false, var0.index); // L: 4838 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4839 + var0.isUnanimated = false; // L: 4840 + var0.tileHeight = GrandExchangeOfferWorldComparator.getTileHeight(var0.x, var0.y, GrandExchangeOfferUnitPriceComparator.Client_plane); // L: 4841 + var0.playerCycle = Client.cycle; // L: 4842 + ModeWhere.scene.addNullableObject(GrandExchangeOfferUnitPriceComparator.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field646, var0.field669, var0.field660, var0.field661); // L: 4843 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4846 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4847 + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4848 + } + + var0.tileHeight = GrandExchangeOfferWorldComparator.getTileHeight(var0.x, var0.y, GrandExchangeOfferUnitPriceComparator.Client_plane); // L: 4850 + var0.playerCycle = Client.cycle; // L: 4851 + ModeWhere.scene.drawEntity(GrandExchangeOfferUnitPriceComparator.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4852 + } + } + } + + } // L: 4856 } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 3f01bd5615..1d4edb8180 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -1,132 +1,61 @@ -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("cd") +@Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Lcd;" ) + @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "Lcd;" ) + @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lcd;" ) + @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lcd;" ) + @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1798928251 + intValue = 612234901 ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -740751005 + ) + @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 10929 - } // L: 10930 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" - ) - public int rsOrdinal() { - return this.id; // L: 10933 - } + this.id = var3; // L: 11718 + } // L: 11719 @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Llp;", - garbageValue = "-1998919890" + descriptor = "(B)I", + garbageValue = "23" ) - static Sprite method2155() { - Sprite var0 = new Sprite(); // L: 199 - var0.width = class335.SpriteBuffer_spriteWidth; // L: 200 - var0.height = class335.SpriteBuffer_spriteHeight; // L: 201 - var0.xOffset = Username.SpriteBuffer_xOffsets[0]; // L: 202 - var0.yOffset = class335.SpriteBuffer_yOffsets[0]; // L: 203 - var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; // L: 204 - var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; // L: 205 - int var1 = var0.subWidth * var0.subHeight; // L: 206 - byte[] var2 = class92.SpriteBuffer_pixels[0]; // L: 207 - var0.pixels = new int[var1]; // L: 208 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 209 - var0.pixels[var3] = TaskHandler.SpriteBuffer_spritePalette[var2[var3] & 255]; - } - - Username.SpriteBuffer_xOffsets = null; // L: 211 - class335.SpriteBuffer_yOffsets = null; // L: 212 - class335.SpriteBuffer_spriteWidths = null; // L: 213 - class335.SpriteBuffer_spriteHeights = null; // L: 214 - TaskHandler.SpriteBuffer_spritePalette = null; // L: 215 - class92.SpriteBuffer_pixels = null; // L: 216 - return var0; // L: 218 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 11722 } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "1687533627" - ) - static int method2152(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1010 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1011 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1012 - return 1; // L: 1013 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1015 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1016 - return 1; // L: 1017 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1019 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1020 - return 1; // L: 1021 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1023 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1024 - return 1; // L: 1025 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1027 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1028 - return 1; // L: 1029 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1031 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1032 - return 1; // L: 1033 - } else { - return 2; // L: 1035 - } - } - - @ObfuscatedName("gl") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1971905807" - ) - static final void method2154(boolean var0) { - RouteStrategy.playPcmPlayers(); // L: 5164 - ++Client.packetWriter.pendingWrites; // L: 5165 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5166 - Client.packetWriter.pendingWrites = 0; // L: 5167 - if (!Client.field713 && Client.packetWriter.getSocket() != null) { // L: 5168 - PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); // L: 5170 - Client.packetWriter.addNode(var1); // L: 5171 - - try { - Client.packetWriter.flush(); // L: 5173 - } catch (IOException var3) { // L: 5175 - Client.field713 = true; // L: 5176 - } - } - - } - } // L: 5179 } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 8bdf92b3ad..18a10ab1b3 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -1,52 +1,59 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("dt") +@Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("o") - static float[][] field1512; - @ObfuscatedName("x") + @ObfuscatedName("q") + static float[][] field1515; + @ObfuscatedName("k") + @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("w") + @ObfuscatedName("c") static float field1514; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("pairs") int[] pairs; - @ObfuscatedName("s") - int[][][] field1509; - @ObfuscatedName("t") + @ObfuscatedName("l") int[][][] field1510; - @ObfuscatedName("i") + @ObfuscatedName("m") + int[][][] field1518; + @ObfuscatedName("z") int[] field1511; static { - field1512 = new float[2][8]; // L: 13 + field1515 = new float[2][8]; // L: 13 coefficients = new int[2][8]; // L: 14 } AudioFilter() { this.pairs = new int[2]; // L: 8 - this.field1509 = new int[2][2][4]; // L: 10 - this.field1510 = new int[2][2][4]; // L: 11 + this.field1510 = new int[2][2][4]; // L: 10 + this.field1518 = new int[2][2][4]; // L: 11 this.field1511 = new int[2]; // L: 12 } // L: 21 - @ObfuscatedName("z") - float method2806(int var1, int var2, float var3) { - float var4 = (float)this.field1510[var1][0][var2] + var3 * (float)(this.field1510[var1][1][var2] - this.field1510[var1][0][var2]); // L: 24 + @ObfuscatedName("f") + float method2845(int var1, int var2, float var3) { + float var4 = (float)this.field1518[var1][0][var2] + var3 * (float)(this.field1518[var1][1][var2] - this.field1518[var1][0][var2]); // L: 24 var4 *= 0.0015258789F; // L: 25 return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26 } - @ObfuscatedName("s") - float method2813(int var1, int var2, float var3) { - float var4 = (float)this.field1509[var1][0][var2] + var3 * (float)(this.field1509[var1][1][var2] - this.field1509[var1][0][var2]); // L: 35 + @ObfuscatedName("l") + float method2834(int var1, int var2, float var3) { + float var4 = (float)this.field1510[var1][0][var2] + var3 * (float)(this.field1510[var1][1][var2] - this.field1510[var1][0][var2]); // L: 35 var4 *= 1.2207031E-4F; // L: 36 return normalize(var4); // L: 37 } - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 @@ -59,50 +66,50 @@ public class AudioFilter { if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method2806(var1, 0, var2); // L: 48 - field1512[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2813(var1, 0, var2)); // L: 49 - field1512[var1][1] = var3 * var3; // L: 50 + var3 = this.method2845(var1, 0, var2); // L: 48 + field1515[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2834(var1, 0, var2)); // L: 49 + field1515[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method2806(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2813(var1, var4, var2)); // L: 53 + var3 = this.method2845(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2834(var1, var4, var2)); // L: 53 float var6 = var3 * var3; // L: 54 - field1512[var1][var4 * 2 + 1] = field1512[var1][var4 * 2 - 1] * var6; // L: 55 - field1512[var1][var4 * 2] = field1512[var1][var4 * 2 - 1] * var5 + field1512[var1][var4 * 2 - 2] * var6; // L: 56 + field1515[var1][var4 * 2 + 1] = field1515[var1][var4 * 2 - 1] * var6; // L: 55 + field1515[var1][var4 * 2] = field1515[var1][var4 * 2 - 1] * var5 + field1515[var1][var4 * 2 - 2] * var6; // L: 56 for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 - var10000 = field1512[var1]; - var10000[var7] += field1512[var1][var7 - 1] * var5 + field1512[var1][var7 - 2] * var6; + var10000 = field1515[var1]; + var10000[var7] += field1515[var1][var7 - 1] * var5 + field1515[var1][var7 - 2] * var6; } - var10000 = field1512[var1]; // L: 58 - var10000[1] += field1512[var1][0] * var5 + var6; - var10000 = field1512[var1]; // L: 59 + var10000 = field1515[var1]; // L: 58 + var10000[1] += field1515[var1][0] * var5 + var6; + var10000 = field1515[var1]; // L: 59 var10000[0] += var5; } if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1512[0]; + var10000 = field1515[0]; var10000[var4] *= field1514; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field1512[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field1515[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkf;Ldw;)V" + descriptor = "(Lkb;Lda;)V" ) - final void method2809(Buffer var1, SoundEnvelope var2) { + final void method2844(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); // L: 67 this.pairs[0] = var3 >> 4; // L: 68 this.pairs[1] = var3 & 15; // L: 69 @@ -115,19 +122,19 @@ public class AudioFilter { int var6; for (var5 = 0; var5 < 2; ++var5) { // L: 74 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field1509[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field1510[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + this.field1510[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field1518[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } for (var5 = 0; var5 < 2; ++var5) { // L: 80 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81 if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82 - this.field1509[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field1510[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + this.field1510[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field1518[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field1509[var5][1][var6] = this.field1509[var5][0][var6]; // L: 87 - this.field1510[var5][1][var6] = this.field1510[var5][0][var6]; // L: 88 + this.field1510[var5][1][var6] = this.field1510[var5][0][var6]; // L: 87 + this.field1518[var5][1][var6] = this.field1518[var5][0][var6]; // L: 88 } } } @@ -143,7 +150,8 @@ public class AudioFilter { } // L: 99 - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 return var1 * 3.1415927F / 11025.0F; // L: 31 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 533b5471ea..73d40ef2bf 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -1,19 +1,24 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("lg") +@Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Llj;" ) + @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; static { BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { // L: 20 BZip2Decompressor_state.inputArray = var2; // L: 21 @@ -24,7 +29,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state.bsLive = 0; // L: 26 BZip2Decompressor_state.bsBuff = 0; // L: 27 BZip2Decompressor_state.nextBit_unused = 0; // L: 28 - BZip2Decompressor_state.field3759 = 0; // L: 29 + BZip2Decompressor_state.field3766 = 0; // L: 29 BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 var1 -= BZip2Decompressor_state.outputLength; // L: 31 BZip2Decompressor_state.inputArray = null; // L: 32 @@ -33,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lli;)V" + descriptor = "(Llj;)V" ) - static void method5902(BZip2State var0) { + static void method5912(BZip2State var0) { byte var2 = var0.out_char; // L: 40 int var3 = var0.su_rNToGo; // L: 41 int var4 = var0.nblocks_used; // L: 42 int var5 = var0.su_ch2; // L: 43 - int[] var6 = HealthBar.BZip2Decompressor_block; // L: 44 - int var7 = var0.field3766; // L: 45 + int[] var6 = class217.BZip2Decompressor_block; // L: 44 + int var7 = var0.field3761; // L: 45 byte[] var8 = var0.outputArray; // L: 46 int var9 = var0.next_out; // L: 47 int var10 = var0.outputLength; // L: 48 - int var12 = var0.field3770 + 1; // L: 50 + int var12 = var0.field3791 + 1; // L: 50 label70: while (true) { @@ -143,26 +148,27 @@ public final class BZip2Decompressor { break; // L: 73 } - int var13 = var0.field3759; // L: 133 - var0.field3759 += var10 - var10; // L: 134 - if (var0.field3759 < var13) { // L: 135 + int var13 = var0.field3766; // L: 133 + var0.field3766 += var10 - var10; // L: 134 + if (var0.field3766 < var13) { // L: 135 } var0.out_char = var2; // L: 136 var0.su_rNToGo = var3; // L: 137 var0.nblocks_used = var4; // L: 138 var0.su_ch2 = var5; // L: 139 - HealthBar.BZip2Decompressor_block = var6; // L: 140 - var0.field3766 = var7; // L: 141 + class217.BZip2Decompressor_block = var6; // L: 140 + var0.field3761 = var7; // L: 141 var0.outputArray = var8; // L: 142 var0.next_out = var9; // L: 143 var0.outputLength = var10; // L: 144 } // L: 145 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lli;)V" + descriptor = "(Llj;)V" ) + @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { boolean var4 = false; // L: 151 boolean var5 = false; // L: 152 @@ -186,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; // L: 170 int[] var24 = null; // L: 171 int[] var25 = null; // L: 172 - var0.blockSize100k = 171518257; // L: 173 - if (HealthBar.BZip2Decompressor_block == null) { // L: 174 - HealthBar.BZip2Decompressor_block = new int[var0.blockSize100k * 122833056]; + var0.blockSize100k = -1050833919; // L: 173 + if (class217.BZip2Decompressor_block == null) { // L: 174 + class217.BZip2Decompressor_block = new int[var0.blockSize100k * -599652704]; } boolean var26 = true; // L: 175 @@ -424,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - HealthBar.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + class217.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 ++var47; // L: 398 if (var45 == 0) { // L: 399 ++var43; // L: 400 @@ -483,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; // L: 332 for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - HealthBar.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + class217.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 ++var47; // L: 335 } } @@ -503,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(HealthBar.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = HealthBar.BZip2Decompressor_block; // L: 428 + var1 = (byte)(class217.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = class217.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field3766 = HealthBar.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.field3761 = class217.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 var0.nblocks_used = 0; // L: 432 - var0.field3766 = HealthBar.BZip2Decompressor_block[var0.field3766]; // L: 433 - var0.su_ch2 = (byte)(var0.field3766 & 255); // L: 434 - var0.field3766 >>= 8; // L: 436 + var0.field3761 = class217.BZip2Decompressor_block[var0.field3761]; // L: 433 + var0.su_ch2 = (byte)(var0.field3761 & 255); // L: 434 + var0.field3761 >>= 8; // L: 436 ++var0.nblocks_used; // L: 437 - var0.field3770 = var47; // L: 438 - method5902(var0); // L: 439 - if (var0.field3770 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field3791 = var47; // L: 438 + method5912(var0); // L: 439 + if (var0.field3791 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } @@ -532,26 +538,29 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lli;)B" + descriptor = "(Llj;)B" ) + @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lli;)B" + descriptor = "(Llj;)B" ) + @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILli;)I" + descriptor = "(ILlj;)I" ) + @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { while (var1.bsLive < var0) { // L: 456 var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; // L: 462 @@ -567,10 +576,11 @@ public final class BZip2Decompressor { return var2; // L: 460 } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lli;)V" + descriptor = "(Llj;)V" ) + @Export("makeMaps") static void makeMaps(BZip2State var0) { var0.nInUse = 0; // L: 472 @@ -583,7 +593,8 @@ public final class BZip2Decompressor { } // L: 479 - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; // L: 486 diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index cc9c064820..116ad308d0 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -1,136 +1,166 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("li") +@ObfuscatedName("lj") +@Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("bn") - static String worldListURL; - @ObfuscatedName("z") - final int field3754; - @ObfuscatedName("k") - final int field3748; - @ObfuscatedName("s") - final int field3784; - @ObfuscatedName("t") - final int field3772; - @ObfuscatedName("i") - final int field3751; - @ObfuscatedName("o") + @ObfuscatedName("f") + final int field3776; + @ObfuscatedName("b") final int field3760; - @ObfuscatedName("x") - byte[] inputArray; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 839419927 - ) - int nextByte; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 128200733 - ) - int nextBit_unused; + @ObfuscatedName("l") + final int field3756; @ObfuscatedName("m") - byte[] outputArray; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -181699619 - ) - int next_out; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 36041791 - ) - int outputLength; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -332448629 - ) - int field3759; - @ObfuscatedName("a") - byte out_char; + final int field3757; + @ObfuscatedName("z") + final int field3758; @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1965134077 - ) - int su_rNToGo; + final int field3759; + @ObfuscatedName("k") + @Export("inputArray") + byte[] inputArray; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -807361971 + intValue = -2107089089 ) - int bsBuff; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 705369625 - ) - int bsLive; - @ObfuscatedName("y") - int blockSize100k; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1211957325 - ) - int originalPointer; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 586928333 - ) - int field3766; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 25295989 - ) - int su_ch2; + @Export("nextByte") + int nextByte; @ObfuscatedName("u") - int[] unzftab; - @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1457026287 + intValue = 1265536035 ) - int nblocks_used; - @ObfuscatedName("b") - int[] cftab; + @Export("nextBit_unused") + int nextBit_unused; + @ObfuscatedName("t") + @Export("outputArray") + byte[] outputArray; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1999043287 + intValue = -1237814353 ) + @Export("next_out") + int next_out; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1984438571 + ) + @Export("outputLength") + int outputLength; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1896689393 + ) + int field3766; + @ObfuscatedName("x") + @Export("out_char") + byte out_char; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -59946543 + ) + @Export("su_rNToGo") + int su_rNToGo; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1329480859 + ) + @Export("bsBuff") + int bsBuff; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1443404011 + ) + @Export("bsLive") + int bsLive; + @ObfuscatedName("s") + @Export("blockSize100k") + int blockSize100k; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -872261387 + ) + @Export("originalPointer") + int originalPointer; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1806589357 + ) + int field3761; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1647228145 + ) + @Export("su_ch2") + int su_ch2; + @ObfuscatedName("d") + @Export("unzftab") + int[] unzftab; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -2108747911 + ) + @Export("nblocks_used") + int nblocks_used; + @ObfuscatedName("g") + @Export("cftab") + int[] cftab; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -207358751 + ) + @Export("nInUse") int nInUse; @ObfuscatedName("ab") + @Export("inUse") boolean[] inUse; - @ObfuscatedName("ag") + @ObfuscatedName("ac") + @Export("inUse16") boolean[] inUse16; @ObfuscatedName("ao") + @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ae") + @ObfuscatedName("af") + @Export("ll8") byte[] ll8; - @ObfuscatedName("an") + @ObfuscatedName("av") + @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("am") - byte[] selector; - @ObfuscatedName("ap") - byte[] selectorMtf; - @ObfuscatedName("au") - byte[][] temp_charArray2d; - @ObfuscatedName("aa") - int[][] limit; @ObfuscatedName("ar") + @Export("selector") + byte[] selector; + @ObfuscatedName("ay") + @Export("selectorMtf") + byte[] selectorMtf; + @ObfuscatedName("ah") + @Export("temp_charArray2d") + byte[][] temp_charArray2d; + @ObfuscatedName("az") + @Export("limit") + int[][] limit; + @ObfuscatedName("ak") + @Export("base") int[][] base; - @ObfuscatedName("at") + @ObfuscatedName("au") + @Export("perm") int[][] perm; - @ObfuscatedName("aq") + @ObfuscatedName("ai") + @Export("minLens") int[] minLens; - @ObfuscatedName("al") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 960928111 + intValue = -974418121 ) - int field3770; + int field3791; BZip2State() { - this.field3754 = 4096; // L: 4 - this.field3748 = 16; // L: 5 - this.field3784 = 258; // L: 6 - this.field3772 = 6; // L: 7 - this.field3751 = 50; // L: 8 - this.field3760 = 18002; // L: 9 + this.field3776 = 4096; // L: 4 + this.field3760 = 16; // L: 5 + this.field3756 = 258; // L: 6 + this.field3757 = 6; // L: 7 + this.field3758 = 50; // L: 8 + this.field3759 = 18002; // L: 9 this.nextByte = 0; // L: 11 this.next_out = 0; // L: 14 this.unzftab = new int[256]; // L: 25 diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 6f5c7f70fc..8e8c862edd 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -1,323 +1,69 @@ -import java.io.IOException; -import java.security.SecureRandom; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("em") +@Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("nf") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1982051309 + intValue = 24178129 ) - static int widgetDragDuration; - @ObfuscatedName("c") + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1829902819 + intValue = 840836709 ) - static int graphicsTickTimeIdx; - @ObfuscatedName("gc") - static int[][] xteaKeys; + @Export("x") + int x; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 511451679 + ) + @Export("y") + int y; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1059090271 + ) + @Export("orientationA") + int orientationA; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1415372023 - ) - int orientationA; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -506654425 - ) - int tileHeight; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1147548215 - ) - int x; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1940819727 - ) - int y; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1131836163 + intValue = 237050093 ) + @Export("orientationB") int orientationB; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lej;" ) + @Export("entity1") public Entity entity1; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lej;" ) + @Export("entity2") public Entity entity2; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 6638213269109827123L + longValue = -3078711070799260957L ) + @Export("tag") public long tag; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1666155333 + intValue = -810696597 ) + @Export("flags") int flags; BoundaryObject() { this.tag = 0L; // L: 11 this.flags = 0; // L: 12 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1497980399" - ) - public static boolean method3384() { - long var0 = PacketWriter.currentTimeMillis(); // L: 42 - int var2 = (int)(var0 - NetCache.field3195); // L: 43 - NetCache.field3195 = var0; // L: 44 - if (var2 > 200) { // L: 45 - var2 = 200; - } - - NetCache.NetCache_loadTime += var2; // L: 46 - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 - return true; - } else if (NetCache.NetCache_socket == null) { // L: 48 - return false; - } else { - try { - if (NetCache.NetCache_loadTime > 30000) { // L: 50 - throw new IOException(); - } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 - var4 = new Buffer(4); // L: 53 - var4.writeByte(1); // L: 54 - var4.writeMedium((int)var3.key); // L: 55 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 - var4 = new Buffer(4); // L: 63 - var4.writeByte(0); // L: 64 - var4.writeMedium((int)var3.key); // L: 65 - NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 - var3.removeDual(); // L: 67 - NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 - --NetCache.NetCache_pendingWritesCount; // L: 69 - ++NetCache.NetCache_pendingResponsesCount; // L: 70 - } - - for (int var15 = 0; var15 < 100; ++var15) { // L: 72 - int var16 = NetCache.NetCache_socket.available(); // L: 73 - if (var16 < 0) { // L: 74 - throw new IOException(); - } - - if (var16 == 0) { // L: 75 - break; - } - - NetCache.NetCache_loadTime = 0; // L: 76 - byte var5 = 0; // L: 77 - if (TilePaint.NetCache_currentResponse == null) { // L: 78 - var5 = 8; - } else if (NetCache.field3205 == 0) { // L: 79 - var5 = 1; - } - - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { // L: 80 - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 - if (var6 > var16) { // L: 82 - var6 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 - if (NetCache.field3208 != 0) { // L: 84 - for (var7 = 0; var7 < var6; ++var7) { // L: 85 - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var7; - var10000[var10001] ^= NetCache.field3208; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 - break; - } - - if (TilePaint.NetCache_currentResponse == null) { // L: 89 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 - long var11 = (long)(var8 + (var7 << 16)); // L: 95 - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 - UrlRequest.field1986 = true; // L: 97 - if (var13 == null) { // L: 98 - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 - UrlRequest.field1986 = false; // L: 100 - } - - if (var13 == null) { // L: 102 - throw new IOException(); // L: 103 - } - - int var14 = var9 == 0 ? 5 : 9; // L: 105 - TilePaint.NetCache_currentResponse = var13; // L: 106 - class224.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + TilePaint.NetCache_currentResponse.padding); // L: 107 - class224.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 - class224.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 - NetCache.field3205 = 8; // L: 110 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 - } else if (NetCache.field3205 == 0) { // L: 114 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 - NetCache.field3205 = 1; // L: 116 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 - } else { - TilePaint.NetCache_currentResponse = null; // L: 121 - } - } - } else { - var6 = class224.NetCache_responseArchiveBuffer.array.length - TilePaint.NetCache_currentResponse.padding; // L: 127 - var7 = 512 - NetCache.field3205; // L: 128 - if (var7 > var6 - class224.NetCache_responseArchiveBuffer.offset) { // L: 129 - var7 = var6 - class224.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { // L: 130 - var7 = var16; - } - - NetCache.NetCache_socket.read(class224.NetCache_responseArchiveBuffer.array, class224.NetCache_responseArchiveBuffer.offset, var7); // L: 131 - if (NetCache.field3208 != 0) { // L: 132 - for (var8 = 0; var8 < var7; ++var8) { // L: 133 - var10000 = class224.NetCache_responseArchiveBuffer.array; - var10001 = var8 + class224.NetCache_responseArchiveBuffer.offset; - var10000[var10001] ^= NetCache.field3208; - } - } - - var22 = class224.NetCache_responseArchiveBuffer; // L: 135 - var22.offset += var7; - NetCache.field3205 += var7; // L: 136 - if (var6 == class224.NetCache_responseArchiveBuffer.offset) { // L: 137 - if (16711935L == TilePaint.NetCache_currentResponse.key) { // L: 138 - MenuAction.NetCache_reference = class224.NetCache_responseArchiveBuffer; // L: 139 - - for (var8 = 0; var8 < 256; ++var8) { // L: 140 - Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 - if (var17 != null) { // L: 142 - MenuAction.NetCache_reference.offset = var8 * 8 + 5; // L: 143 - var10 = MenuAction.NetCache_reference.readInt(); // L: 144 - int var18 = MenuAction.NetCache_reference.readInt(); // L: 145 - var17.loadIndex(var10, var18); // L: 146 - } - } - } else { - NetCache.NetCache_crc.reset(); // L: 151 - NetCache.NetCache_crc.update(class224.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 - var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 - if (var8 != TilePaint.NetCache_currentResponse.crc) { // L: 154 - try { - NetCache.NetCache_socket.close(); // L: 156 - } catch (Exception var20) { // L: 158 - } - - ++NetCache.NetCache_crcMismatches; // L: 159 - NetCache.NetCache_socket = null; // L: 160 - NetCache.field3208 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 - return false; // L: 162 - } - - NetCache.NetCache_crcMismatches = 0; // L: 164 - NetCache.NetCache_ioExceptions = 0; // L: 165 - TilePaint.NetCache_currentResponse.archive.write((int)(TilePaint.NetCache_currentResponse.key & 65535L), class224.NetCache_responseArchiveBuffer.array, 16711680L == (TilePaint.NetCache_currentResponse.key & 16711680L), UrlRequest.field1986); // L: 166 - } - - TilePaint.NetCache_currentResponse.remove(); // L: 168 - if (UrlRequest.field1986) { // L: 169 - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; // L: 170 - } - - NetCache.field3205 = 0; // L: 171 - TilePaint.NetCache_currentResponse = null; // L: 172 - class224.NetCache_responseArchiveBuffer = null; // L: 173 - } else { - if (NetCache.field3205 != 512) { // L: 175 - break; - } - - NetCache.field3205 = 0; - } - } - } - - return true; // L: 179 - } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); // L: 183 - } catch (Exception var19) { // L: 185 - } - - ++NetCache.NetCache_ioExceptions; // L: 186 - NetCache.NetCache_socket = null; // L: 187 - return false; // L: 188 - } - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)[Lju;", - garbageValue = "1966430023" - ) - static HorizontalAlignment[] method3386() { - return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3479, HorizontalAlignment.field3481}; // L: 14 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;Lic;Lge;B)Z", - garbageValue = "72" - ) - public static boolean method3385(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class206.musicPatchesArchive = var0; // L: 26 - class206.musicSamplesArchive = var1; // L: 27 - ModelData0.soundEffectsArchive = var2; // L: 28 - class206.midiPcmStream = var3; // L: 29 - return true; // L: 30 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "-579146436" - ) - static SecureRandom method3387() { - SecureRandom var0 = new SecureRandom(); // L: 39 - var0.nextInt(); // L: 40 - return var0; // L: 41 - } + } // L: 14 } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index f25016bfe8..861fddb8b7 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -1,30 +1,35 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("lw") +@Implements("Bounds") public class Bounds { - @ObfuscatedName("w") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -942038373 + intValue = -1707768055 ) + @Export("lowX") public int lowX; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -38208119 + intValue = -797109491 ) + @Export("lowY") public int lowY; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -468327151 + intValue = -1403597143 ) + @Export("highX") public int highX; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 85471293 + intValue = 959443313 ) + @Export("highY") public int highY; public Bounds(int var1, int var2, int var3, int var4) { @@ -36,51 +41,53 @@ public class Bounds { this(0, 0, var1, var2); // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1517519205" + garbageValue = "-124623897" ) + @Export("setLow") public void setLow(int var1, int var2) { this.lowX = var1; // L: 19 this.lowY = var2; // L: 20 } // L: 21 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1357233631" + garbageValue = "2099079060" ) + @Export("setHigh") public void setHigh(int var1, int var2) { this.highX = var1; // L: 24 this.highY = var2; // L: 25 } // L: 26 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Llr;Llr;S)V", - garbageValue = "172" + descriptor = "(Llw;Llw;I)V", + garbageValue = "-1801427398" ) - public void method6089(Bounds var1, Bounds var2) { - this.method6090(var1, var2); // L: 33 - this.method6087(var1, var2); // L: 34 + public void method6129(Bounds var1, Bounds var2) { + this.method6120(var1, var2); // L: 33 + this.method6117(var1, var2); // L: 34 } // L: 35 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)V", - garbageValue = "-805505027" + descriptor = "(Llw;Llw;I)V", + garbageValue = "-1914930384" ) - void method6090(Bounds var1, Bounds var2) { + void method6120(Bounds var1, Bounds var2) { var2.lowX = this.lowX; // L: 38 var2.highX = this.highX; // L: 39 if (this.lowX < var1.lowX) { // L: 40 - var2.highX = (var2.highX * 1565633521 - (var1.lowX * 1565633521 - this.lowX * 1565633521)) * -468327151; // L: 41 + var2.highX = (var2.highX * 1436136857 - (var1.lowX * 1436136857 - this.lowX * 1436136857)) * -1403597143; // L: 41 var2.lowX = var1.lowX; // L: 42 } - if (var2.method6091() > var1.method6091()) { // L: 44 - var2.highX -= var2.method6091() - var1.method6091(); // L: 45 + if (var2.method6130() > var1.method6130()) { // L: 44 + var2.highX -= var2.method6130() - var1.method6130(); // L: 45 } if (var2.highX < 0) { // L: 47 @@ -89,21 +96,21 @@ public class Bounds { } // L: 48 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Llr;Llr;I)V", - garbageValue = "1845749630" + descriptor = "(Llw;Llw;I)V", + garbageValue = "1895842322" ) - void method6087(Bounds var1, Bounds var2) { + void method6117(Bounds var1, Bounds var2) { var2.lowY = this.lowY; // L: 51 var2.highY = this.highY; // L: 52 if (this.lowY < var1.lowY) { // L: 53 - var2.highY = (var2.highY * -1438521579 - (var1.lowY * -1438521579 - this.lowY * -1438521579)) * 85471293; // L: 54 + var2.highY = (var2.highY * -1936937071 - (var1.lowY * -1936937071 - this.lowY * -1936937071)) * 959443313; // L: 54 var2.lowY = var1.lowY; // L: 55 } - if (var2.method6092() > var1.method6092()) { // L: 57 - var2.highY -= var2.method6092() - var1.method6092(); // L: 58 + if (var2.method6122() > var1.method6122()) { // L: 57 + var2.highY -= var2.method6122() - var1.method6122(); // L: 58 } if (var2.highY < 0) { // L: 60 @@ -112,22 +119,22 @@ public class Bounds { } // L: 61 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1918003577" + garbageValue = "226030210" ) - int method6091() { - return this.highX + this.lowX; // L: 64 + int method6130() { + return this.lowX + this.highX; // L: 64 } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "97" + descriptor = "(I)I", + garbageValue = "-1174684154" ) - int method6092() { - return this.highY + this.lowY; // L: 68 + int method6122() { + return this.lowY + this.highY; // L: 68 } public String toString() { diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 293b526d4f..e6b1efb18e 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -1,69 +1,81 @@ +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("ko") +@ObfuscatedName("kl") +@Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1220284933 + intValue = 11106869 ) + @Export("world") public int world; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -224698591 + intValue = -152395721 ) + @Export("int2") public int int2; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -263202513 + intValue = -2046861125 ) + @Export("rank") public int rank; Buddy() { this.world = -1; // L: 4 } // L: 8 - @ObfuscatedName("bz") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-580421822" + garbageValue = "-2040582240" ) + @Export("set") void set(int var1, int var2) { this.world = var1; // L: 11 this.int2 = var2; // L: 12 } // L: 13 - @ObfuscatedName("bj") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-907221261" + garbageValue = "-1227798999" ) + @Export("getWorld") public int getWorld() { return this.world; // L: 16 } - @ObfuscatedName("bh") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "4837" + descriptor = "(I)Z", + garbageValue = "-17715809" ) + @Export("hasWorld") public boolean hasWorld() { return this.world > 0; // L: 20 } - @ObfuscatedName("jp") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1739727093" + descriptor = "(S)I", + garbageValue = "3913" ) - static boolean method5277(int var0) { - for (int var1 = 0; var1 < Client.field898; ++var1) { // L: 10103 - if (Client.field900[var1] == var0) { // L: 10104 - return true; - } - } + static int method5322() { + return ++Messages.Messages_count - 1; // L: 19 + } - return false; // L: 10106 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIB)Llc;", + garbageValue = "-95" + ) + static Sprite method5321(int var0, int var1, int var2) { + return (Sprite)WorldMapRegion.WorldMapRegion_cachedSprites.get(class8.method117(var0, var1, var2)); // L: 42 } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 5408c440a6..17612a02b3 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,90 +1,203 @@ -import net.runelite.mapping.ObfuscatedGetter; +import java.io.File; +import java.io.RandomAccessFile; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fm") +@Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 841228159 - ) - public static int musicTrackGroupId; - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget dragInventoryWidget; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public BuddyRankComparator(boolean var1) { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;I)I", - garbageValue = "-895598946" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "-776394962" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var2.rank != var1.rank) { // L: 14 - return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15 + return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; } else { - return this.compareUser(var1, var2); // L: 17 + return this.compareUser(var1, var2); } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BIILec;[Lft;B)V", - garbageValue = "52" + descriptor = "(III)I", + garbageValue = "1048639306" ) - static final void method3524(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); // L: 205 - int var6 = -1; // L: 206 - - while (true) { - int var7 = var5.method5632(); // L: 208 - if (var7 == 0) { // L: 209 - return; // L: 233 + static int method3558(int var0, int var1) { + if (var0 == -2) { // L: 15 + return 12345678; + } else if (var0 == -1) { // L: 16 + if (var1 < 0) { // L: 17 + var1 = 0; // L: 18 + } else if (var1 > 127) { // L: 20 + var1 = 127; // L: 21 } - var6 += var7; // L: 210 - int var8 = 0; // L: 211 + var1 = 127 - var1; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { // L: 27 + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } - while (true) { - int var9 = var5.readUShortSmart(); // L: 213 - if (var9 == 0) { // L: 214 - break; - } + return (var0 & 65408) + var1; + } + } - var8 += var9 - 1; // L: 215 - int var10 = var8 & 63; // L: 216 - int var11 = var8 >> 6 & 63; // L: 217 - int var12 = var8 >> 12; // L: 218 - int var13 = var5.readUnsignedByte(); // L: 219 - int var14 = var13 >> 2; // L: 220 - int var15 = var13 & 3; // L: 221 - int var16 = var11 + var1; // L: 222 - int var17 = var10 + var2; // L: 223 - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 224 - int var18 = var12; // L: 225 - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 226 - var18 = var12 - 1; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-878017920" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 22 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25 + RandomAccessFile var3 = null; // L: 26 + + 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); // L: 34 + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36 + return var2; // L: 37 + } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 41 + var3.close(); // L: 42 + var3 = null; // L: 43 + } + } catch (Exception var7) { // L: 46 } - CollisionMap var19 = null; // L: 227 - if (var18 >= 0) { // L: 228 - var19 = var4[var18]; - } - - GrandExchangeOfferWorldComparator.method137(var12, var16, var17, var6, var15, var14, var3, var19); // L: 229 + throw new RuntimeException(); // L: 48 } } } } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "18" + ) + static int method3557(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 + if (var2 == null) { // L: 29 + return 0; + } else if (var1 == -1) { // L: 30 + return 0; + } else { + int var3 = 0; // L: 31 + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 + } + } + + return var3; // L: 35 + } + } + + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1535987208" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1676 + if (Client.gameState == 0) { // L: 1677 + ByteArrayPool.client.method1112(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1678 + Client.loginState = 0; // L: 1679 + Client.field947 = 0; // L: 1680 + Client.field715 = 0; // L: 1681 + Client.timer.method5153(var0); // L: 1682 + if (var0 != 20) { // L: 1683 + Message.method1314(false); + } + } + + if (var0 != 20 && var0 != 40 && MouseRecorder.field615 != null) { // L: 1685 1686 + MouseRecorder.field615.close(); // L: 1687 + MouseRecorder.field615 = null; // L: 1688 + } + + if (Client.gameState == 25) { // L: 1691 + Client.field722 = 0; // L: 1692 + Client.field734 = 0; // L: 1693 + Client.field735 = 1; // L: 1694 + Client.field848 = 0; // L: 1695 + Client.field737 = 1; // L: 1696 + } + + if (var0 != 5 && var0 != 10) { // L: 1698 + if (var0 == 20) { // L: 1701 + HealthBar.method2141(class281.archive10, GrandExchangeOffer.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1702 + } else if (var0 == 11) { // L: 1704 + HealthBar.method2141(class281.archive10, GrandExchangeOffer.archive8, false, 4); // L: 1705 + } else if (Login.clearLoginScreen) { // L: 1708 + Tiles.titleboxSprite = null; // L: 1709 + Login.titlebuttonSprite = null; // L: 1710 + class278.runesSprite = null; // L: 1711 + Login.leftTitleSprite = null; // L: 1712 + Login.rightTitleSprite = null; // L: 1713 + SecureRandomFuture.logoSprite = null; // L: 1714 + DefaultsGroup.title_muteSprite = null; // L: 1715 + Login.options_buttons_0Sprite = null; // L: 1716 + Login.options_buttons_2Sprite = null; // L: 1717 + EnumDefinition.worldSelectBackSprites = null; // L: 1718 + FaceNormal.worldSelectFlagSprites = null; // L: 1719 + class301.worldSelectArrows = null; // L: 1720 + GameObject.worldSelectStars = null; // L: 1721 + MouseHandler.field523 = null; // L: 1722 + Login.loginScreenRunesAnimation.method1917(); // L: 1723 + VertexNormal.method3133(2); // L: 1724 + WorldMapSection0.method323(true); // L: 1725 + Login.clearLoginScreen = false; // L: 1726 + } + } else { + HealthBar.method2141(class281.archive10, GrandExchangeOffer.archive8, true, 0); // L: 1699 + } + + Client.gameState = var0; // L: 1728 + } + } // L: 1729 } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 5306ac1e03..0379dabdd3 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -1,20 +1,27 @@ import java.math.BigInteger; +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("kf") +@ObfuscatedName("kb") +@Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("array") public byte[] array; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -249160527 + intValue = -218590717 ) + @Export("offset") public int offset; static { @@ -41,7 +48,7 @@ public class Buffer extends Node { long var0 = (long)var2; // L: 35 for (int var3 = 0; var3 < 8; ++var3) { // L: 36 - if ((var0 & 1L) == 1L) { // L: 37 + if (1L == (var0 & 1L)) { // L: 37 var0 = var0 >>> 1 ^ -3932672073523589310L; } else { var0 >>>= 1; // L: 38 @@ -54,1010 +61,1027 @@ public class Buffer extends Node { } // L: 42 public Buffer(int var1) { - this.array = class298.ByteArrayPool_getArray(var1); // L: 58 - this.offset = 0; // L: 59 - } // L: 60 + this.array = NetFileRequest.ByteArrayPool_getArray(var1); // L: 54 + this.offset = 0; // L: 55 + } // L: 56 public Buffer(byte[] var1) { - this.array = var1; // L: 63 - this.offset = 0; // L: 64 - } // L: 65 + this.array = var1; // L: 59 + this.offset = 0; // L: 60 + } // L: 61 - @ObfuscatedName("ai") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)V", garbageValue = "0" ) + @Export("releaseArray") public void releaseArray() { - if (this.array != null) { // L: 68 - Canvas.ByteArrayPool_release(this.array); + if (this.array != null) { // L: 64 + WorldMapSectionType.ByteArrayPool_release(this.array); } - this.array = null; // L: 69 - } // L: 70 + this.array = null; // L: 65 + } // L: 66 - @ObfuscatedName("ay") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "1229" + descriptor = "(II)V", + garbageValue = "-1071371737" ) + @Export("writeByte") public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 73 - } // L: 74 + this.array[++this.offset - 1] = (byte)var1; // L: 69 + } // L: 70 @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1689611223" + garbageValue = "-952501591" ) + @Export("writeShort") public void writeShort(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 77 - this.array[++this.offset - 1] = (byte)var1; // L: 78 - } // L: 79 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 73 + this.array[++this.offset - 1] = (byte)var1; // L: 74 + } // L: 75 - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "77" - ) - public void writeMedium(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 82 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 83 - this.array[++this.offset - 1] = (byte)var1; // L: 84 - } // L: 85 - - @ObfuscatedName("af") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-471050402" + garbageValue = "-867756497" ) + @Export("writeMedium") + public void writeMedium(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 78 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 79 + this.array[++this.offset - 1] = (byte)var1; // L: 80 + } // L: 81 + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-1" + ) + @Export("writeInt") public void writeInt(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 88 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 89 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 90 - this.array[++this.offset - 1] = (byte)var1; // L: 91 - } // L: 92 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 84 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 85 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 86 + this.array[++this.offset - 1] = (byte)var1; // L: 87 + } // L: 88 - @ObfuscatedName("ak") + @ObfuscatedName("ap") + @Export("writeLongMedium") public void writeLongMedium(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 95 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 96 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 97 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 98 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 99 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 100 - } // L: 101 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 91 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 92 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 93 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 94 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 95 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 96 + } // L: 97 - @ObfuscatedName("ac") + @ObfuscatedName("ad") + @Export("writeLong") public void writeLong(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 104 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 105 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 106 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 107 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 108 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 109 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 110 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 111 - } // L: 112 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 100 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 101 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 102 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 103 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 104 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 105 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 106 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 107 + } // L: 108 - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "581507378" + garbageValue = "1071731245" ) + @Export("writeBoolean") public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); // L: 115 - } // L: 116 - - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "349369645" - ) - public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); // L: 123 - if (var2 >= 0) { // L: 124 - throw new IllegalArgumentException(""); - } else { - this.offset += SoundSystem.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 125 - this.array[++this.offset - 1] = 0; // L: 126 - } - } // L: 127 - - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "99" - ) - public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 134 - if (var2 >= 0) { // L: 135 - throw new IllegalArgumentException(""); - } else { - this.array[++this.offset - 1] = 0; // L: 136 - this.offset += SoundSystem.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 137 - this.array[++this.offset - 1] = 0; // L: 138 - } - } // L: 139 - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1859415815" - ) - public void writeCESU8(CharSequence var1) { - int var2 = FloorOverlayDefinition.method4871(var1); // L: 142 - this.array[++this.offset - 1] = 0; // L: 143 - this.writeVarInt(var2); // L: 144 - int var3 = this.offset * -1261786031; // L: 145 - byte[] var5 = this.array; // L: 147 - int var6 = this.offset; // L: 148 - int var7 = var1.length(); // L: 150 - int var8 = var6; // L: 151 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 152 - char var10 = var1.charAt(var9); // L: 153 - if (var10 <= 127) { // L: 154 - var5[var8++] = (byte)var10; // L: 155 - } else if (var10 <= 2047) { // L: 157 - var5[var8++] = (byte)(192 | var10 >> 6); // L: 158 - var5[var8++] = (byte)(128 | var10 & '?'); // L: 159 - } else { - var5[var8++] = (byte)(224 | var10 >> '\f'); // L: 162 - var5[var8++] = (byte)(128 | var10 >> 6 & 63); // L: 163 - var5[var8++] = (byte)(128 | var10 & '?'); // L: 164 - } - } - - int var4 = var8 - var6; // L: 167 - this.offset = (var3 + var4 * -1261786031) * -249160527; // L: 169 - } // L: 170 - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-894436385" - ) - public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 173 - this.array[++this.offset - 1] = var1[var4]; - } - - } // L: 174 - - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-2077997319" - ) - public void method5611(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 177 - } // L: 178 + this.writeByte(var1 ? 1 : 0); // L: 111 + } // L: 112 @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-369089618" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1741941254" ) - public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 181 - throw new IllegalArgumentException(); // L: 182 + @Export("writeStringCp1252NullTerminated") + public void writeStringCp1252NullTerminated(String var1) { + int var2 = var1.indexOf(0); // L: 119 + if (var2 >= 0) { // L: 120 + throw new IllegalArgumentException(""); } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 184 - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 185 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 186 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 187 + this.offset += Interpreter.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 121 + this.array[++this.offset - 1] = 0; // L: 122 } - } // L: 188 + } // L: 123 + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-79" + ) + @Export("writeStringCp1252NullCircumfixed") + public void writeStringCp1252NullCircumfixed(String var1) { + int var2 = var1.indexOf(0); // L: 130 + if (var2 >= 0) { // L: 131 + throw new IllegalArgumentException(""); + } else { + this.array[++this.offset - 1] = 0; // L: 132 + this.offset += Interpreter.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 133 + this.array[++this.offset - 1] = 0; // L: 134 + } + } // L: 135 + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "-462784795" + ) + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { + int var3 = var1.length(); // L: 140 + int var4 = 0; // L: 141 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 142 + char var6 = var1.charAt(var5); // L: 143 + if (var6 <= 127) { // L: 144 + ++var4; + } else if (var6 <= 2047) { // L: 145 + var4 += 2; + } else { + var4 += 3; // L: 146 + } + } + + this.array[++this.offset - 1] = 0; // L: 151 + this.writeVarInt(var4); // L: 152 + this.offset += GrandExchangeOfferUnitPriceComparator.method219(this.array, this.offset, var1); // L: 153 + } // L: 154 + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "([BIIB)V", + garbageValue = "23" + ) + @Export("writeBytes") + public void writeBytes(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 157 + this.array[++this.offset - 1] = var1[var4]; + } + + } // L: 158 @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-50" + descriptor = "(Lkb;I)V", + garbageValue = "1203499294" ) - public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { // L: 191 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 194 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 195 + public void method5713(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 161 + } // L: 162 + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1554829948" + ) + @Export("writeLengthInt") + public void writeLengthInt(int var1) { + if (var1 < 0) { // L: 165 + throw new IllegalArgumentException(); // L: 166 } else { - throw new IllegalArgumentException(); // L: 192 + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 168 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 169 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 170 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 171 } - } // L: 196 + } // L: 172 + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1476273531" + ) + @Export("writeLengthShort") + public void writeLengthShort(int var1) { + if (var1 >= 0 && var1 <= 65535) { // L: 175 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 178 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 179 + } else { + throw new IllegalArgumentException(); // L: 176 + } + } // L: 180 + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1164604575" + ) + @Export("writeLengthByte") + public void writeLengthByte(int var1) { + if (var1 >= 0 && var1 <= 255) { // L: 183 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 186 + } else { + throw new IllegalArgumentException(); // L: 184 + } + } // L: 187 + + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1693951904" + ) + @Export("writeSmartByteShort") + public void writeSmartByteShort(int var1) { + if (var1 >= 0 && var1 < 128) { // L: 190 + this.writeByte(var1); // L: 191 + } else if (var1 >= 0 && var1 < 32768) { // L: 194 + this.writeShort(var1 + 32768); // L: 195 + } else { + throw new IllegalArgumentException(); // L: 198 + } + } // L: 192 196 @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1412060467" - ) - public void writeLengthByte(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 199 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 202 - } else { - throw new IllegalArgumentException(); // L: 200 - } - } // L: 203 - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-92" - ) - public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { // L: 206 - this.writeByte(var1); // L: 207 - } else if (var1 >= 0 && var1 < 32768) { // L: 210 - this.writeShort(var1 + 32768); // L: 211 - } else { - throw new IllegalArgumentException(); // L: 214 - } - } // L: 208 212 - - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-444619487" + garbageValue = "324704874" ) + @Export("writeVarInt") public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { // L: 218 - if ((var1 & -16384) != 0) { // L: 219 - if ((var1 & -2097152) != 0) { // L: 220 - if ((var1 & -268435456) != 0) { // L: 221 + if ((var1 & -128) != 0) { // L: 202 + if ((var1 & -16384) != 0) { // L: 203 + if ((var1 & -2097152) != 0) { // L: 204 + if ((var1 & -268435456) != 0) { // L: 205 this.writeByte(var1 >>> 28 | 128); } - this.writeByte(var1 >>> 21 | 128); // L: 222 + this.writeByte(var1 >>> 21 | 128); // L: 206 } - this.writeByte(var1 >>> 14 | 128); // L: 224 + this.writeByte(var1 >>> 14 | 128); // L: 208 } - this.writeByte(var1 >>> 7 | 128); // L: 226 + this.writeByte(var1 >>> 7 | 128); // L: 210 } - this.writeByte(var1 & 127); // L: 228 - } // L: 229 - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "600497455" - ) - public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 232 - } + this.writeByte(var1 & 127); // L: 212 + } // L: 213 @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "66" - ) - public byte readByte() { - return this.array[++this.offset - 1]; // L: 236 - } - - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "10687" - ) - public int readUnsignedShort() { - this.offset += 2; // L: 240 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 241 - } - - @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "72" + garbageValue = "0" ) - public int readShort() { - this.offset += 2; // L: 245 - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 246 - if (var1 > 32767) { // L: 247 - var1 -= 65536; - } - - return var1; // L: 248 - } - - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "914016533" - ) - public int readMedium() { - this.offset += 3; // L: 252 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 253 - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "28464" - ) - public int readInt() { - this.offset += 4; // L: 257 - 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); // L: 258 + @Export("readUnsignedByte") + public int readUnsignedByte() { + return this.array[++this.offset - 1] & 255; // L: 216 } @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "1145152498" + descriptor = "(I)B", + garbageValue = "-165326456" ) - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 262 - long var3 = (long)this.readInt() & 4294967295L; // L: 263 - return (var1 << 32) + var3; // L: 264 + @Export("readByte") + public byte readByte() { + return this.array[++this.offset - 1]; // L: 220 } - @ObfuscatedName("bo") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "63" + descriptor = "(B)I", + garbageValue = "101" ) + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 224 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 225 + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "-17017" + ) + @Export("readShort") + public int readShort() { + this.offset += 2; // L: 229 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 230 + if (var1 > 32767) { // L: 231 + var1 -= 65536; + } + + return var1; // L: 232 + } + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-24" + ) + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 236 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 237 + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1099796533" + ) + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 241 + 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); // L: 242 + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(B)J", + garbageValue = "-4" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 246 + long var3 = (long)this.readInt() & 4294967295L; // L: 247 + return (var1 << 32) + var3; // L: 248 + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1959182219" + ) + @Export("readBoolean") public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 268 + return (this.readUnsignedByte() & 1) == 1; // L: 252 } @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "706645017" + garbageValue = "1907625721" ) + @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 272 - ++this.offset; // L: 273 - return null; // L: 274 + if (this.array[this.offset] == 0) { // L: 256 + ++this.offset; // L: 257 + return null; // L: 258 } else { - return this.readStringCp1252NullTerminated(); // L: 276 + return this.readStringCp1252NullTerminated(); // L: 260 } } - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "95" - ) - public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 280 - - while (this.array[++this.offset - 1] != 0) { // L: 281 - } - - int var2 = this.offset - var1 - 1; // L: 282 - return var2 == 0 ? "" : SpotAnimationDefinition.decodeStringCp1252(this.array, var1, var2); // L: 283 284 - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-101" - ) - public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 288 - if (var1 != 0) { // L: 289 - throw new IllegalStateException(""); - } else { - int var2 = this.offset; // L: 290 - - while (this.array[++this.offset - 1] != 0) { // L: 291 - } - - int var3 = this.offset - var2 - 1; // L: 292 - return var3 == 0 ? "" : SpotAnimationDefinition.decodeStringCp1252(this.array, var2, var3); // L: 293 294 - } - } - - @ObfuscatedName("bt") + @ObfuscatedName("bx") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "2118487667" + garbageValue = "-387094332" ) - public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 298 - if (var1 != 0) { // L: 299 + @Export("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; // L: 264 + + while (this.array[++this.offset - 1] != 0) { // L: 265 + } + + int var2 = this.offset - var1 - 1; // L: 266 + return var2 == 0 ? "" : class52.decodeStringCp1252(this.array, var1, var2); // L: 267 268 + } + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1484768669" + ) + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; // L: 272 + if (var1 != 0) { // L: 273 throw new IllegalStateException(""); } else { - int var2 = this.readVarInt(); // L: 300 - if (var2 + this.offset > this.array.length) { // L: 301 + int var2 = this.offset; // L: 274 + + while (this.array[++this.offset - 1] != 0) { // L: 275 + } + + int var3 = this.offset - var2 - 1; // L: 276 + return var3 == 0 ? "" : class52.decodeStringCp1252(this.array, var2, var3); // L: 277 278 + } + } + + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "722269119" + ) + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; // L: 282 + if (var1 != 0) { // L: 283 + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); // L: 284 + if (var2 + this.offset > this.array.length) { // L: 285 throw new IllegalStateException(""); } else { - byte[] var4 = this.array; // L: 303 - int var5 = this.offset; // L: 304 - char[] var6 = new char[var2]; // L: 306 - int var7 = 0; // L: 307 - int var8 = var5; // L: 308 + byte[] var4 = this.array; // L: 287 + int var5 = this.offset; // L: 288 + char[] var6 = new char[var2]; // L: 290 + int var7 = 0; // L: 291 + int var8 = var5; // L: 292 int var11; - for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { // L: 309 310 341 - int var10 = var4[var8++] & 255; // L: 311 - if (var10 < 128) { // L: 313 - if (var10 == 0) { // L: 314 + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 293 294 325 + int var10 = var4[var8++] & 255; // L: 295 + if (var10 < 128) { // L: 297 + if (var10 == 0) { // L: 298 var11 = 65533; } else { - var11 = var10; // L: 315 + var11 = var10; // L: 299 } - } else if (var10 < 192) { // L: 317 + } else if (var10 < 192) { // L: 301 var11 = 65533; - } else if (var10 < 224) { // L: 318 - if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 319 - var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 320 - if (var11 < 128) { // L: 321 + } else if (var10 < 224) { // L: 302 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 303 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 304 + if (var11 < 128) { // L: 305 var11 = 65533; } } else { - var11 = 65533; // L: 323 + var11 = 65533; // L: 307 } - } else if (var10 < 240) { // L: 325 - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 326 - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 327 - if (var11 < 2048) { // L: 328 + } else if (var10 < 240) { // L: 309 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 310 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 311 + if (var11 < 2048) { // L: 312 var11 = 65533; } } else { - var11 = 65533; // L: 330 + var11 = 65533; // L: 314 } - } else if (var10 < 248) { // L: 332 - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 333 - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 334 - if (var11 >= 65536 && var11 <= 1114111) { // L: 335 - var11 = 65533; // L: 336 + } else if (var10 < 248) { // L: 316 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 317 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 318 + if (var11 >= 65536 && var11 <= 1114111) { // L: 319 + var11 = 65533; // L: 320 } else { var11 = 65533; } } else { - var11 = 65533; // L: 338 + var11 = 65533; // L: 322 } } else { - var11 = 65533; // L: 340 + var11 = 65533; // L: 324 } } - String var3 = new String(var6, 0, var7); // L: 343 - this.offset += var2; // L: 346 - return var3; // L: 347 + String var3 = new String(var6, 0, var7); // L: 327 + this.offset += var2; // L: 330 + return var3; // L: 331 } } } - @ObfuscatedName("bs") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "([BIIB)V", garbageValue = "0" ) + @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = this.array[++this.offset - 1]; // L: 351 + var1[var4] = this.array[++this.offset - 1]; // L: 335 } - } // L: 352 + } // L: 336 - @ObfuscatedName("cg") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "202273494" ) + @Export("readShortSmart") public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 355 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 356 357 - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "573846843" - ) - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 361 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 362 363 - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1664654031" - ) - public int method5632() { - int var1 = 0; // L: 367 - - int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 368 369 371 - var1 += 32767; // L: 370 - } - - var1 += var2; // L: 373 - return var1; // L: 374 - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1880158305" - ) - public int method5666() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 378 379 + int var1 = this.array[this.offset] & 255; // L: 339 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 340 341 } @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "79" + descriptor = "(I)I", + garbageValue = "-1537644945" ) - public int method5634() { - if (this.array[this.offset] < 0) { // L: 383 - return this.readInt() & Integer.MAX_VALUE; - } else { - int var1 = this.readUnsignedShort(); // L: 384 - return var1 == 32767 ? -1 : var1; // L: 385 - } - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-24" - ) - public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 390 - - int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 391 392 394 - var2 = (var2 | var1 & 127) << 7; // L: 393 - } - - return var2 | var1; // L: 396 - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "([IB)V", - garbageValue = "0" - ) - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 400 - this.offset = 0; // L: 401 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 402 - int var4 = this.readInt(); // L: 403 - int var5 = this.readInt(); // L: 404 - int var6 = 0; // L: 405 - int var7 = -1640531527; // L: 406 - - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 407 408 411 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 409 - var6 += var7; // L: 410 - } - - this.offset -= 8; // L: 413 - this.writeInt(var4); // L: 414 - this.writeInt(var5); // L: 415 - } - - } // L: 417 - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-391802168" - ) - public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 420 - this.offset = 0; // L: 421 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 422 - int var4 = this.readInt(); // L: 423 - int var5 = this.readInt(); // L: 424 - int var6 = -957401312; // L: 425 - int var7 = -1640531527; // L: 426 - - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 427 428 431 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 429 - var6 -= var7; // L: 430 - } - - this.offset -= 8; // L: 433 - this.writeInt(var4); // L: 434 - this.writeInt(var5); // L: 435 - } - - } // L: 437 - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "-1086697970" - ) - public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 440 - this.offset = var2; // L: 441 - int var5 = (var3 - var2) / 8; // L: 442 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 443 - int var7 = this.readInt(); // L: 444 - int var8 = this.readInt(); // L: 445 - int var9 = 0; // L: 446 - int var10 = -1640531527; // L: 447 - - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 448 449 452 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 450 - var9 += var10; // L: 451 - } - - this.offset -= 8; // L: 454 - this.writeInt(var7); // L: 455 - this.writeInt(var8); // L: 456 - } - - this.offset = var4; // L: 458 - } // L: 459 - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "([IIIB)V", - garbageValue = "111" - ) - public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 462 - this.offset = var2; // L: 463 - int var5 = (var3 - var2) / 8; // L: 464 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 465 - int var7 = this.readInt(); // L: 466 - int var8 = this.readInt(); // L: 467 - int var9 = -957401312; // L: 468 - int var10 = -1640531527; // L: 469 - - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 470 471 474 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 472 - var9 -= var10; // L: 473 - } - - this.offset -= 8; // L: 476 - this.writeInt(var7); // L: 477 - this.writeInt(var8); // L: 478 - } - - this.offset = var4; // L: 480 - } // L: 481 - - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-1998456113" - ) - public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 484 - this.offset = 0; // L: 485 - byte[] var4 = new byte[var3]; // L: 486 - this.readBytes(var4, 0, var3); // L: 487 - BigInteger var5 = new BigInteger(var4); // L: 488 - BigInteger var6 = var5.modPow(var1, var2); // L: 489 - byte[] var7 = var6.toByteArray(); // L: 490 - this.offset = 0; // L: 491 - this.writeShort(var7.length); // L: 492 - this.writeBytes(var7, 0, var7.length); // L: 493 - } // L: 494 - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "277387180" - ) - public int writeCrc(int var1) { - byte[] var3 = this.array; // L: 498 - int var4 = this.offset; // L: 499 - int var5 = -1; // L: 501 - - for (int var6 = var1; var6 < var4; ++var6) { // L: 502 - var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 503 - } - - var5 = ~var5; // L: 505 - this.writeInt(var5); // L: 509 - return var5; // L: 510 - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1944905387" - ) - public boolean checkCrc() { - this.offset -= 4; // L: 514 - byte[] var2 = this.array; // L: 516 - int var3 = this.offset; // L: 517 - int var4 = -1; // L: 519 - - int var5; - for (var5 = 0; var5 < var3; ++var5) { // L: 520 - var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; // L: 521 - } - - var4 = ~var4; // L: 523 - var5 = this.readInt(); // L: 527 - return var5 == var4; // L: 528 + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 345 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 346 347 } @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1872779472" + descriptor = "(I)I", + garbageValue = "-1848726522" ) - public void method5645(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 533 - } // L: 534 + public int method5743() { + int var1 = 0; // L: 351 - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1958454445" - ) - public void method5644(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 537 - } // L: 538 + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 352 353 355 + var1 += 32767; // L: 354 + } - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1046245184" - ) - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 541 - } // L: 542 + var1 += var2; // L: 357 + return var1; // L: 358 + } - @ObfuscatedName("cx") + @ObfuscatedName("cg") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-349157091" + garbageValue = "-548217756" ) - public int method5646() { - return this.array[++this.offset - 1] - 128 & 255; // L: 545 + public int method5653() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 362 363 } @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2104060709" + descriptor = "(S)I", + garbageValue = "25836" ) - public int method5639() { - return 0 - this.array[++this.offset - 1] & 255; // L: 549 + public int method5851() { + if (this.array[this.offset] < 0) { // L: 367 + return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); // L: 368 + return var1 == 32767 ? -1 : var1; // L: 369 + } } - @ObfuscatedName("ch") + @ObfuscatedName("cc") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1616346013" + garbageValue = "-436304655" ) - public int method5612() { - return 128 - this.array[++this.offset - 1] & 255; // L: 553 + @Export("readVarInt") + public int readVarInt() { + byte var1 = this.array[++this.offset - 1]; // L: 374 + + int var2; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 375 376 378 + var2 = (var2 | var1 & 127) << 7; // L: 377 + } + + return var2 | var1; // L: 380 } - @ObfuscatedName("cs") + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "-1102921575" + ) + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 384 + this.offset = 0; // L: 385 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 386 + int var4 = this.readInt(); // L: 387 + int var5 = this.readInt(); // L: 388 + int var6 = 0; // L: 389 + int var7 = -1640531527; // L: 390 + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 391 392 395 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 393 + var6 += var7; // L: 394 + } + + this.offset -= 8; // L: 397 + this.writeInt(var4); // L: 398 + this.writeInt(var5); // L: 399 + } + + } // L: 401 + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "([IS)V", + garbageValue = "12847" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 404 + this.offset = 0; // L: 405 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 406 + int var4 = this.readInt(); // L: 407 + int var5 = this.readInt(); // L: 408 + int var6 = -957401312; // L: 409 + int var7 = -1640531527; // L: 410 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 411 412 415 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 413 + var6 -= var7; // L: 414 + } + + this.offset -= 8; // L: 417 + this.writeInt(var4); // L: 418 + this.writeInt(var5); // L: 419 + } + + } // L: 421 + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "1759120286" + ) + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 424 + this.offset = var2; // L: 425 + int var5 = (var3 - var2) / 8; // L: 426 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 427 + int var7 = this.readInt(); // L: 428 + int var8 = this.readInt(); // L: 429 + int var9 = 0; // L: 430 + int var10 = -1640531527; // L: 431 + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 432 433 436 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 434 + var9 += var10; // L: 435 + } + + this.offset -= 8; // L: 438 + this.writeInt(var7); // L: 439 + this.writeInt(var8); // L: 440 + } + + this.offset = var4; // L: 442 + } // L: 443 + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "-1051721840" + ) + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 446 + this.offset = var2; // L: 447 + int var5 = (var3 - var2) / 8; // L: 448 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 449 + int var7 = this.readInt(); // L: 450 + int var8 = this.readInt(); // L: 451 + int var9 = -957401312; // L: 452 + int var10 = -1640531527; // L: 453 + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 454 455 458 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 456 + var9 -= var10; // L: 457 + } + + this.offset -= 8; // L: 460 + this.writeInt(var7); // L: 461 + this.writeInt(var8); // L: 462 + } + + this.offset = var4; // L: 464 + } // L: 465 + + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "747250112" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; // L: 468 + this.offset = 0; // L: 469 + byte[] var4 = new byte[var3]; // L: 470 + this.readBytes(var4, 0, var3); // L: 471 + BigInteger var5 = new BigInteger(var4); // L: 472 + BigInteger var6 = var5.modPow(var1, var2); // L: 473 + byte[] var7 = var6.toByteArray(); // L: 474 + this.offset = 0; // L: 475 + this.writeShort(var7.length); // L: 476 + this.writeBytes(var7, 0, var7.length); // L: 477 + } // L: 478 + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-78" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = class4.method81(this.array, var1, this.offset); // L: 481 + this.writeInt(var2); // L: 482 + return var2; // L: 483 + } + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "37281244" + ) + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 487 + int var1 = class4.method81(this.array, 0, this.offset); // L: 488 + int var2 = this.readInt(); // L: 489 + return var1 == var2; // L: 490 + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "21" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 495 + } // L: 496 + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1590454858" + ) + public void method5664(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 499 + } // L: 500 + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-52" + ) + public void method5665(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 503 + } // L: 504 + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-113" + ) + public int method5619() { + return this.array[++this.offset - 1] - 128 & 255; // L: 507 + } + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-328274489" + ) + public int method5650() { + return 0 - this.array[++this.offset - 1] & 255; // L: 511 + } + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2006554033" + ) + public int method5668() { + return 128 - this.array[++this.offset - 1] & 255; // L: 515 + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-1685286261" + ) + public byte method5669() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 519 + } + + @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "(B)B", - garbageValue = "92" + garbageValue = "56" ) - public byte method5649() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 557 - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "907230791" - ) - public byte method5650() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 561 - } - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-1960161584" - ) - public byte method5730() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 565 + public byte method5688() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 523 } @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-18" + descriptor = "(I)B", + garbageValue = "-2075373507" ) - public void method5665(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 569 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 570 - } // L: 571 + public byte method5837() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 527 + } - @ObfuscatedName("cy") + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "-8294" + ) + @Export("writeShortLE") + public void writeShortLE(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 531 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 532 + } // L: 533 + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-105" + ) + public void method5673(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 536 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 537 + } // L: 538 + + @ObfuscatedName("ck") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2095246398" + garbageValue = "-987978019" ) - public void method5653(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 574 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 575 - } // L: 576 + public void method5674(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 541 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 542 + } // L: 543 - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "32" - ) - public void method5654(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 579 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 580 - } // L: 581 - - @ObfuscatedName("cl") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "359063427" - ) - public int method5655() { - this.offset += 2; // L: 584 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 585 - } - - @ObfuscatedName("dx") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1348032650" - ) - public int method5656() { - this.offset += 2; // L: 589 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 590 - } - - @ObfuscatedName("dq") + @ObfuscatedName("cr") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "14" + garbageValue = "-40" ) - public int method5657() { - this.offset += 2; // L: 594 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 595 + public int method5675() { + this.offset += 2; // L: 546 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 547 + } + + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-7" + ) + public int method5659() { + this.offset += 2; // L: 551 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 552 + } + + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "537205076" + ) + public int method5797() { + this.offset += 2; // L: 556 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 557 } @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "44" + descriptor = "(I)I", + garbageValue = "1902869409" ) - public int method5658() { - this.offset += 2; // L: 599 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 600 - if (var1 > 32767) { // L: 601 + public int method5678() { + this.offset += 2; // L: 561 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 562 + if (var1 > 32767) { // L: 563 var1 -= 65536; } - return var1; // L: 602 + return var1; // L: 564 } - @ObfuscatedName("dh") + @ObfuscatedName("df") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2054831893" + garbageValue = "2056151189" ) - public int method5659() { - this.offset += 2; // L: 606 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 607 - if (var1 > 32767) { // L: 608 + public int method5679() { + this.offset += 2; // L: 568 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 569 + if (var1 > 32767) { // L: 570 var1 -= 65536; } - return var1; // L: 609 + return var1; // L: 571 } @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "80296845" + garbageValue = "2146489503" ) - public void method5660(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 613 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 614 - this.array[++this.offset - 1] = (byte)var1; // L: 615 - } // L: 616 + public void method5680(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 575 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 576 + this.array[++this.offset - 1] = (byte)var1; // L: 577 + } // L: 578 - @ObfuscatedName("db") + @ObfuscatedName("dl") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1347720576" + garbageValue = "-520916212" ) - public int method5740() { - this.offset += 3; // L: 619 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 620 + public int method5852() { + this.offset += 3; // L: 581 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 582 } - @ObfuscatedName("dj") + @ObfuscatedName("dq") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1701210516" + garbageValue = "-1394035543" ) - public void method5662(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 624 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 625 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 626 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 627 - } // L: 628 + public void method5682(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 586 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 587 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 588 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 589 + } // L: 590 - @ObfuscatedName("dk") + @ObfuscatedName("dp") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "991573770" + garbageValue = "1286160069" ) - public void method5663(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 631 - this.array[++this.offset - 1] = (byte)var1; // L: 632 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 633 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 634 - } // L: 635 + public void method5683(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 593 + this.array[++this.offset - 1] = (byte)var1; // L: 594 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 595 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 596 + } // L: 597 - @ObfuscatedName("de") + @ObfuscatedName("do") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-383188135" + garbageValue = "861596760" ) - public void writeShortLE(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 638 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 639 - this.array[++this.offset - 1] = (byte)var1; // L: 640 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 641 - } // L: 642 + public void method5684(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 600 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 601 + this.array[++this.offset - 1] = (byte)var1; // L: 602 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 603 + } // L: 604 + + @ObfuscatedName("dm") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1015676655" + ) + public int method5685() { + this.offset += 4; // L: 607 + 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); // L: 608 + } + + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "703983648" + ) + public int method5686() { + this.offset += 4; // L: 612 + 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); // L: 613 + } @ObfuscatedName("da") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-640686873" + garbageValue = "-2147178655" ) - public int method5678() { - this.offset += 4; // L: 645 - 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); // L: 646 + public int method5687() { + this.offset += 4; // L: 617 + 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); // L: 618 } - @ObfuscatedName("dr") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1384707566" - ) - public int method5708() { - this.offset += 4; // L: 650 - 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); // L: 651 - } - - @ObfuscatedName("dw") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1723621979" - ) - public int method5667() { - this.offset += 4; // L: 655 - 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); // L: 656 - } - - @ObfuscatedName("dy") + @ObfuscatedName("dz") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "108" + garbageValue = "95" ) - public void method5749(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 660 - var1[var4] = this.array[++this.offset - 1]; + public void method5833(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 622 } - } // L: 661 + } // L: 623 @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "([BIIS)V", - garbageValue = "321" + descriptor = "([BIIB)V", + garbageValue = "62" ) - public void method5697(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 664 + public void method5689(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 626 var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } - } // L: 665 + } // L: 627 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 11c60a89c0..c8e14f16a8 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -1,63 +1,77 @@ import java.io.EOFException; 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("mz") +@Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmy;" + descriptor = "Lmr;" ) + @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = 9179108447436471203L - ) - long readBufferOffset; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 405113093 - ) - int readBufferLength; - @ObfuscatedName("o") - byte[] writeBuffer; - @ObfuscatedName("x") - @ObfuscatedGetter( - longValue = -2663227867343054731L - ) - long writeBufferOffset; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -44681909 - ) - int writeBufferLength; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = 8904526348477535207L - ) - long offset; @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 3315460692689798849L + longValue = -6482337856492114931L ) + @Export("readBufferOffset") + long readBufferOffset; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1044062057 + ) + @Export("readBufferLength") + int readBufferLength; + @ObfuscatedName("q") + @Export("writeBuffer") + byte[] writeBuffer; + @ObfuscatedName("k") + @ObfuscatedGetter( + longValue = 2774637488082340967L + ) + @Export("writeBufferOffset") + long writeBufferOffset; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1024497111 + ) + @Export("writeBufferLength") + int writeBufferLength; + @ObfuscatedName("u") + @ObfuscatedGetter( + longValue = -561179162582633637L + ) + @Export("offset") + long offset; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = -2408592665773969817L + ) + @Export("fileLength") long fileLength; - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -7074391582166578327L + longValue = -5636078881835080275L ) + @Export("length") long length; - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 8487172473192178189L + longValue = -1026636672774520795L ) + @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lmy;II)V" + descriptor = "(Lmr;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; // L: 9 @@ -70,17 +84,19 @@ public class BufferedFile { this.offset = 0L; // L: 24 } // L: 25 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-33" + garbageValue = "36" ) + @Export("close") public void close() throws IOException { this.flush(); // L: 28 this.accessFile.close(); // L: 29 } // L: 30 - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 throw new IOException(""); @@ -89,36 +105,39 @@ public class BufferedFile { } } // L: 35 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "-1539100429" + garbageValue = "-1848502786" ) + @Export("length") public long length() { return this.length; // L: 38 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1457343734" + descriptor = "([BB)V", + garbageValue = "-4" ) + @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "779663490" + garbageValue = "-1500902626" ) + @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { try { if (var3 + var2 > var1.length) { // L: 47 throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 this.offset += (long)var3; // L: 50 return; // L: 51 @@ -127,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; // L: 53 int var7 = var3; // L: 55 int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56 + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56 var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 if (var8 > var3) { // L: 58 var8 = var3; @@ -181,16 +200,16 @@ public class BufferedFile { long var13 = -1L; // L: 95 long var10 = -1L; // L: 96 - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97 + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97 var13 = this.writeBufferOffset; // L: 98 } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 var13 = var4; // L: 101 } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { // L: 103 + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103 var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104 - } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 - var10 = (long)var7 + var4; // L: 107 + } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 + var10 = var4 + (long)var7; // L: 107 } if (var13 > -1L && var10 > var13) { // L: 109 @@ -212,14 +231,15 @@ public class BufferedFile { } } // L: 125 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1341738722" + garbageValue = "2145784037" ) + @Export("load") void load() throws IOException { this.readBufferLength = 0; // L: 128 - if (this.offset != this.fileOffset) { // L: 129 + if (this.fileOffset != this.offset) { // L: 129 this.accessFile.seek(this.offset); // L: 130 this.fileOffset = this.offset; // L: 131 } @@ -241,22 +261,23 @@ public class BufferedFile { } // L: 142 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "329860365" + garbageValue = "1113982588" ) + @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if ((long)var3 + this.offset > this.length) { // L: 146 + if (this.offset + (long)var3 > this.length) { // L: 146 this.length = this.offset + (long)var3; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 + if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147 this.flush(); // L: 148 } - if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 + if (this.writeBufferOffset != -1L && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151 System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152 this.offset += (long)var4; // L: 153 @@ -295,14 +316,14 @@ public class BufferedFile { long var6 = -1L; // L: 168 if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 var9 = this.readBufferOffset; // L: 173 } - if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 - var6 = this.offset + (long)var3; // L: 176 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { // L: 178 - var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 + if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 175 + var6 = (long)var3 + this.offset; // L: 176 + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) { // L: 178 + var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179 } if (var9 > -1L && var6 > var9) { // L: 181 @@ -318,36 +339,37 @@ public class BufferedFile { } } // L: 186 193 200 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-236075933" + garbageValue = "-540303009" ) + @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { // L: 203 - if (this.fileOffset != this.writeBufferOffset) { // L: 204 + if (this.writeBufferOffset != -1L) { // L: 203 + if (this.writeBufferOffset != this.fileOffset) { // L: 204 this.accessFile.seek(this.writeBufferOffset); // L: 205 this.fileOffset = this.writeBufferOffset; // L: 206 } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 - this.fileOffset += (long)this.writeBufferLength * 16721398605021185L; // L: 209 + this.fileOffset += (long)this.writeBufferLength * 1781005947037024257L; // L: 209 if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } long var1 = -1L; // L: 211 long var3 = -1L; // L: 212 - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213 + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { // L: 213 var1 = this.writeBufferOffset; // L: 214 } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216 var1 = this.readBufferOffset; // L: 217 } - if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219 var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 - var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 + } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 + var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223 } if (var1 > -1L && var3 > var1) { // L: 225 diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 3acd8246b4..aacbea8778 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -1,24 +1,30 @@ import java.io.IOException; import java.net.Socket; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lx") +@Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("socket") Socket socket; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Llz;" ) + @Export("source") BufferedSource source; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Lld;" ) + @Export("sink") BufferedSink sink; - BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { + public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { this.socket = var1; // L: 12 this.socket.setSoTimeout(30000); // L: 13 this.socket.setTcpNoDelay(true); // L: 14 @@ -28,11 +34,12 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 } // L: 19 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-147773206" + garbageValue = "1983450651" ) + @Export("close") public void close() { this.sink.close(); // L: 42 @@ -44,47 +51,52 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); // L: 47 } // L: 48 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-99" + garbageValue = "1" ) + @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); // L: 30 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "12" + descriptor = "(I)I", + garbageValue = "933186835" ) + @Export("available") public int available() throws IOException { return this.source.available(); // L: 26 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-78" + descriptor = "(II)Z", + garbageValue = "-916126565" ) + @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); // L: 22 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1533815985" + garbageValue = "1049423117" ) + @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); // L: 34 } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "52" + descriptor = "([BIII)V", + garbageValue = "1456512196" ) + @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); // L: 38 } // L: 39 @@ -92,4 +104,38 @@ public class BufferedNetSocket extends AbstractSocket { protected void finalize() { this.close(); // L: 51 } // L: 52 + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "(Lht;B)Z", + garbageValue = "15" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 9995 + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 9996 + int var2 = WorldMapID.method663(var0, var1); // L: 9997 + int var3 = var0.cs1ComparisonValues[var1]; // L: 9998 + if (var0.cs1Comparisons[var1] == 2) { // L: 9999 + if (var2 >= var3) { // L: 10000 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10002 + if (var2 <= var3) { // L: 10003 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10005 + if (var2 == var3) { // L: 10006 + return false; + } + } else if (var2 != var3) { // L: 10008 + return false; + } + } + + return true; // L: 10010 + } + } } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 441edecf90..0fc85ca8eb 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -1,35 +1,46 @@ import java.io.IOException; import java.io.OutputStream; +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("lf") +@ObfuscatedName("ld") +@Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("thread") Thread thread; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 744968193 + intValue = -422941959 ) + @Export("capacity") int capacity; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("buffer") byte[] buffer; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -683527295 + intValue = 1493204291 ) + @Export("position") int position; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 870280175 + intValue = -1377573981 ) + @Export("limit") int limit; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("exception") IOException exception; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("closed") boolean closed; BufferedSink(OutputStream var1, int var2) { @@ -43,11 +54,12 @@ public class BufferedSink implements Runnable { this.thread.start(); // L: 197 } // L: 198 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "8" + garbageValue = "2" ) + @Export("isClosed") boolean isClosed() { if (this.closed) { // L: 201 try { @@ -67,11 +79,12 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "803679823" + descriptor = "([BIIB)V", + garbageValue = "-33" ) + @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261 synchronized(this) { // L: 262 @@ -106,11 +119,12 @@ public class BufferedSink implements Runnable { } } // L: 279 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "256" + descriptor = "(I)V", + garbageValue = "-2058215649" ) + @Export("close") void close() { synchronized(this) { // L: 282 this.closed = true; // L: 283 @@ -183,15 +197,4 @@ public class BufferedSink implements Runnable { } while(!this.isClosed()); // L: 256 } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;Ljava/lang/String;Ljava/lang/String;I)Lkr;", - garbageValue = "326512340" - ) - public static Font method5983(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); // L: 148 - int var5 = var0.getFileId(var4, var3); // L: 149 - return RouteStrategy.method3688(var0, var1, var4, var5); // L: 150 - } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 1fc7836e3f..f7a15c844c 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -1,34 +1,44 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; +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("lx") +@ObfuscatedName("lz") +@Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("thread") Thread thread; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("inputStream") InputStream inputStream; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1790809931 + intValue = 1503389917 ) + @Export("capacity") int capacity; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("buffer") byte[] buffer; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -264397639 + intValue = -212919609 ) + @Export("position") int position; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1799802211 + intValue = 1323002483 ) + @Export("limit") int limit; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("exception") IOException exception; BufferedSource(InputStream var1, int var2) { @@ -42,11 +52,12 @@ public class BufferedSource implements Runnable { this.thread.start(); // L: 69 } // L: 70 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1870168211" + descriptor = "(IB)Z", + garbageValue = "-4" ) + @Export("isAvailable") boolean isAvailable(int var1) throws IOException { if (var1 == 0) { // L: 106 return true; @@ -75,11 +86,12 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1796836135" + descriptor = "(B)I", + garbageValue = "1" ) + @Export("available") int available() throws IOException { synchronized(this) { // L: 122 int var2; @@ -98,14 +110,15 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1217698749" + garbageValue = "-1290457808" ) + @Export("readUnsignedByte") int readUnsignedByte() throws IOException { synchronized(this) { // L: 135 - if (this.position == this.limit) { // L: 136 + if (this.limit == this.position) { // L: 136 if (this.exception != null) { // L: 137 throw new IOException(this.exception.toString()); } else { @@ -120,11 +133,12 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "315484651" + garbageValue = "-1171838019" ) + @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 148 synchronized(this) { // L: 149 @@ -160,11 +174,12 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1698989409" + garbageValue = "-1615837406" ) + @Export("close") void close() { synchronized(this) { // L: 170 if (this.exception == null) { diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 201c127cfb..f97bc41463 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -1,8 +1,12 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gm") +@ObfuscatedName("gf") +@Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("byteArray") public byte[] byteArray; public ByteArrayNode(byte[] var1) { diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 485e8fae9c..c796260ef2 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -1,41 +1,48 @@ +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("kg") +@ObfuscatedName("ln") +@Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -2025901059 + intValue = 1202056679 ) + @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1213393185 + intValue = -2063240013 ) + @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1641573055 + intValue = -1967432073 ) + @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("x") - static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("w") - static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("ByteArrayPool_arrays") static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("cc") + @ObfuscatedName("ap") + @Export("client") @ObfuscatedSignature( - descriptor = "Lbo;" + descriptor = "Lclient;" ) - static MouseRecorder mouseRecorder; + static Client client; static { ByteArrayPool_smallCount = 0; // L: 4 @@ -46,11 +53,12 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; // L: 9 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IZB)[B", - garbageValue = "29" + descriptor = "(IZI)[B", + garbageValue = "-1957443325" ) + @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { byte[] var4; if (var0 != 100) { // L: 35 @@ -81,13 +89,13 @@ public class ByteArrayPool { } if (ByteArrayPool_arrays != null) { // L: 50 - for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 - if (ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 - if (var0 < ByteArrayPool_alternativeSizes[var2]) { + for (int var2 = 0; var2 < Coord.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 + if (Coord.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 + if (var0 < Coord.ByteArrayPool_alternativeSizes[var2]) { } - } else if (ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = ByteArrayPool_arrays[var2][--ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 - ByteArrayPool_arrays[var2][ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 + } else if (FloorDecoration.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = ByteArrayPool_arrays[var2][--FloorDecoration.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 + ByteArrayPool_arrays[var2][FloorDecoration.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 return var3; // L: 55 } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 6a8729bb28..f78b0e36c6 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,40 +1,805 @@ 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("hk") +@ObfuscatedName("hn") +@Implements("Calendar") public class Calendar { - @ObfuscatedName("z") - static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("k") - static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("s") - static java.util.Calendar Calendar_calendar; - @ObfuscatedName("x") - public static short[] field2535; + @ObfuscatedName("f") + @Export("MONTH_NAMES_ENGLISH_GERMAN") + public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("b") + @Export("DAYS_OF_THE_WEEK") + public static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("l") + @Export("Calendar_calendar") + public static java.util.Calendar Calendar_calendar; static { MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 7 DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 17 - java.util.Calendar.getInstance(); - Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); - } + java.util.Calendar.getInstance(); // L: 21 + Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 22 + } // L: 23 - @ObfuscatedName("z") + @ObfuscatedName("hm") @ObfuscatedSignature( - descriptor = "(I[BLlz;I)V", - garbageValue = "2015362738" + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "-63" ) - static void method4039(int var0, byte[] var1, ArchiveDisk var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 - var3.type = 0; // L: 19 - var3.key = (long)var0; // L: 20 - var3.data = var1; // L: 21 - var3.archiveDisk = var2; // L: 22 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 - } // L: 25 + @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) { // L: 7947 + var2 -= 2000; + } - WorldMapArea.method415(); // L: 26 - } // L: 27 + PacketBufferNode var8; + if (var2 == 1) { // L: 7948 + Client.mouseCrossX = var6; // L: 7974 + Client.mouseCrossY = var7; // L: 7975 + Client.mouseCrossColor = 2; // L: 7976 + Client.mouseCrossState = 0; // L: 7977 + Client.destinationX = var0; // L: 7978 + Client.destinationY = var1; // L: 7979 + var8 = class4.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); // L: 7981 + var8.packetBuffer.method5674(var0 + FloorDecoration.baseX); // L: 7982 + var8.packetBuffer.method5684(SpotAnimationDefinition.selectedItemWidget); // L: 7983 + var8.packetBuffer.method5673(Entity.selectedItemId); // L: 7984 + var8.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7985 + var8.packetBuffer.writeShortLE(InvDefinition.selectedItemSlot); // L: 7986 + var8.packetBuffer.method5674(var3); // L: 7987 + var8.packetBuffer.writeShortLE(WorldMapData_0.baseY + var1); // L: 7988 + Client.packetWriter.addNode(var8); // L: 7989 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 8711 + Client.mouseCrossY = var7; // L: 8712 + Client.mouseCrossColor = 2; // L: 8713 + Client.mouseCrossState = 0; // L: 8714 + Client.destinationX = var0; // L: 8715 + Client.destinationY = var1; // L: 8716 + var8 = class4.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); // L: 8718 + var8.packetBuffer.writeShort(WorldMapData_0.baseY + var1); // L: 8719 + var8.packetBuffer.method5683(class307.selectedSpellWidget); // L: 8720 + var8.packetBuffer.method5674(Client.selectedSpellChildIndex); // L: 8721 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8722 + var8.packetBuffer.writeShort(var0 + FloorDecoration.baseX); // L: 8723 + var8.packetBuffer.method5674(var3); // L: 8724 + Client.packetWriter.addNode(var8); // L: 8725 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8403 + Client.mouseCrossY = var7; // L: 8404 + Client.mouseCrossColor = 2; // L: 8405 + Client.mouseCrossState = 0; // L: 8406 + Client.destinationX = var0; // L: 8407 + Client.destinationY = var1; // L: 8408 + var8 = class4.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); // L: 8410 + var8.packetBuffer.method5673(var0 + FloorDecoration.baseX); // L: 8411 + var8.packetBuffer.method5674(var3); // L: 8412 + var8.packetBuffer.writeShort(WorldMapData_0.baseY + var1); // L: 8413 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8414 + Client.packetWriter.addNode(var8); // L: 8415 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 8179 + Client.mouseCrossY = var7; // L: 8180 + Client.mouseCrossColor = 2; // L: 8181 + Client.mouseCrossState = 0; // L: 8182 + Client.destinationX = var0; // L: 8183 + Client.destinationY = var1; // L: 8184 + var8 = class4.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); // L: 8186 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8187 + var8.packetBuffer.writeShortLE(var0 + FloorDecoration.baseX); // L: 8188 + var8.packetBuffer.method5674(var3); // L: 8189 + var8.packetBuffer.writeShort(WorldMapData_0.baseY + var1); // L: 8190 + Client.packetWriter.addNode(var8); // L: 8191 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 8197 + Client.mouseCrossY = var7; // L: 8198 + Client.mouseCrossColor = 2; // L: 8199 + Client.mouseCrossState = 0; // L: 8200 + Client.destinationX = var0; // L: 8201 + Client.destinationY = var1; // L: 8202 + var8 = class4.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher); // L: 8204 + var8.packetBuffer.method5674(var0 + FloorDecoration.baseX); // L: 8205 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8206 + var8.packetBuffer.writeShort(WorldMapData_0.baseY + var1); // L: 8207 + var8.packetBuffer.method5674(var3); // L: 8208 + Client.packetWriter.addNode(var8); // L: 8209 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8122 + Client.mouseCrossY = var7; // L: 8123 + Client.mouseCrossColor = 2; // L: 8124 + Client.mouseCrossState = 0; // L: 8125 + Client.destinationX = var0; // L: 8126 + Client.destinationY = var1; // L: 8127 + var8 = class4.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); // L: 8129 + var8.packetBuffer.method5674(WorldMapData_0.baseY + var1); // L: 8130 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8131 + var8.packetBuffer.method5674(var3); // L: 8132 + var8.packetBuffer.method5674(var0 + FloorDecoration.baseX); // L: 8133 + Client.packetWriter.addNode(var8); // L: 8134 + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 8073 + if (var13 != null) { // L: 8074 + Client.mouseCrossX = var6; // L: 8075 + Client.mouseCrossY = var7; // L: 8076 + Client.mouseCrossColor = 2; // L: 8077 + Client.mouseCrossState = 0; // L: 8078 + Client.destinationX = var0; // L: 8079 + Client.destinationY = var1; // L: 8080 + var9 = class4.getPacketBufferNode(ClientPacket.field2332, Client.packetWriter.isaacCipher); // L: 8082 + var9.packetBuffer.writeInt(SpotAnimationDefinition.selectedItemWidget); // L: 8083 + var9.packetBuffer.writeShort(var3); // L: 8084 + var9.packetBuffer.writeShortLE(InvDefinition.selectedItemSlot); // L: 8085 + var9.packetBuffer.writeShort(Entity.selectedItemId); // L: 8086 + var9.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8087 + Client.packetWriter.addNode(var9); // L: 8088 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 8591 + if (var13 != null) { // L: 8592 + Client.mouseCrossX = var6; // L: 8593 + Client.mouseCrossY = var7; // L: 8594 + Client.mouseCrossColor = 2; // L: 8595 + Client.mouseCrossState = 0; // L: 8596 + Client.destinationX = var0; // L: 8597 + Client.destinationY = var1; // L: 8598 + var9 = class4.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); // L: 8600 + var9.packetBuffer.method5673(Client.selectedSpellChildIndex); // L: 8601 + var9.packetBuffer.writeShortLE(var3); // L: 8602 + var9.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8603 + var9.packetBuffer.method5684(class307.selectedSpellWidget); // L: 8604 + Client.packetWriter.addNode(var9); // L: 8605 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 8500 + if (var13 != null) { // L: 8501 + Client.mouseCrossX = var6; // L: 8502 + Client.mouseCrossY = var7; // L: 8503 + Client.mouseCrossColor = 2; // L: 8504 + Client.mouseCrossState = 0; // L: 8505 + Client.destinationX = var0; // L: 8506 + Client.destinationY = var1; // L: 8507 + var9 = class4.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); // L: 8509 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8510 + var9.packetBuffer.method5674(var3); // L: 8511 + Client.packetWriter.addNode(var9); // L: 8512 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 8376 + if (var13 != null) { // L: 8377 + Client.mouseCrossX = var6; // L: 8378 + Client.mouseCrossY = var7; // L: 8379 + Client.mouseCrossColor = 2; // L: 8380 + Client.mouseCrossState = 0; // L: 8381 + Client.destinationX = var0; // L: 8382 + Client.destinationY = var1; // L: 8383 + var9 = class4.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); // L: 8385 + var9.packetBuffer.writeShortLE(var3); // L: 8386 + var9.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8387 + Client.packetWriter.addNode(var9); // L: 8388 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 8624 + if (var13 != null) { // L: 8625 + Client.mouseCrossX = var6; // L: 8626 + Client.mouseCrossY = var7; // L: 8627 + Client.mouseCrossColor = 2; // L: 8628 + Client.mouseCrossState = 0; // L: 8629 + Client.destinationX = var0; // L: 8630 + Client.destinationY = var1; // L: 8631 + var9 = class4.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); // L: 8633 + var9.packetBuffer.writeShort(var3); // L: 8634 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8635 + Client.packetWriter.addNode(var9); // L: 8636 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8663 + if (var13 != null) { // L: 8664 + Client.mouseCrossX = var6; // L: 8665 + Client.mouseCrossY = var7; // L: 8666 + Client.mouseCrossColor = 2; // L: 8667 + Client.mouseCrossState = 0; // L: 8668 + Client.destinationX = var0; // L: 8669 + Client.destinationY = var1; // L: 8670 + var9 = class4.getPacketBufferNode(ClientPacket.field2311, Client.packetWriter.isaacCipher); // L: 8672 + var9.packetBuffer.writeShortLE(var3); // L: 8673 + var9.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8674 + Client.packetWriter.addNode(var9); // L: 8675 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 8695 + if (var13 != null) { // L: 8696 + Client.mouseCrossX = var6; // L: 8697 + Client.mouseCrossY = var7; // L: 8698 + Client.mouseCrossColor = 2; // L: 8699 + Client.mouseCrossState = 0; // L: 8700 + Client.destinationX = var0; // L: 8701 + Client.destinationY = var1; // L: 8702 + var9 = class4.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); // L: 8704 + var9.packetBuffer.method5673(var3); // L: 8705 + var9.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8706 + Client.packetWriter.addNode(var9); // L: 8707 + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 8092 + if (var15 != null) { // L: 8093 + Client.mouseCrossX = var6; // L: 8094 + Client.mouseCrossY = var7; // L: 8095 + Client.mouseCrossColor = 2; // L: 8096 + Client.mouseCrossState = 0; // L: 8097 + Client.destinationX = var0; // L: 8098 + Client.destinationY = var1; // L: 8099 + var9 = class4.getPacketBufferNode(ClientPacket.field2328, Client.packetWriter.isaacCipher); // L: 8101 + var9.packetBuffer.writeShort(var3); // L: 8102 + var9.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8103 + var9.packetBuffer.method5674(InvDefinition.selectedItemSlot); // L: 8104 + var9.packetBuffer.writeInt(SpotAnimationDefinition.selectedItemWidget); // L: 8105 + var9.packetBuffer.method5674(Entity.selectedItemId); // L: 8106 + Client.packetWriter.addNode(var9); // L: 8107 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 8452 + if (var15 != null) { // L: 8453 + Client.mouseCrossX = var6; // L: 8454 + Client.mouseCrossY = var7; // L: 8455 + Client.mouseCrossColor = 2; // L: 8456 + Client.mouseCrossState = 0; // L: 8457 + Client.destinationX = var0; // L: 8458 + Client.destinationY = var1; // L: 8459 + var9 = class4.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); // L: 8461 + var9.packetBuffer.method5682(class307.selectedSpellWidget); // L: 8462 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8463 + var9.packetBuffer.writeShortLE(var3); // L: 8464 + var9.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8465 + Client.packetWriter.addNode(var9); // L: 8466 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 8031 + Client.mouseCrossY = var7; // L: 8032 + Client.mouseCrossColor = 2; // L: 8033 + Client.mouseCrossState = 0; // L: 8034 + Client.destinationX = var0; // L: 8035 + Client.destinationY = var1; // L: 8036 + var8 = class4.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher); // L: 8038 + var8.packetBuffer.writeShortLE(var3); // L: 8039 + var8.packetBuffer.method5673(InvDefinition.selectedItemSlot); // L: 8040 + var8.packetBuffer.writeInt(SpotAnimationDefinition.selectedItemWidget); // L: 8041 + var8.packetBuffer.writeShortLE(WorldMapData_0.baseY + var1); // L: 8042 + var8.packetBuffer.method5674(Entity.selectedItemId); // L: 8043 + var8.packetBuffer.method5673(var0 + FloorDecoration.baseX); // L: 8044 + var8.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8045 + Client.packetWriter.addNode(var8); // L: 8046 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 8014 + Client.mouseCrossY = var7; // L: 8015 + Client.mouseCrossColor = 2; // L: 8016 + Client.mouseCrossState = 0; // L: 8017 + Client.destinationX = var0; // L: 8018 + Client.destinationY = var1; // L: 8019 + var8 = class4.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); // L: 8021 + var8.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8022 + var8.packetBuffer.writeShortLE(var3); // L: 8023 + var8.packetBuffer.method5673(WorldMapData_0.baseY + var1); // L: 8024 + var8.packetBuffer.method5673(Client.selectedSpellChildIndex); // L: 8025 + var8.packetBuffer.method5683(class307.selectedSpellWidget); // L: 8026 + var8.packetBuffer.writeShortLE(var0 + FloorDecoration.baseX); // L: 8027 + Client.packetWriter.addNode(var8); // L: 8028 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 8335 + Client.mouseCrossY = var7; // L: 8336 + Client.mouseCrossColor = 2; // L: 8337 + Client.mouseCrossState = 0; // L: 8338 + Client.destinationX = var0; // L: 8339 + Client.destinationY = var1; // L: 8340 + var8 = class4.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); // L: 8342 + var8.packetBuffer.writeShort(WorldMapData_0.baseY + var1); // L: 8343 + var8.packetBuffer.writeShort(var0 + FloorDecoration.baseX); // L: 8344 + var8.packetBuffer.method5673(var3); // L: 8345 + var8.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8346 + Client.packetWriter.addNode(var8); // L: 8347 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 8609 + Client.mouseCrossY = var7; // L: 8610 + Client.mouseCrossColor = 2; // L: 8611 + Client.mouseCrossState = 0; // L: 8612 + Client.destinationX = var0; // L: 8613 + Client.destinationY = var1; // L: 8614 + var8 = class4.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); // L: 8616 + var8.packetBuffer.method5674(var0 + FloorDecoration.baseX); // L: 8617 + var8.packetBuffer.method5674(var3); // L: 8618 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8619 + var8.packetBuffer.method5674(WorldMapData_0.baseY + var1); // L: 8620 + Client.packetWriter.addNode(var8); // L: 8621 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8485 + Client.mouseCrossY = var7; // L: 8486 + Client.mouseCrossColor = 2; // L: 8487 + Client.mouseCrossState = 0; // L: 8488 + Client.destinationX = var0; // L: 8489 + Client.destinationY = var1; // L: 8490 + var8 = class4.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); // L: 8492 + var8.packetBuffer.method5673(var3); // L: 8493 + var8.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8494 + var8.packetBuffer.method5674(var0 + FloorDecoration.baseX); // L: 8495 + var8.packetBuffer.method5673(WorldMapData_0.baseY + var1); // L: 8496 + Client.packetWriter.addNode(var8); // L: 8497 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 8546 + Client.mouseCrossY = var7; // L: 8547 + Client.mouseCrossColor = 2; // L: 8548 + Client.mouseCrossState = 0; // L: 8549 + Client.destinationX = var0; // L: 8550 + Client.destinationY = var1; // L: 8551 + var8 = class4.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); // L: 8553 + var8.packetBuffer.writeShortLE(var3); // L: 8554 + var8.packetBuffer.method5665(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8555 + var8.packetBuffer.writeShortLE(var0 + FloorDecoration.baseX); // L: 8556 + var8.packetBuffer.writeShort(WorldMapData_0.baseY + var1); // L: 8557 + Client.packetWriter.addNode(var8); // L: 8558 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8470 + Client.mouseCrossY = var7; // L: 8471 + Client.mouseCrossColor = 2; // L: 8472 + Client.mouseCrossState = 0; // L: 8473 + Client.destinationX = var0; // L: 8474 + Client.destinationY = var1; // L: 8475 + var8 = class4.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8477 + var8.packetBuffer.method5673(var0 + FloorDecoration.baseX); // L: 8478 + var8.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8479 + var8.packetBuffer.method5673(var3); // L: 8480 + var8.packetBuffer.writeShortLE(WorldMapData_0.baseY + var1); // L: 8481 + Client.packetWriter.addNode(var8); // L: 8482 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8583 + ModeWhere.scene.setViewportWalking(); // L: 8584 + } else { + ModeWhere.scene.menuOpen(GrandExchangeOfferUnitPriceComparator.Client_plane, var0, var1, true); // L: 8587 + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = UserComparator4.getWidget(var1); // L: 8365 + boolean var12 = true; // L: 8366 + if (var16.contentType > 0) { // L: 8367 + var12 = Varcs.method2313(var16); + } + + if (var12) { // L: 8368 + var10 = class4.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8370 + var10.packetBuffer.writeInt(var1); // L: 8371 + Client.packetWriter.addNode(var10); // L: 8372 + } + } else { + if (var2 == 25) { + var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8728 + if (var16 != null) { // L: 8729 + class69.Widget_runOnTargetLeave(); // L: 8730 + class3.selectSpell(var1, var0, JagexCache.Widget_unpackTargetMask(WorldMapData_0.getWidgetFlags(var16)), var16.itemId); // L: 8731 + Client.isItemSelected = 0; // L: 8732 + Client.selectedSpellActionName = PendingSpawn.Widget_getSpellActionName(var16); // L: 8733 + if (Client.selectedSpellActionName == null) { // L: 8734 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 8735 + Client.selectedSpellName = var16.dataText + Client.colorStartTag(16777215); + } else { + Client.selectedSpellName = Client.colorStartTag(65280) + var16.spellName + Client.colorStartTag(16777215); // L: 8736 + } + } + + return; // L: 8738 + } + + if (var2 == 26) { + ModeWhere.method3815(); // L: 8532 + } else { + int var11; + Widget var14; + if (var2 == 28) { + var8 = class4.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8254 + var8.packetBuffer.writeInt(var1); // L: 8255 + Client.packetWriter.addNode(var8); // L: 8256 + var14 = UserComparator4.getWidget(var1); // L: 8257 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8258 + var11 = var14.cs1Instructions[0][1]; // L: 8259 + Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11]; // L: 8260 + class23.changeGameOptions(var11); // L: 8261 + } + } else if (var2 == 29) { + var8 = class4.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8419 + var8.packetBuffer.writeInt(var1); // L: 8420 + Client.packetWriter.addNode(var8); // L: 8421 + var14 = UserComparator4.getWidget(var1); // L: 8422 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8423 + var11 = var14.cs1Instructions[0][1]; // L: 8424 + if (Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) { // L: 8425 + Varps.Varps_main[var11] = var14.cs1ComparisonValues[0]; // L: 8426 + class23.changeGameOptions(var11); // L: 8427 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 8656 + class171.resumePauseWidget(var1, var0); // L: 8657 + Client.meslayerContinueWidget = ItemContainer.getWidgetChild(var1, var0); // L: 8658 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 8659 + } + } else if (var2 == 31) { + var8 = class4.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); // L: 8224 + var8.packetBuffer.writeShortLE(Entity.selectedItemId); // L: 8225 + var8.packetBuffer.writeShort(var3); // L: 8226 + var8.packetBuffer.method5674(InvDefinition.selectedItemSlot); // L: 8227 + var8.packetBuffer.method5683(var1); // L: 8228 + var8.packetBuffer.writeInt(SpotAnimationDefinition.selectedItemWidget); // L: 8229 + var8.packetBuffer.method5673(var0); // L: 8230 + Client.packetWriter.addNode(var8); // L: 8231 + Client.field828 = 0; // L: 8232 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8233 + Client.field788 = var0; // L: 8234 + } else if (var2 == 32) { + var8 = class4.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); // L: 8050 + var8.packetBuffer.method5684(class307.selectedSpellWidget); // L: 8051 + var8.packetBuffer.method5674(var0); // L: 8052 + var8.packetBuffer.method5683(var1); // L: 8053 + var8.packetBuffer.writeShort(var3); // L: 8054 + var8.packetBuffer.method5674(Client.selectedSpellChildIndex); // L: 8055 + Client.packetWriter.addNode(var8); // L: 8056 + Client.field828 = 0; // L: 8057 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8058 + Client.field788 = var0; // L: 8059 + } else if (var2 == 33) { + var8 = class4.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 7993 + var8.packetBuffer.method5673(var0); // L: 7994 + var8.packetBuffer.writeInt(var1); // L: 7995 + var8.packetBuffer.method5674(var3); // L: 7996 + Client.packetWriter.addNode(var8); // L: 7997 + Client.field828 = 0; // L: 7998 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 7999 + Client.field788 = var0; // L: 8000 + } else if (var2 == 34) { + var8 = class4.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); // L: 8063 + var8.packetBuffer.writeShort(var3); // L: 8064 + var8.packetBuffer.method5684(var1); // L: 8065 + var8.packetBuffer.writeShortLE(var0); // L: 8066 + Client.packetWriter.addNode(var8); // L: 8067 + Client.field828 = 0; // L: 8068 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8069 + Client.field788 = var0; // L: 8070 + } else if (var2 == 35) { + var8 = class4.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); // L: 8298 + var8.packetBuffer.writeInt(var1); // L: 8299 + var8.packetBuffer.writeShortLE(var3); // L: 8300 + var8.packetBuffer.method5673(var0); // L: 8301 + Client.packetWriter.addNode(var8); // L: 8302 + Client.field828 = 0; // L: 8303 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8304 + Client.field788 = var0; // L: 8305 + } else if (var2 == 36) { + var8 = class4.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); // L: 8112 + var8.packetBuffer.method5673(var0); // L: 8113 + var8.packetBuffer.method5673(var3); // L: 8114 + var8.packetBuffer.method5682(var1); // L: 8115 + Client.packetWriter.addNode(var8); // L: 8116 + Client.field828 = 0; // L: 8117 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8118 + Client.field788 = var0; // L: 8119 + } else if (var2 == 37) { + var8 = class4.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); // L: 8004 + var8.packetBuffer.method5674(var0); // L: 8005 + var8.packetBuffer.method5682(var1); // L: 8006 + var8.packetBuffer.writeShortLE(var3); // L: 8007 + Client.packetWriter.addNode(var8); // L: 8008 + Client.field828 = 0; // L: 8009 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8010 + Client.field788 = var0; // L: 8011 + } else { + if (var2 == 38) { + class69.Widget_runOnTargetLeave(); // L: 8167 + var16 = UserComparator4.getWidget(var1); // L: 8168 + Client.isItemSelected = 1; // L: 8169 + InvDefinition.selectedItemSlot = var0; // L: 8170 + SpotAnimationDefinition.selectedItemWidget = var1; // L: 8171 + Entity.selectedItemId = var3; // L: 8172 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var16); // L: 8173 + Client.selectedItemName = Client.colorStartTag(16748608) + AbstractWorldMapData.ItemDefinition_get(var3).name + Client.colorStartTag(16777215); // L: 8174 + if (Client.selectedItemName == null) { // L: 8175 + Client.selectedItemName = "null"; + } + + return; // L: 8176 + } + + if (var2 == 39) { + var8 = class4.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); // L: 7950 + var8.packetBuffer.method5674(var3); // L: 7951 + var8.packetBuffer.method5674(var0); // L: 7952 + var8.packetBuffer.writeInt(var1); // L: 7953 + Client.packetWriter.addNode(var8); // L: 7954 + Client.field828 = 0; // L: 7955 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 7956 + Client.field788 = var0; // L: 7957 + } else if (var2 == 40) { + var8 = class4.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); // L: 8213 + var8.packetBuffer.method5684(var1); // L: 8214 + var8.packetBuffer.method5673(var0); // L: 8215 + var8.packetBuffer.writeShortLE(var3); // L: 8216 + Client.packetWriter.addNode(var8); // L: 8217 + Client.field828 = 0; // L: 8218 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8219 + Client.field788 = var0; // L: 8220 + } else if (var2 == 41) { + var8 = class4.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); // L: 8325 + var8.packetBuffer.writeShortLE(var3); // L: 8326 + var8.packetBuffer.writeShortLE(var0); // L: 8327 + var8.packetBuffer.method5683(var1); // L: 8328 + Client.packetWriter.addNode(var8); // L: 8329 + Client.field828 = 0; // L: 8330 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8331 + Client.field788 = var0; // L: 8332 + } else if (var2 == 42) { + var8 = class4.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8536 + var8.packetBuffer.writeShort(var3); // L: 8537 + var8.packetBuffer.method5674(var0); // L: 8538 + var8.packetBuffer.method5683(var1); // L: 8539 + Client.packetWriter.addNode(var8); // L: 8540 + Client.field828 = 0; // L: 8541 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8542 + Client.field788 = var0; // L: 8543 + } else if (var2 == 43) { + var8 = class4.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); // L: 8393 + var8.packetBuffer.method5674(var3); // L: 8394 + var8.packetBuffer.writeInt(var1); // L: 8395 + var8.packetBuffer.method5673(var0); // L: 8396 + Client.packetWriter.addNode(var8); // L: 8397 + Client.field828 = 0; // L: 8398 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8399 + Client.field788 = var0; // L: 8400 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 8265 + if (var15 != null) { // L: 8266 + Client.mouseCrossX = var6; // L: 8267 + Client.mouseCrossY = var7; // L: 8268 + Client.mouseCrossColor = 2; // L: 8269 + Client.mouseCrossState = 0; // L: 8270 + Client.destinationX = var0; // L: 8271 + Client.destinationY = var1; // L: 8272 + var9 = class4.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); // L: 8274 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8275 + var9.packetBuffer.method5673(var3); // L: 8276 + Client.packetWriter.addNode(var9); // L: 8277 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8516 + if (var15 != null) { // L: 8517 + Client.mouseCrossX = var6; // L: 8518 + Client.mouseCrossY = var7; // L: 8519 + Client.mouseCrossColor = 2; // L: 8520 + Client.mouseCrossState = 0; // L: 8521 + Client.destinationX = var0; // L: 8522 + Client.destinationY = var1; // L: 8523 + var9 = class4.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); // L: 8525 + var9.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8526 + var9.packetBuffer.method5674(var3); // L: 8527 + Client.packetWriter.addNode(var9); // L: 8528 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 8640 + if (var15 != null) { // L: 8641 + Client.mouseCrossX = var6; // L: 8642 + Client.mouseCrossY = var7; // L: 8643 + Client.mouseCrossColor = 2; // L: 8644 + Client.mouseCrossState = 0; // L: 8645 + Client.destinationX = var0; // L: 8646 + Client.destinationY = var1; // L: 8647 + var9 = class4.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); // L: 8649 + var9.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8650 + var9.packetBuffer.method5673(var3); // L: 8651 + Client.packetWriter.addNode(var9); // L: 8652 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 8679 + if (var15 != null) { // L: 8680 + Client.mouseCrossX = var6; // L: 8681 + Client.mouseCrossY = var7; // L: 8682 + Client.mouseCrossColor = 2; // L: 8683 + Client.mouseCrossState = 0; // L: 8684 + Client.destinationX = var0; // L: 8685 + Client.destinationY = var1; // L: 8686 + var9 = class4.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); // L: 8688 + var9.packetBuffer.writeShort(var3); // L: 8689 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8690 + Client.packetWriter.addNode(var9); // L: 8691 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 8308 + if (var15 != null) { // L: 8309 + Client.mouseCrossX = var6; // L: 8310 + Client.mouseCrossY = var7; // L: 8311 + Client.mouseCrossColor = 2; // L: 8312 + Client.mouseCrossState = 0; // L: 8313 + Client.destinationX = var0; // L: 8314 + Client.destinationY = var1; // L: 8315 + var9 = class4.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); // L: 8317 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8318 + var9.packetBuffer.writeShortLE(var3); // L: 8319 + Client.packetWriter.addNode(var9); // L: 8320 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 8561 + if (var15 != null) { // L: 8562 + Client.mouseCrossX = var6; // L: 8563 + Client.mouseCrossY = var7; // L: 8564 + Client.mouseCrossColor = 2; // L: 8565 + Client.mouseCrossState = 0; // L: 8566 + Client.destinationX = var0; // L: 8567 + Client.destinationY = var1; // L: 8568 + var9 = class4.getPacketBufferNode(ClientPacket.field2323, Client.packetWriter.isaacCipher); // L: 8570 + var9.packetBuffer.writeShort(var3); // L: 8571 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8572 + Client.packetWriter.addNode(var9); // L: 8573 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 8237 + if (var15 != null) { // L: 8238 + Client.mouseCrossX = var6; // L: 8239 + Client.mouseCrossY = var7; // L: 8240 + Client.mouseCrossColor = 2; // L: 8241 + Client.mouseCrossState = 0; // L: 8242 + Client.destinationX = var0; // L: 8243 + Client.destinationY = var1; // L: 8244 + var9 = class4.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 8246 + var9.packetBuffer.method5674(var3); // L: 8247 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8248 + Client.packetWriter.addNode(var9); // L: 8249 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 8281 + if (var15 != null) { // L: 8282 + Client.mouseCrossX = var6; // L: 8283 + Client.mouseCrossY = var7; // L: 8284 + Client.mouseCrossColor = 2; // L: 8285 + Client.mouseCrossState = 0; // L: 8286 + Client.destinationX = var0; // L: 8287 + Client.destinationY = var1; // L: 8288 + var9 = class4.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); // L: 8290 + var9.packetBuffer.method5673(var3); // L: 8291 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8292 + Client.packetWriter.addNode(var9); // L: 8293 + } + } else { + label638: { + if (var2 != 57) { + if (var2 == 58) { + var16 = ItemContainer.getWidgetChild(var1, var0); // L: 7960 + if (var16 != null) { // L: 7961 + var9 = class4.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); // L: 7963 + var9.packetBuffer.method5673(var0); // L: 7964 + var9.packetBuffer.writeShortLE(Client.field838); // L: 7965 + var9.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); // L: 7966 + var9.packetBuffer.writeInt(var1); // L: 7967 + var9.packetBuffer.method5684(class307.selectedSpellWidget); // L: 7968 + var9.packetBuffer.writeShort(var16.itemId); // L: 7969 + Client.packetWriter.addNode(var9); // L: 7970 + } + break label638; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 8350 + Client.mouseCrossY = var7; // L: 8351 + Client.mouseCrossColor = 2; // L: 8352 + Client.mouseCrossState = 0; // L: 8353 + Client.destinationX = var0; // L: 8354 + Client.destinationY = var1; // L: 8355 + var8 = class4.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); // L: 8357 + var8.packetBuffer.method5664(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8358 + var8.packetBuffer.method5674(var3); // L: 8359 + var8.packetBuffer.method5674(WorldMapData_0.baseY + var1); // L: 8360 + var8.packetBuffer.writeShortLE(var0 + FloorDecoration.baseX); // L: 8361 + Client.packetWriter.addNode(var8); // L: 8362 + break label638; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 8432 + Client.mouseCrossY = var7; // L: 8433 + Client.mouseCrossColor = 2; // L: 8434 + Client.mouseCrossState = 0; // L: 8435 + var8 = class4.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); // L: 8437 + var8.packetBuffer.writeShort(var3); // L: 8438 + Client.packetWriter.addNode(var8); // L: 8439 + break label638; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 8150 + Client.mouseCrossY = var7; // L: 8151 + Client.mouseCrossColor = 2; // L: 8152 + Client.mouseCrossState = 0; // L: 8153 + var13 = Client.npcs[var3]; // L: 8154 + if (var13 != null) { // L: 8155 + NPCDefinition var17 = var13.definition; // L: 8156 + if (var17.transforms != null) { // L: 8157 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 8158 + var10 = class4.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); // L: 8160 + var10.packetBuffer.writeShortLE(var17.id); // L: 8161 + Client.packetWriter.addNode(var10); // L: 8162 + } + } + break label638; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 8442 + Client.mouseCrossY = var7; // L: 8443 + Client.mouseCrossColor = 2; // L: 8444 + Client.mouseCrossState = 0; // L: 8445 + var8 = class4.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); // L: 8447 + var8.packetBuffer.writeShortLE(var3); // L: 8448 + Client.packetWriter.addNode(var8); // L: 8449 + break label638; + } + + if (var2 == 1005) { + var16 = UserComparator4.getWidget(var1); // L: 8137 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8138 + DevicePcmPlayerProvider.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + AbstractWorldMapData.ItemDefinition_get(var3).name); + } else { + var9 = class4.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); // L: 8141 + var9.packetBuffer.writeShortLE(var3); // L: 8142 + Client.packetWriter.addNode(var9); // L: 8143 + } + + Client.field828 = 0; // L: 8145 + MouseHandler.field525 = UserComparator4.getWidget(var1); // L: 8146 + Client.field788 = var0; // L: 8147 + break label638; + } + + if (var2 != 1007) { + if (var2 == 1008 || var2 == 1011 || var2 == 1009 || var2 == 1010 || var2 == 1012) { + KeyHandler.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8194 + } + break label638; + } + } + + var16 = ItemContainer.getWidgetChild(var1, var0); // L: 8577 + if (var16 != null) { // L: 8578 + Messages.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8579 + } + } + } + } + } + } + } + } + } + + if (Client.isItemSelected != 0) { // L: 8740 + Client.isItemSelected = 0; // L: 8741 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(UserComparator4.getWidget(SpotAnimationDefinition.selectedItemWidget)); // L: 8742 + } + + if (Client.isSpellSelected) { // L: 8744 + class69.Widget_runOnTargetLeave(); + } + + if (MouseHandler.field525 != null && Client.field828 == 0) { // L: 8745 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(MouseHandler.field525); + } + + } // L: 8746 } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 9bcc69e567..8d60eb7c0a 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,16 +1,21 @@ import java.awt.Component; import java.awt.Graphics; +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.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("bj") +@Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget field438; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("component") Component component; Canvas(Component var1) { @@ -25,105 +30,870 @@ public final class Canvas extends java.awt.Canvas { this.component.update(var1); // L: 15 } // L: 16 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-36" + descriptor = "(Liw;IIIZB)V", + garbageValue = "-116" ) - public static int method905(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 35 - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 36 - var0 = var0 + (var0 >>> 4) & 252645135; // L: 37 - var0 += var0 >>> 8; // L: 38 - var0 += var0 >>> 16; // L: 39 - return var0 & 255; // L: 40 + public static void method952(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class206.musicPlayerStatus = 1; // L: 34 + class23.musicTrackArchive = var0; // L: 35 + TileItem.musicTrackGroupId = var1; // L: 36 + class206.musicTrackFileId = var2; // L: 37 + class206.musicTrackVolume = var3; // L: 38 + class195.musicTrackBoolean = var4; // L: 39 + MusicPatch.pcmSampleLength = 10000; // L: 40 + } // L: 41 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Liw;Ljava/lang/String;Ljava/lang/String;I)Lle;", + garbageValue = "1492245151" + ) + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 154 + int var4 = var0.getFileId(var3, var2); // L: 155 + return Skeleton.method3215(var0, var3, var4); // L: 156 } - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1073407655" + descriptor = "(Lba;I)V", + garbageValue = "-860651108" ) - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 - } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { // L: 88 - for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 - if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { // L: 90 - ByteArrayPool.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 - return; // L: 92 + @Export("doCycleTitle") + static void doCycleTitle(GameShell var0) { + int var2; + int var3; + int var24; + if (Login.worldSelectOpen) { // L: 224 + while (true) { + if (!Clock.isKeyDown()) { // L: 226 + if (MouseHandler.MouseHandler_lastButton != 1 && (MusicPatchNode.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { // L: 247 + break; } + + int var1 = Login.xPadding + 280; // L: 248 + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 249 + FriendSystem.changeWorldSelectSorting(0, 0); // L: 250 + break; // L: 251 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 253 + FriendSystem.changeWorldSelectSorting(0, 1); // L: 254 + break; // L: 255 + } + + var2 = Login.xPadding + 390; // L: 257 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 258 + FriendSystem.changeWorldSelectSorting(1, 0); // L: 259 + break; // L: 260 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 262 + FriendSystem.changeWorldSelectSorting(1, 1); // L: 263 + break; // L: 264 + } + + var3 = Login.xPadding + 500; // L: 266 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 267 + FriendSystem.changeWorldSelectSorting(2, 0); // L: 268 + break; // L: 269 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 271 + FriendSystem.changeWorldSelectSorting(2, 1); // L: 272 + break; // L: 273 + } + + var24 = Login.xPadding + 610; // L: 275 + if (MouseHandler.MouseHandler_lastPressedX >= var24 && MouseHandler.MouseHandler_lastPressedX <= var24 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 276 + FriendSystem.changeWorldSelectSorting(3, 0); // L: 277 + break; // L: 278 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var24 + 15 && MouseHandler.MouseHandler_lastPressedX <= var24 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 280 + FriendSystem.changeWorldSelectSorting(3, 1); // L: 281 + break; // L: 282 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 284 + Login.worldSelectOpen = false; // L: 286 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 287 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 288 + SecureRandomFuture.logoSprite.drawAt(Login.xPadding + 382 - SecureRandomFuture.logoSprite.subWidth / 2, 18); // L: 289 + break; // L: 291 + } + + if (Login.hoveredWorldIndex != -1) { // L: 293 + World var5 = DefaultsGroup.World_worlds[Login.hoveredWorldIndex]; // L: 294 + AbstractByteArrayCopier.changeWorld(var5); // L: 295 + Login.worldSelectOpen = false; // L: 297 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 298 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 299 + SecureRandomFuture.logoSprite.drawAt(Login.xPadding + 382 - SecureRandomFuture.logoSprite.subWidth / 2, 18); // L: 300 + } else { + if (Login.worldSelectPage > 0 && class323.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class323.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= HealthBar.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= HealthBar.canvasHeight / 2 + 50) { // L: 304 + --Login.worldSelectPage; // L: 305 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && class280.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= ItemContainer.canvasWidth - class280.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= ItemContainer.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= HealthBar.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= HealthBar.canvasHeight / 2 + 50) { // L: 307 + ++Login.worldSelectPage; // L: 308 + } + } + break; + } + + if (SecureRandomCallable.field555 == 13) { // L: 227 + Login.worldSelectOpen = false; // L: 229 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 230 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 231 + SecureRandomFuture.logoSprite.drawAt(Login.xPadding + 382 - SecureRandomFuture.logoSprite.subWidth / 2, 18); // L: 232 + break; // L: 234 + } + + if (SecureRandomCallable.field555 == 96) { // L: 236 + if (Login.worldSelectPage > 0 && class323.worldSelectLeftSprite != null) { // L: 237 + --Login.worldSelectPage; // L: 238 + } + } else if (SecureRandomCallable.field555 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class280.worldSelectRightSprite != null) { // L: 241 242 + ++Login.worldSelectPage; // L: 243 } } - } - } // L: 78 82 86 96 + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !MusicPatchNode.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 314 + GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled = !GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled; // L: 315 + Tile.savePreferences(); // L: 316 + if (!GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled) { // L: 317 + Archive var15 = ApproximateRouteStrategy.archive6; // L: 318 + var2 = var15.getGroupId("scape main"); // L: 320 + var3 = var15.getFileId(var2, ""); // L: 321 + method952(var15, var2, var3, 255, false); // L: 322 + } else { + class13.midiPcmStream.clear(); // L: 326 + class206.musicPlayerStatus = 1; // L: 327 + class23.musicTrackArchive = null; // L: 328 + } + } - @ObfuscatedName("n") + if (Client.gameState != 5) { // L: 331 + if (-1L == Login.field1223) { // L: 332 + Login.field1223 = User.currentTimeMillis() + 1000L; // L: 333 + } + + long var16 = User.currentTimeMillis(); // L: 335 + if (class52.method897() && -1L == Login.field1241) { // L: 336 337 + Login.field1241 = var16; // L: 338 + if (Login.field1241 > Login.field1223) { // L: 339 + Login.field1223 = Login.field1241; // L: 340 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 344 + if (FontName.clientLanguage == Language.Language_EN) { // L: 345 + if (MouseHandler.MouseHandler_lastButton == 1 || !MusicPatchNode.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 346 + var3 = Login.xPadding + 5; // L: 347 + short var4 = 463; // L: 348 + byte var18 = 100; // L: 349 + byte var6 = 35; // L: 350 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var18 + var3 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) { // L: 351 + if (WallDecoration.loadWorlds()) { // L: 353 + Login.worldSelectOpen = true; // L: 354 + Login.worldSelectPage = 0; // L: 355 + Login.worldSelectPagesCount = 0; // L: 356 + } + + return; // L: 359 + } + } + + if (class248.World_request != null && WallDecoration.loadWorlds()) { // L: 362 363 + Login.worldSelectOpen = true; // L: 364 + Login.worldSelectPage = 0; // L: 365 + Login.worldSelectPagesCount = 0; // L: 366 + } + } + + var3 = MouseHandler.MouseHandler_lastButton; // L: 370 + var24 = MouseHandler.MouseHandler_lastPressedX; // L: 371 + int var30 = MouseHandler.MouseHandler_lastPressedY; // L: 372 + if (var3 == 0) { // L: 373 + var24 = MouseHandler.MouseHandler_x; // L: 374 + var30 = MouseHandler.MouseHandler_y; // L: 375 + } + + if (!MusicPatchNode.mouseCam && var3 == 4) { // L: 377 + var3 = 1; + } + + short var27; + int var28; + if (Login.loginIndex == 0) { // L: 378 + boolean var29 = false; // L: 379 + + while (Clock.isKeyDown()) { // L: 380 + if (SecureRandomCallable.field555 == 84) { // L: 381 + var29 = true; // L: 382 + } + } + + var28 = AttackOption.loginBoxCenter - 80; // L: 385 + var27 = 291; // L: 386 + if (var3 == 1 && var24 >= var28 - 75 && var24 <= var28 + 75 && var30 >= var27 - 20 && var30 <= var27 + 20) { // L: 387 + Skeleton.openURL(NPC.method2157("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 388 + } + + var28 = AttackOption.loginBoxCenter + 80; // L: 390 + if (var3 == 1 && var24 >= var28 - 75 && var24 <= var28 + 75 && var30 >= var27 - 20 && var30 <= var27 + 20 || var29) { // L: 391 + if ((Client.worldProperties & 33554432) != 0) { // L: 392 + Login.Login_response0 = ""; // L: 393 + Login.Login_response1 = "This is a Beta world."; // L: 394 + Login.Login_response2 = "Your normal account will not be affected."; // L: 395 + Login.Login_response3 = ""; // L: 396 + Login.loginIndex = 1; // L: 397 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 399 + Login.currentLoginField = 1; // L: 400 + } else { + Login.currentLoginField = 0; // L: 403 + } + } else if ((Client.worldProperties & 4) != 0) { // L: 407 + if ((Client.worldProperties & 1024) != 0) { // L: 408 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 409 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 410 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 411 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 414 + Login.Login_response2 = "Players can attack each other"; // L: 415 + Login.Login_response3 = "almost everywhere."; // L: 416 + } + + Login.Login_response0 = "Warning!"; // L: 418 + Login.loginIndex = 1; // L: 419 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 421 + Login.currentLoginField = 1; // L: 422 + } else { + Login.currentLoginField = 0; // L: 425 + } + } else if ((Client.worldProperties & 1024) != 0) { // L: 429 + Login.Login_response1 = "This is a High Risk world."; // L: 430 + Login.Login_response2 = "The Protect Item prayer will"; // L: 431 + Login.Login_response3 = "not work on this world."; // L: 432 + Login.Login_response0 = "Warning!"; // L: 433 + Login.loginIndex = 1; // L: 434 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 436 + Login.currentLoginField = 1; // L: 437 + } else { + Login.currentLoginField = 0; // L: 440 + } + } else { + HealthBar.Login_promptCredentials(false); // L: 445 + } + } + } else { + short var7; + int var25; + if (Login.loginIndex == 1) { // L: 449 + while (true) { + if (!Clock.isKeyDown()) { // L: 450 + var25 = AttackOption.loginBoxCenter - 80; // L: 458 + var7 = 321; // L: 459 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 460 + HealthBar.Login_promptCredentials(false); // L: 461 + } + + var25 = AttackOption.loginBoxCenter + 80; // L: 463 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 464 + Login.loginIndex = 0; // L: 465 + } + break; + } + + if (SecureRandomCallable.field555 == 84) { // L: 451 + HealthBar.Login_promptCredentials(false); // L: 452 + } else if (SecureRandomCallable.field555 == 13) { // L: 454 + Login.loginIndex = 0; // L: 455 + } + } + } else { + short var26; + if (Login.loginIndex == 2) { // L: 468 + var26 = 201; // L: 469 + var25 = var26 + 52; // L: 470 + if (var3 == 1 && var30 >= var25 - 12 && var30 < var25 + 2) { // L: 471 + Login.currentLoginField = 0; + } + + var25 += 15; // L: 472 + if (var3 == 1 && var30 >= var25 - 12 && var30 < var25 + 2) { // L: 473 + Login.currentLoginField = 1; + } + + var25 += 15; // L: 474 + var26 = 361; // L: 475 + if (class89.field1163 != null) { // L: 476 + var28 = class89.field1163.highX / 2; // L: 477 + if (var3 == 1 && var24 >= class89.field1163.lowX - var28 && var24 <= var28 + class89.field1163.lowX && var30 >= var26 - 15 && var30 < var26) { // L: 478 + switch(Login.field1217) { // L: 479 + case 1: + GrandExchangeOfferNameComparator.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 482 + Login.loginIndex = 5; // L: 483 + return; // L: 484 + case 2: + Skeleton.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 488 + } + } + } + + var28 = AttackOption.loginBoxCenter - 80; // L: 494 + var27 = 321; // L: 495 + if (var3 == 1 && var24 >= var28 - 75 && var24 <= var28 + 75 && var30 >= var27 - 20 && var30 <= var27 + 20) { // L: 496 + Login.Login_username = Login.Login_username.trim(); // L: 497 + if (Login.Login_username.length() == 0) { // L: 498 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 499 + return; // L: 500 + } + + if (Login.Login_password.length() == 0) { // L: 502 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Please enter your password.", ""); // L: 503 + return; // L: 504 + } + + GrandExchangeOfferNameComparator.setLoginResponseString("", "Connecting to server...", ""); // L: 506 + Message.method1314(false); // L: 507 + BuddyRankComparator.updateGameState(20); // L: 508 + return; // L: 509 + } + + var28 = Login.loginBoxX + 180 + 80; // L: 511 + if (var3 == 1 && var24 >= var28 - 75 && var24 <= var28 + 75 && var30 >= var27 - 20 && var30 <= var27 + 20) { // L: 512 + Login.loginIndex = 0; // L: 513 + Login.Login_username = ""; // L: 514 + Login.Login_password = ""; // L: 515 + class169.field2035 = 0; // L: 516 + EnumDefinition.otp = ""; // L: 517 + Login.field1227 = true; // L: 518 + } + + var28 = AttackOption.loginBoxCenter + -117; // L: 520 + var27 = 277; // L: 521 + Login.field1230 = var24 >= var28 && var24 < var28 + class225.field2576 && var30 >= var27 && var30 < var27 + class232.field2780; // L: 522 + if (var3 == 1 && Login.field1230) { // L: 523 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 524 + if (!Client.Login_isUsernameRemembered && GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername != null) { // L: 525 + GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername = null; // L: 526 + Tile.savePreferences(); // L: 527 + } + } + + var28 = AttackOption.loginBoxCenter + 24; // L: 530 + var27 = 277; // L: 531 + Login.field1229 = var24 >= var28 && var24 < var28 + class225.field2576 && var30 >= var27 && var30 < var27 + class232.field2780; // L: 532 + if (var3 == 1 && Login.field1229) { // L: 533 + GrandExchangeOfferAgeComparator.clientPreferences.hideUsername = !GrandExchangeOfferAgeComparator.clientPreferences.hideUsername; // L: 534 + if (!GrandExchangeOfferAgeComparator.clientPreferences.hideUsername) { // L: 535 + Login.Login_username = ""; // L: 536 + GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername = null; // L: 537 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 539 + Login.currentLoginField = 1; // L: 540 + } else { + Login.currentLoginField = 0; // L: 543 + } + } + + Tile.savePreferences(); // L: 547 + } + + while (true) { + Transferable var10; + int var11; + do { + while (true) { + label1113: + do { + while (true) { + while (Clock.isKeyDown()) { // L: 549 + if (SecureRandomCallable.field555 != 13) { // L: 550 + if (Login.currentLoginField != 0) { // L: 559 + continue label1113; + } + + class23.method251(WorldMapManager.field335); // L: 560 + if (SecureRandomCallable.field555 == 85 && Login.Login_username.length() > 0) { // L: 561 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (SecureRandomCallable.field555 == 84 || SecureRandomCallable.field555 == 80) { // L: 562 + Login.currentLoginField = 1; + } + + if (Skeleton.method3212(WorldMapManager.field335) && Login.Login_username.length() < 320) { // L: 563 + Login.Login_username = Login.Login_username + WorldMapManager.field335; + } + } else { + Login.loginIndex = 0; // L: 551 + Login.Login_username = ""; // L: 552 + Login.Login_password = ""; // L: 553 + class169.field2035 = 0; // L: 554 + EnumDefinition.otp = ""; // L: 555 + Login.field1227 = true; // L: 556 + } + } + + return; // L: 804 + } + } while(Login.currentLoginField != 1); // L: 565 + + if (SecureRandomCallable.field555 == 85 && Login.Login_password.length() > 0) { // L: 566 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 567 + } else if (SecureRandomCallable.field555 == 84 || SecureRandomCallable.field555 == 80) { // L: 569 + Login.currentLoginField = 0; // L: 570 + if (SecureRandomCallable.field555 == 84) { // L: 571 + Login.Login_username = Login.Login_username.trim(); // L: 572 + if (Login.Login_username.length() == 0) { // L: 573 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 574 + return; // L: 575 + } + + if (Login.Login_password.length() == 0) { // L: 577 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Please enter your password.", ""); // L: 578 + return; // L: 579 + } + + GrandExchangeOfferNameComparator.setLoginResponseString("", "Connecting to server...", ""); // L: 581 + Message.method1314(false); // L: 582 + BuddyRankComparator.updateGameState(20); // L: 583 + return; // L: 584 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && SecureRandomCallable.field555 == 67) { // L: 587 + Clipboard var9 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 588 + var10 = var9.getContents(ByteArrayPool.client); // L: 589 + var11 = 20 - Login.Login_password.length(); // L: 590 + break; + } + + if (Tiles.method1195(WorldMapManager.field335) && Skeleton.method3212(WorldMapManager.field335) && Login.Login_password.length() < 20) { // L: 607 + Login.Login_password = Login.Login_password + WorldMapManager.field335; // L: 608 + } + } + } while(var11 <= 0); // L: 591 + + try { + String var12 = (String)var10.getTransferData(DataFlavor.stringFlavor); // L: 593 + int var13 = Math.min(var11, var12.length()); // L: 594 + + for (int var14 = 0; var14 < var13; ++var14) { // L: 595 + if (!Tiles.method1195(var12.charAt(var14)) || !Skeleton.method3212(var12.charAt(var14))) { // L: 596 + Login.loginIndex = 3; // L: 597 + return; // L: 598 + } + } + + Login.Login_password = Login.Login_password + var12.substring(0, var13); // L: 601 + } catch (UnsupportedFlavorException var22) { // L: 603 + } catch (IOException var23) { // L: 604 + } + } + } else if (Login.loginIndex == 3) { // L: 614 + var25 = Login.loginBoxX + 180; // L: 615 + var7 = 276; // L: 616 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 617 + HealthBar.Login_promptCredentials(false); // L: 618 + } + + var25 = Login.loginBoxX + 180; // L: 620 + var7 = 326; // L: 621 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 622 + GrandExchangeOfferNameComparator.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 623 + Login.loginIndex = 5; // L: 624 + return; // L: 625 + } + } else { + int var19; + if (Login.loginIndex == 4) { // L: 628 + var25 = Login.loginBoxX + 180 - 80; // L: 629 + var7 = 321; // L: 630 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 631 + EnumDefinition.otp.trim(); // L: 632 + if (EnumDefinition.otp.length() != 6) { // L: 633 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 634 + return; // L: 635 + } + + class169.field2035 = Integer.parseInt(EnumDefinition.otp); // L: 637 + EnumDefinition.otp = ""; // L: 638 + Message.method1314(true); // L: 639 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Connecting to server...", ""); // L: 640 + BuddyRankComparator.updateGameState(20); // L: 641 + return; // L: 642 + } + + if (var3 == 1 && var24 >= Login.loginBoxX + 180 - 9 && var24 <= Login.loginBoxX + 180 + 130 && var30 >= 263 && var30 <= 296) { // L: 644 + Login.field1227 = !Login.field1227; // L: 645 + } + + if (var3 == 1 && var24 >= Login.loginBoxX + 180 - 34 && var24 <= Login.loginBoxX + 34 + 180 && var30 >= 351 && var30 <= 363) { // L: 647 + Skeleton.openURL(NPC.method2157("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 648 + } + + var25 = Login.loginBoxX + 180 + 80; // L: 650 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 651 + Login.loginIndex = 0; // L: 652 + Login.Login_username = ""; // L: 653 + Login.Login_password = ""; // L: 654 + class169.field2035 = 0; // L: 655 + EnumDefinition.otp = ""; // L: 656 + } + + while (Clock.isKeyDown()) { // L: 658 + boolean var8 = false; // L: 659 + + for (var19 = 0; var19 < "1234567890".length(); ++var19) { // L: 660 + if (WorldMapManager.field335 == "1234567890".charAt(var19)) { // L: 661 + var8 = true; // L: 662 + break; // L: 663 + } + } + + if (SecureRandomCallable.field555 == 13) { + Login.loginIndex = 0; // L: 667 + Login.Login_username = ""; // L: 668 + Login.Login_password = ""; // L: 669 + class169.field2035 = 0; // L: 670 + EnumDefinition.otp = ""; // L: 671 + } else { + if (SecureRandomCallable.field555 == 85 && EnumDefinition.otp.length() > 0) { // L: 674 + EnumDefinition.otp = EnumDefinition.otp.substring(0, EnumDefinition.otp.length() - 1); + } + + if (SecureRandomCallable.field555 == 84) { // L: 675 + EnumDefinition.otp.trim(); // L: 676 + if (EnumDefinition.otp.length() != 6) { // L: 677 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 678 + return; // L: 679 + } + + class169.field2035 = Integer.parseInt(EnumDefinition.otp); // L: 681 + EnumDefinition.otp = ""; // L: 682 + Message.method1314(true); // L: 683 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Connecting to server...", ""); // L: 684 + BuddyRankComparator.updateGameState(20); // L: 685 + return; // L: 686 + } + + if (var8 && EnumDefinition.otp.length() < 6) { // L: 688 + EnumDefinition.otp = EnumDefinition.otp + WorldMapManager.field335; + } + } + } + } else if (Login.loginIndex == 5) { // L: 692 + var25 = Login.loginBoxX + 180 - 80; // L: 693 + var7 = 321; // L: 694 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 695 + class2.method38(); // L: 696 + return; // L: 697 + } + + var25 = Login.loginBoxX + 180 + 80; // L: 699 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 700 + HealthBar.Login_promptCredentials(true); // L: 701 + } + + var27 = 361; // L: 703 + if (ClientPreferences.field1089 != null) { // L: 704 + var19 = ClientPreferences.field1089.highX / 2; // L: 705 + if (var3 == 1 && var24 >= ClientPreferences.field1089.lowX - var19 && var24 <= var19 + ClientPreferences.field1089.lowX && var30 >= var27 - 15 && var30 < var27) { // L: 706 + Skeleton.openURL(NPC.method2157("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 707 + } + } + + while (Clock.isKeyDown()) { // L: 710 + boolean var31 = false; // L: 711 + + for (int var20 = 0; var20 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var20) { // L: 712 + if (WorldMapManager.field335 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var20)) { // L: 713 + var31 = true; // L: 714 + break; // L: 715 + } + } + + if (SecureRandomCallable.field555 == 13) { // L: 718 + HealthBar.Login_promptCredentials(true); // L: 719 + } else { + if (SecureRandomCallable.field555 == 85 && Login.Login_username.length() > 0) { // L: 722 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (SecureRandomCallable.field555 == 84) { // L: 723 + class2.method38(); // L: 724 + return; // L: 725 + } + + if (var31 && Login.Login_username.length() < 320) { // L: 727 + Login.Login_username = Login.Login_username + WorldMapManager.field335; + } + } + } + } else if (Login.loginIndex != 6) { // L: 731 + if (Login.loginIndex == 7) { // L: 742 + var25 = Login.loginBoxX + 180 - 80; // L: 743 + var7 = 321; // L: 744 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 745 + Skeleton.openURL(NPC.method2157("secure", true) + "m=dob/set_dob.ws", true, false); // L: 746 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 747 + Login.loginIndex = 6; // L: 748 + return; // L: 749 + } + + var25 = Login.loginBoxX + 180 + 80; // L: 751 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 752 + HealthBar.Login_promptCredentials(true); // L: 753 + } + } else if (Login.loginIndex == 8) { // L: 756 + var25 = Login.loginBoxX + 180 - 80; // L: 757 + var7 = 321; // L: 758 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 759 + Skeleton.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 760 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 761 + Login.loginIndex = 6; // L: 762 + return; // L: 763 + } + + var25 = Login.loginBoxX + 180 + 80; // L: 765 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 766 + HealthBar.Login_promptCredentials(true); // L: 767 + } + } else if (Login.loginIndex == 12) { // L: 770 + String var21 = ""; // L: 771 + switch(Login.field1216) { // L: 772 + case 0: + var21 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 780 + break; + case 1: + var21 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 777 + break; // L: 778 + default: + HealthBar.Login_promptCredentials(false); // L: 774 + } + + var28 = Login.loginBoxX + 180; // L: 783 + var27 = 276; // L: 784 + if (var3 == 1 && var24 >= var28 - 75 && var24 <= var28 + 75 && var30 >= var27 - 20 && var30 <= var27 + 20) { // L: 785 + Skeleton.openURL(var21, true, false); // L: 786 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 787 + Login.loginIndex = 6; // L: 788 + return; // L: 789 + } + + var28 = Login.loginBoxX + 180; // L: 791 + var27 = 326; // L: 792 + if (var3 == 1 && var24 >= var28 - 75 && var24 <= var28 + 75 && var30 >= var27 - 20 && var30 <= var27 + 20) { // L: 793 + HealthBar.Login_promptCredentials(false); // L: 794 + } + } else if (Login.loginIndex == 24) { // L: 797 + var25 = Login.loginBoxX + 180; // L: 798 + var7 = 301; // L: 799 + if (var3 == 1 && var24 >= var25 - 75 && var24 <= var25 + 75 && var30 >= var7 - 20 && var30 <= var7 + 20) { // L: 800 + HealthBar.Login_promptCredentials(false); // L: 801 + } + } + } else { + while (true) { + do { + if (!Clock.isKeyDown()) { // L: 732 + var26 = 321; // L: 737 + if (var3 == 1 && var30 >= var26 - 20 && var30 <= var26 + 20) { // L: 738 + HealthBar.Login_promptCredentials(true); // L: 739 + } + + return; + } + } while(SecureRandomCallable.field555 != 84 && SecureRandomCallable.field555 != 13); // L: 733 + + HealthBar.Login_promptCredentials(true); // L: 734 + } + } + } + } + } + + } + } + } + } // L: 312 + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lct;B)V", - garbageValue = "-37" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1888033666" ) - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1720 - Client.isMembersWorld = var0.isMembersOnly(); // L: 1721 - WorldMapManager.method726(var0.isMembersOnly()); // L: 1722 - } + static final void method949(String var0) { + PacketBufferNode var1 = class4.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); // L: 141 + var1.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var0)); // L: 142 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 143 + Client.packetWriter.addNode(var1); // L: 144 + } // L: 145 - ItemContainer.worldHost = var0.host; // L: 1724 - Client.worldId = var0.id; // L: 1725 - Client.worldProperties = var0.properties; // L: 1726 - Client.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1727 - class23.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1728 - WorldMapScaleHandler.port3 = Client.port1; // L: 1729 - } // L: 1730 - - @ObfuscatedName("jo") + @ObfuscatedName("ep") @ObfuscatedSignature( - descriptor = "(Lhq;I)V", - garbageValue = "-580678135" + descriptor = "(I)Lmi;", + garbageValue = "676167972" ) - static final void method903(Widget var0) { - int var1 = var0.contentType; // L: 10437 - if (var1 == 324) { // L: 10438 - if (Client.field937 == -1) { // L: 10439 - Client.field937 = var0.spriteId2; // L: 10440 - Client.field942 = var0.spriteId; // L: 10441 + @Export("getWorldMap") + static WorldMap getWorldMap() { + return KeyHandler.worldMap; // L: 666 + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-123520476" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = ModeWhere.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5717 + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (var5 != 0L) { // L: 5718 + var7 = ModeWhere.scene.getObjectFlags(var0, var1, var2, var5); // L: 5719 + var8 = var7 >> 6 & 3; // L: 5720 + var9 = var7 & 31; // L: 5721 + var10 = var3; // L: 5722 + if (DevicePcmPlayerProvider.method941(var5)) { // L: 5723 + var10 = var4; } - if (Client.playerAppearance.isFemale) { // L: 10443 - var0.spriteId2 = Client.field937; + int[] var11 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5724 + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5725 + var13 = ObjectSound.Entity_unpackID(var5); // L: 5726 + ObjectDefinition var14 = ScriptEvent.getObjectDefinition(var13); // L: 5727 + if (var14.mapSceneId != -1) { // L: 5728 + IndexedSprite var15 = AbstractWorldMapIcon.mapSceneSprites[var14.mapSceneId]; // L: 5729 + if (var15 != null) { // L: 5730 + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5731 + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5732 + var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 5733 + } } else { - var0.spriteId2 = Client.field942; // L: 10444 - } + if (var9 == 0 || var9 == 2) { // L: 5737 + if (var8 == 0) { // L: 5738 + var11[var12] = var10; // L: 5739 + var11[var12 + 512] = var10; // L: 5740 + var11[var12 + 1024] = var10; // L: 5741 + var11[var12 + 1536] = var10; // L: 5742 + } else if (var8 == 1) { // L: 5744 + var11[var12] = var10; // L: 5745 + var11[var12 + 1] = var10; // L: 5746 + var11[var12 + 2] = var10; // L: 5747 + var11[var12 + 3] = var10; // L: 5748 + } else if (var8 == 2) { // L: 5750 + var11[var12 + 3] = var10; // L: 5751 + var11[var12 + 512 + 3] = var10; // L: 5752 + var11[var12 + 1024 + 3] = var10; // L: 5753 + var11[var12 + 1536 + 3] = var10; // L: 5754 + } else if (var8 == 3) { // L: 5756 + var11[var12 + 1536] = var10; // L: 5757 + var11[var12 + 1536 + 1] = var10; // L: 5758 + var11[var12 + 1536 + 2] = var10; // L: 5759 + var11[var12 + 1536 + 3] = var10; // L: 5760 + } + } - } else if (var1 == 325) { // L: 10447 - if (Client.field937 == -1) { // L: 10448 - Client.field937 = var0.spriteId2; // L: 10449 - Client.field942 = var0.spriteId; // L: 10450 - } + if (var9 == 3) { // L: 5763 + if (var8 == 0) { // L: 5764 + var11[var12] = var10; + } else if (var8 == 1) { // L: 5765 + var11[var12 + 3] = var10; + } else if (var8 == 2) { // L: 5766 + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5767 + var11[var12 + 1536] = var10; + } + } - if (Client.playerAppearance.isFemale) { // L: 10452 - var0.spriteId2 = Client.field942; - } else { - var0.spriteId2 = Client.field937; // L: 10453 + if (var9 == 2) { // L: 5769 + if (var8 == 3) { // L: 5770 + var11[var12] = var10; // L: 5771 + var11[var12 + 512] = var10; // L: 5772 + var11[var12 + 1024] = var10; // L: 5773 + var11[var12 + 1536] = var10; // L: 5774 + } else if (var8 == 0) { // L: 5776 + var11[var12] = var10; // L: 5777 + var11[var12 + 1] = var10; // L: 5778 + var11[var12 + 2] = var10; // L: 5779 + var11[var12 + 3] = var10; // L: 5780 + } else if (var8 == 1) { // L: 5782 + var11[var12 + 3] = var10; // L: 5783 + var11[var12 + 512 + 3] = var10; // L: 5784 + var11[var12 + 1024 + 3] = var10; // L: 5785 + var11[var12 + 1536 + 3] = var10; // L: 5786 + } else if (var8 == 2) { // L: 5788 + var11[var12 + 1536] = var10; // L: 5789 + var11[var12 + 1536 + 1] = var10; // L: 5790 + var11[var12 + 1536 + 2] = var10; // L: 5791 + var11[var12 + 1536 + 3] = var10; // L: 5792 + } + } } - - } else if (var1 == 327) { // L: 10456 - var0.modelAngleX = 150; // L: 10457 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 10458 - var0.modelType = 5; // L: 10459 - var0.modelId = 0; // L: 10460 - } else if (var1 == 328) { // L: 10463 - var0.modelAngleX = 150; // L: 10464 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 10465 - var0.modelType = 5; // L: 10466 - var0.modelId = 1; // L: 10467 } - } // L: 10445 10454 10461 10468 10470 + + var5 = ModeWhere.scene.getGameObjectTag(var0, var1, var2); // L: 5797 + if (var5 != 0L) { // L: 5798 + var7 = ModeWhere.scene.getObjectFlags(var0, var1, var2, var5); // L: 5799 + var8 = var7 >> 6 & 3; // L: 5800 + var9 = var7 & 31; // L: 5801 + var10 = ObjectSound.Entity_unpackID(var5); // L: 5802 + ObjectDefinition var24 = ScriptEvent.getObjectDefinition(var10); // L: 5803 + int var19; + if (var24.mapSceneId != -1) { // L: 5804 + IndexedSprite var20 = AbstractWorldMapIcon.mapSceneSprites[var24.mapSceneId]; // L: 5805 + if (var20 != null) { // L: 5806 + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5807 + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5808 + var20.drawAt(var13 + var1 * 4 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 5809 + } + } else if (var9 == 9) { // L: 5812 + var12 = 15658734; // L: 5813 + if (DevicePcmPlayerProvider.method941(var5)) { // L: 5814 + var12 = 15597568; + } + + int[] var18 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5815 + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5816 + if (var8 != 0 && var8 != 2) { // L: 5817 + var18[var19] = var12; // L: 5824 + var18[var19 + 1 + 512] = var12; // L: 5825 + var18[var19 + 1024 + 2] = var12; // L: 5826 + var18[var19 + 1536 + 3] = var12; // L: 5827 + } else { + var18[var19 + 1536] = var12; // L: 5818 + var18[var19 + 1 + 1024] = var12; // L: 5819 + var18[var19 + 512 + 2] = var12; // L: 5820 + var18[var19 + 3] = var12; // L: 5821 + } + } + } + + var5 = ModeWhere.scene.getFloorDecorationTag(var0, var1, var2); // L: 5831 + if (var5 != 0L) { // L: 5832 + var7 = ObjectSound.Entity_unpackID(var5); // L: 5833 + ObjectDefinition var21 = ScriptEvent.getObjectDefinition(var7); // L: 5834 + if (var21.mapSceneId != -1) { // L: 5835 + IndexedSprite var22 = AbstractWorldMapIcon.mapSceneSprites[var21.mapSceneId]; // L: 5836 + if (var22 != null) { // L: 5837 + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 5838 + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 5839 + var22.drawAt(var1 * 4 + var10 + 48, var23 + (104 - var2 - var21.sizeY) * 4 + 48); // L: 5840 + } + } + } + + } // L: 5844 } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 38b39f60ca..a87a53711c 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -1,344 +1,228 @@ +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("cl") +@ObfuscatedName("cr") +@Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("ln") - @ObfuscatedGetter( - intValue = -1406179309 + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lio;" ) - static int menuX; - @ObfuscatedName("k") + static GameBuild field1334; + @ObfuscatedName("hx") + @ObfuscatedGetter( + intValue = -690692767 + ) + @Export("cameraY") + static int cameraY; + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "[Lbk;" ) + @Export("messages") Message[] messages; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1207472641 + intValue = -1674280871 ) + @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 83 - } // L: 86 + this.messages = new Message[100]; // L: 96 + } // L: 99 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbk;", - garbageValue = "-1549087177" + garbageValue = "-1425925685" ) + @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 89 + Message var5 = this.messages[99]; // L: 102 - for (int var6 = this.count; var6 > 0; --var6) { // L: 90 - if (var6 != 100) { // L: 91 - this.messages[var6] = this.messages[var6 - 1]; // L: 92 + for (int var6 = this.count; var6 > 0; --var6) { // L: 103 + if (var6 != 100) { // L: 104 + this.messages[var6] = this.messages[var6 - 1]; // L: 105 } } - if (var5 == null) { // L: 94 + if (var5 == null) { // L: 107 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 96 - var5.removeDual(); // L: 97 - var5.set(var1, var2, var4, var3); // L: 98 + var5.remove(); // L: 109 + var5.removeDual(); // L: 110 + var5.set(var1, var2, var4, var3); // L: 111 } - this.messages[0] = var5; // L: 100 - if (this.count < 100) { // L: 101 + this.messages[0] = var5; // L: 113 + if (this.count < 100) { // L: 114 ++this.count; } - return var5; // L: 102 + return var5; // L: 115 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Lbk;", - garbageValue = "1867589012" + descriptor = "(IB)Lbk;", + garbageValue = "50" ) + @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 106 107 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 119 120 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1452572127" + garbageValue = "771657019" ) + @Export("size") int size() { - return this.count; // L: 111 + return this.count; // L: 124 } - @ObfuscatedName("d") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIIZI)Llp;", - garbageValue = "-1593670187" + descriptor = "(I)Lgk;", + garbageValue = "-921051133" ) - public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { // L: 353 - var4 = 0; - } else if (var4 == 2 && var1 != 1) { // L: 354 - var4 = 1; - } + static PacketBufferNode method2363() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 + } - long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // L: 355 - Sprite var8; - if (!var5) { // L: 357 - var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); // L: 358 - if (var8 != null) { // L: 359 - return var8; - } - } + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([BI)Lau;", + garbageValue = "-2139002337" + ) + static WorldMapSprite method2375(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(class39.convertJpgToSprite(var0).pixels); // L: 19 20 + } - ItemDefinition var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var0); // L: 361 - if (var1 > 1 && var9.countobj != null) { // L: 362 - int var10 = -1; // L: 363 - - for (int var11 = 0; var11 < 10; ++var11) { // L: 364 - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 365 - var10 = var9.countobj[var11]; - } + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lht;I[B[BI)V", + garbageValue = "1292250703" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2668 == null) { // L: 902 + if (var2 == null) { // L: 903 + return; // L: 909 } - if (var10 != -1) { // L: 367 - var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10); - } + var0.field2668 = new byte[11][]; // L: 904 + var0.field2649 = new byte[11][]; // L: 905 + var0.field2670 = new int[11]; // L: 906 + var0.field2671 = new int[11]; // L: 907 } - Model var19 = var9.getModel(1); // L: 369 - if (var19 == null) { // L: 370 - return null; + var0.field2668[var1] = var2; // L: 911 + if (var2 != null) { + var0.field2667 = true; // L: 912 } else { - Sprite var20 = null; // L: 371 - if (var9.noteTemplate != -1) { // L: 372 - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 373 - if (var20 == null) { // L: 374 - return null; - } - } else if (var9.notedId != -1) { // L: 376 - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 377 - if (var20 == null) { // L: 378 - return null; - } - } else if (var9.placeholderTemplate != -1) { // L: 380 - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 381 - if (var20 == null) { // L: 382 - return null; + var0.field2667 = false; // L: 914 + + for (int var4 = 0; var4 < var0.field2668.length; ++var4) { // L: 915 + if (var0.field2668[var4] != null) { // L: 916 + var0.field2667 = true; // L: 917 + break; } } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 384 - int var13 = Rasterizer2D.Rasterizer2D_width; // L: 385 - int var14 = Rasterizer2D.Rasterizer2D_height; // L: 386 - int[] var15 = new int[4]; // L: 387 - Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 388 - var8 = new Sprite(36, 32); // L: 389 - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 390 - Rasterizer2D.Rasterizer2D_clear(); // L: 391 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 392 - Rasterizer3D.method3181(16, 16); // L: 393 - Rasterizer3D.field1788 = false; // L: 394 - if (var9.placeholderTemplate != -1) { // L: 395 - var20.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; // L: 396 - if (var5) { // L: 397 - var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { // L: 398 - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 399 - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 400 - var19.calculateBoundsCylinder(); // L: 401 - var19.method3003(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 402 - if (var9.notedId != -1) { // L: 403 - var20.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { // L: 404 - var8.outline(1); - } - - if (var2 >= 2) { // L: 405 - var8.outline(16777215); - } - - if (var3 != 0) { // L: 406 - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 407 - if (var9.noteTemplate != -1) { // L: 408 - var20.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 409 - ScriptEvent.ItemDefinition_fontPlain11.draw(class194.inventoryQuantityFormat(var1), 0, 9, 16776960, 1); // L: 410 - } - - if (!var5) { // L: 412 - ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 413 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 414 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 415 - Rasterizer3D.field1788 = true; // L: 416 - return var8; // L: 417 } - } - @ObfuscatedName("gy") + var0.field2649[var1] = var3; // L: 922 + } // L: 923 + + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-2146534087" + descriptor = "(B)V", + garbageValue = "70" ) - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = ScriptEvent.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5182 - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (0L != var5) { // L: 5183 - var7 = ScriptEvent.scene.getObjectFlags(var0, var1, var2, var5); // L: 5184 - var8 = var7 >> 6 & 3; // L: 5185 - var9 = var7 & 31; // L: 5186 - var10 = var3; // L: 5187 - if (GrandExchangeOfferTotalQuantityComparator.method173(var5)) { // L: 5188 - var10 = var4; - } + static final void method2381() { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { // L: 3496 + int var10002 = Client.queuedSoundEffectDelays[var0]--; // L: 3497 + if (Client.queuedSoundEffectDelays[var0] >= -10) { // L: 3498 + SoundEffect var1 = Client.soundEffects[var0]; // L: 3510 + if (var1 == null) { // L: 3511 + Object var10000 = null; // L: 3512 + var1 = SoundEffect.readSoundEffect(Username.archive4, Client.soundEffectIds[var0], 0); + if (var1 == null) { // L: 3513 + continue; + } - int[] var11 = ApproximateRouteStrategy.sceneMinimapSprite.pixels; // L: 5189 - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5190 - var13 = UserComparator9.Entity_unpackID(var5); // L: 5191 - ObjectDefinition var14 = MidiPcmStream.getObjectDefinition(var13); // L: 5192 - if (var14.mapSceneId != -1) { // L: 5193 - IndexedSprite var15 = ReflectionCheck.mapSceneSprites[var14.mapSceneId]; // L: 5194 - if (var15 != null) { // L: 5195 - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5196 - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5197 - var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 5198 + int[] var12 = Client.queuedSoundEffectDelays; // L: 3514 + var12[var0] += var1.calculateDelay(); + Client.soundEffects[var0] = var1; // L: 3515 + } + + if (Client.queuedSoundEffectDelays[var0] < 0) { // L: 3521 + int var2; + if (Client.soundLocations[var0] != 0) { // L: 3523 + int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3524 + int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3525 + int var5 = var4 * 128 + 64 - PlayerType.localPlayer.x; // L: 3526 + if (var5 < 0) { // L: 3527 + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3528 + int var7 = var6 * 128 + 64 - PlayerType.localPlayer.y; // L: 3529 + if (var7 < 0) { // L: 3530 + var7 = -var7; + } + + int var8 = var7 + var5 - 128; // L: 3531 + if (var8 > var3) { // L: 3532 + Client.queuedSoundEffectDelays[var0] = -100; // L: 3533 + continue; // L: 3534 + } + + if (var8 < 0) { // L: 3536 + var8 = 0; + } + + var2 = (var3 - var8) * Client.areaSoundEffectVolume / var3; // L: 3537 + } else { + var2 = Client.soundEffectVolume; // L: 3539 + } + + if (var2 > 0) { // L: 3540 + RawSound var9 = var1.toRawSound().resample(NetSocket.decimator); // L: 3541 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3542 + var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3543 + GrandExchangeEvents.pcmStreamMixer.addSubStream(var10); // L: 3544 + } + + Client.queuedSoundEffectDelays[var0] = -100; // L: 3546 } } else { - if (var9 == 0 || var9 == 2) { // L: 5202 - if (var8 == 0) { // L: 5203 - var11[var12] = var10; // L: 5204 - var11[var12 + 512] = var10; // L: 5205 - var11[var12 + 1024] = var10; // L: 5206 - var11[var12 + 1536] = var10; // L: 5207 - } else if (var8 == 1) { // L: 5209 - var11[var12] = var10; // L: 5210 - var11[var12 + 1] = var10; // L: 5211 - var11[var12 + 2] = var10; // L: 5212 - var11[var12 + 3] = var10; // L: 5213 - } else if (var8 == 2) { // L: 5215 - var11[var12 + 3] = var10; // L: 5216 - var11[var12 + 512 + 3] = var10; // L: 5217 - var11[var12 + 1024 + 3] = var10; // L: 5218 - var11[var12 + 1536 + 3] = var10; // L: 5219 - } else if (var8 == 3) { // L: 5221 - var11[var12 + 1536] = var10; // L: 5222 - var11[var12 + 1536 + 1] = var10; // L: 5223 - var11[var12 + 1536 + 2] = var10; // L: 5224 - var11[var12 + 1536 + 3] = var10; // L: 5225 - } + --Client.soundEffectCount; // L: 3499 + + for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { // L: 3500 + Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; // L: 3501 + Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; // L: 3502 + Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; // L: 3503 + Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; // L: 3504 + Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; // L: 3505 } - if (var9 == 3) { // L: 5228 - if (var8 == 0) { // L: 5229 - var11[var12] = var10; - } else if (var8 == 1) { // L: 5230 - var11[var12 + 3] = var10; - } else if (var8 == 2) { // L: 5231 - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 5232 - var11[var12 + 1536] = var10; - } - } - - if (var9 == 2) { // L: 5234 - if (var8 == 3) { // L: 5235 - var11[var12] = var10; // L: 5236 - var11[var12 + 512] = var10; // L: 5237 - var11[var12 + 1024] = var10; // L: 5238 - var11[var12 + 1536] = var10; // L: 5239 - } else if (var8 == 0) { // L: 5241 - var11[var12] = var10; // L: 5242 - var11[var12 + 1] = var10; // L: 5243 - var11[var12 + 2] = var10; // L: 5244 - var11[var12 + 3] = var10; // L: 5245 - } else if (var8 == 1) { // L: 5247 - var11[var12 + 3] = var10; // L: 5248 - var11[var12 + 512 + 3] = var10; // L: 5249 - var11[var12 + 1024 + 3] = var10; // L: 5250 - var11[var12 + 1536 + 3] = var10; // L: 5251 - } else if (var8 == 2) { // L: 5253 - var11[var12 + 1536] = var10; // L: 5254 - var11[var12 + 1536 + 1] = var10; // L: 5255 - var11[var12 + 1536 + 2] = var10; // L: 5256 - var11[var12 + 1536 + 3] = var10; // L: 5257 - } - } + --var0; // L: 3507 } } - var5 = ScriptEvent.scene.getGameObjectTag(var0, var1, var2); // L: 5262 - if (0L != var5) { // L: 5263 - var7 = ScriptEvent.scene.getObjectFlags(var0, var1, var2, var5); // L: 5264 - var8 = var7 >> 6 & 3; // L: 5265 - var9 = var7 & 31; // L: 5266 - var10 = UserComparator9.Entity_unpackID(var5); // L: 5267 - ObjectDefinition var24 = MidiPcmStream.getObjectDefinition(var10); // L: 5268 - int var19; - if (var24.mapSceneId != -1) { // L: 5269 - IndexedSprite var20 = ReflectionCheck.mapSceneSprites[var24.mapSceneId]; // L: 5270 - if (var20 != null) { // L: 5271 - var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5272 - var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5273 - var20.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 5274 - } - } else if (var9 == 9) { // L: 5277 - var12 = 15658734; // L: 5278 - if (GrandExchangeOfferTotalQuantityComparator.method173(var5)) { // L: 5279 - var12 = 15597568; - } - - int[] var18 = ApproximateRouteStrategy.sceneMinimapSprite.pixels; // L: 5280 - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5281 - if (var8 != 0 && var8 != 2) { // L: 5282 - var18[var19] = var12; // L: 5289 - var18[var19 + 1 + 512] = var12; // L: 5290 - var18[var19 + 1024 + 2] = var12; // L: 5291 - var18[var19 + 1536 + 3] = var12; // L: 5292 - } else { - var18[var19 + 1536] = var12; // L: 5283 - var18[var19 + 1 + 1024] = var12; // L: 5284 - var18[var19 + 512 + 2] = var12; // L: 5285 - var18[var19 + 3] = var12; // L: 5286 - } + if (Client.field916 && !class58.method957()) { // L: 3549 + if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { // L: 3550 + Canvas.method952(ApproximateRouteStrategy.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); } + + Client.field916 = false; // L: 3551 } - var5 = ScriptEvent.scene.getFloorDecorationTag(var0, var1, var2); // L: 5296 - if (0L != var5) { // L: 5297 - var7 = UserComparator9.Entity_unpackID(var5); // L: 5298 - ObjectDefinition var21 = MidiPcmStream.getObjectDefinition(var7); // L: 5299 - if (var21.mapSceneId != -1) { // L: 5300 - IndexedSprite var22 = ReflectionCheck.mapSceneSprites[var21.mapSceneId]; // L: 5301 - if (var22 != null) { // L: 5302 - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 5303 - int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 5304 - var22.drawAt(var10 + var1 * 4 + 48, var23 + (104 - var2 - var21.sizeY) * 4 + 48); // L: 5305 - } - } - } - - } // L: 5309 + } // L: 3553 } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index cc287cf7ca..da4841e6a3 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -1,250 +1,256 @@ +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("kx") +@ObfuscatedName("kv") +@Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) + @Export("loginType") final LoginType loginType; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Lka;" ) + @Export("localUser") final Usernamed localUser; - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("name") public String name; - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("owner") public String owner; - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("minKick") public byte minKick; - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 996591213 + intValue = 1444461207 ) + @Export("rank") public int rank; - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -463550623 + intValue = -1905995869 ) - int field3661; + int field3662; @ObfuscatedSignature( - descriptor = "(Lmu;Lkp;)V" + descriptor = "(Lmc;Lka;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); // L: 18 this.name = null; // L: 11 this.owner = null; // L: 12 - this.field3661 = 1; // L: 15 + this.field3662 = 1; // L: 15 this.loginType = var1; // L: 19 this.localUser = var2; // L: 20 } // L: 21 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Ljc;", - garbageValue = "35" + descriptor = "(I)Ljh;", + garbageValue = "-1664145399" ) + @Export("newInstance") User newInstance() { return new ClanMate(); // L: 24 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)[Ljc;", - garbageValue = "-19" + descriptor = "(IB)[Ljh;", + garbageValue = "-35" ) + @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; // L: 28 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2006450135" + garbageValue = "-2147338724" ) + @Export("readName") final void readName(String var1) { - long var5 = 0L; // L: 36 - int var7 = var1.length(); // L: 37 + this.name = Login.method2219(var1); // L: 32 + } // L: 33 - for (int var8 = 0; var8 < var7; ++var8) { // L: 38 - var5 *= 37L; // L: 39 - char var9 = var1.charAt(var8); // L: 40 - if (var9 >= 'A' && var9 <= 'Z') { // L: 41 - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { // L: 42 - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); // L: 43 - } - - if (var5 >= 177917621779460413L) { // L: 44 - break; - } - } - - while (0L == var5 % 37L && var5 != 0L) { // L: 46 - var5 /= 37L; - } - - String var10 = GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var5); // L: 49 - if (var10 == null) { // L: 50 - var10 = ""; - } - - this.name = var10; // L: 53 - } // L: 54 - - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-13" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1637949193" ) + @Export("setOwner") final void setOwner(String var1) { - long var5 = 0L; // L: 61 - int var7 = var1.length(); // L: 62 + this.owner = Login.method2219(var1); // L: 36 + } // L: 37 - for (int var8 = 0; var8 < var7; ++var8) { // L: 63 - var5 *= 37L; // L: 64 - char var9 = var1.charAt(var8); // L: 65 - if (var9 >= 'A' && var9 <= 'Z') { // L: 66 - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { // L: 67 - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); // L: 68 - } - - if (var5 >= 177917621779460413L) { // L: 69 - break; - } - } - - while (var5 % 37L == 0L && 0L != var5) { // L: 71 - var5 /= 37L; - } - - String var10 = GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var5); // L: 74 - if (var10 == null) { // L: 75 - var10 = ""; - } - - this.owner = var10; // L: 78 - } // L: 79 - - @ObfuscatedName("x") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-140522773" + descriptor = "(Lkb;S)V", + garbageValue = "-26042" ) + @Export("readUpdate") public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82 - long var2 = var1.readLong(); // L: 83 - this.readName(AbstractWorldMapData.method331(var2)); // L: 84 - this.minKick = var1.readByte(); // L: 85 - int var4 = var1.readUnsignedByte(); // L: 86 - if (var4 != 255) { // L: 87 - this.clear(); // L: 88 + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 40 + long var2 = var1.readLong(); // L: 41 + long var5 = var2; // L: 43 + String var4; + int var7; + if (var2 > 0L && var2 < 6582952005840035281L) { // L: 45 + if (0L == var2 % 37L) { // L: 49 + var4 = null; // L: 50 + } else { + var7 = 0; // L: 53 - for (int var5 = 0; var5 < var4; ++var5) { // L: 89 - ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 90 - int var7 = var1.readUnsignedShort(); // L: 91 - var6.set(var7, ++this.field3661 - 1); // L: 92 - var6.rank = var1.readByte(); // L: 93 - var1.readStringCp1252NullTerminated(); // L: 94 - this.isLocalPlayer(var6); // L: 95 + for (long var8 = var2; 0L != var8; var8 /= 37L) { // L: 54 55 57 + ++var7; // L: 56 + } + + StringBuilder var10 = new StringBuilder(var7); // L: 59 + + while (var5 != 0L) { // L: 60 + long var11 = var5; // L: 61 + var5 /= 37L; // L: 62 + var10.append(class299.base37Table[(int)(var11 - var5 * 37L)]); // L: 63 + } + + var4 = var10.reverse().toString(); // L: 65 + } + } else { + var4 = null; // L: 46 + } + + this.readName(var4); // L: 67 + this.minKick = var1.readByte(); // L: 68 + var7 = var1.readUnsignedByte(); // L: 69 + if (var7 != 255) { // L: 70 + this.clear(); // L: 71 + + for (int var13 = 0; var13 < var7; ++var13) { // L: 72 + ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 73 + int var14 = var1.readUnsignedShort(); // L: 74 + var9.set(var14, ++this.field3662 - 1); // L: 75 + var9.rank = var1.readByte(); // L: 76 + var1.readStringCp1252NullTerminated(); // L: 77 + this.isLocalPlayer(var9); // L: 78 } } - } // L: 97 + } // L: 80 - @ObfuscatedName("bs") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-1609519630" + descriptor = "(Lkb;S)V", + garbageValue = "179" ) - public final void method5350(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 100 - int var3 = var1.readUnsignedShort(); // L: 101 - byte var4 = var1.readByte(); // L: 102 - boolean var5 = false; // L: 103 - if (var4 == -128) { // L: 104 + public final void method5371(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 83 + int var3 = var1.readUnsignedShort(); // L: 84 + byte var4 = var1.readByte(); // L: 85 + boolean var5 = false; // L: 86 + if (var4 == -128) { // L: 87 var5 = true; } ClanMate var6; - if (var5) { // L: 105 - if (this.getSize() == 0) { // L: 106 + if (var5) { // L: 88 + if (this.getSize() == 0) { // L: 89 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 107 - if (var6 != null && var6.getWorld() == var3) { // L: 108 - this.remove(var6); // L: 109 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 90 + if (var6 != null && var6.getWorld() == var3) { // L: 91 + this.remove(var6); // L: 92 } } else { - var1.readStringCp1252NullTerminated(); // L: 113 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 114 - if (var6 == null) { // L: 115 - if (this.getSize() > super.capacity) { // L: 116 + var1.readStringCp1252NullTerminated(); // L: 96 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 97 + if (var6 == null) { // L: 98 + if (this.getSize() > super.capacity) { // L: 99 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 117 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 100 } - var6.set(var3, ++this.field3661 - 1); // L: 119 - var6.rank = var4; // L: 120 - this.isLocalPlayer(var6); // L: 121 + var6.set(var3, ++this.field3662 - 1); // L: 102 + var6.rank = var4; // L: 103 + this.isLocalPlayer(var6); // L: 104 } - } // L: 123 + } // L: 106 - @ObfuscatedName("cg") + @ObfuscatedName("ci") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1118151470" + garbageValue = "1379027801" ) + @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 126 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 127 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 109 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 110 } - } // L: 129 + } // L: 112 - @ObfuscatedName("ca") + @ObfuscatedName("cy") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1383721491" + garbageValue = "-958910490" ) + @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 132 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 133 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 115 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 116 } - } // L: 135 + } // L: 118 - @ObfuscatedName("ct") + @ObfuscatedName("cx") @ObfuscatedSignature( descriptor = "(Ljf;I)V", - garbageValue = "-1871849373" + garbageValue = "1754058775" ) + @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 138 + if (var1.getUsername().equals(this.localUser.username())) { // L: 121 this.rank = var1.rank; } - } // L: 139 + } // L: 122 - @ObfuscatedName("in") + @ObfuscatedName("io") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2030161914" + descriptor = "(IIIIIIIII)V", + garbageValue = "-1171740375" ) - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 9635 - } + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (ScriptFrame.loadInterface(var0)) { // L: 9322 + ItemContainer.field572 = null; // L: 9329 + WorldMapRegion.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9330 + if (ItemContainer.field572 != null) { // L: 9331 + WorldMapRegion.drawInterface(ItemContainer.field572, -1412584499, var1, var2, var3, var4, WorldMapSprite.field256, GrandExchangeOffer.field87, var7); // L: 9332 + ItemContainer.field572 = null; // L: 9333 + } + + } else { + if (var7 != -1) { // L: 9323 + Client.field834[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 9325 + Client.field834[var8] = true; + } + } + + } + } // L: 9327 9335 } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 1f82232f89..989ec9a8e0 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -1,17 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jf") +@Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("friend") TriBool friend; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("ignored") TriBool ignored; ClanMate() { @@ -19,20 +24,22 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; // L: 7 } // L: 9 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1483080876" + garbageValue = "203874469" ) + @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2093407981" + garbageValue = "-2063904436" ) + @Export("isFriend") public final boolean isFriend() { if (this.friend == TriBool.TriBool_unknown) { // L: 16 this.fillIsFriend(); // L: 17 @@ -41,29 +48,32 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2130404233" + garbageValue = "-170481426" ) + @Export("fillIsFriend") void fillIsFriend() { - this.friend = class60.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + this.friend = WorldMapLabelSize.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "405113093" + garbageValue = "1476758779" ) + @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-607786293" + garbageValue = "-6155848" ) + @Export("isIgnored") public final boolean isIgnored() { if (this.ignored == TriBool.TriBool_unknown) { // L: 31 this.fillIsIgnored(); // L: 32 @@ -72,36 +82,13 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-483165617" + garbageValue = "224401479" ) + @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = class60.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + this.ignored = WorldMapLabelSize.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 } // L: 39 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "0" - ) - public static boolean method5146(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 - if (var0 != 0) { // L: 46 - char[] var1 = class297.cp1252AsciiExtension; // L: 48 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 - char var3 = var1[var2]; // L: 50 - if (var0 == var3) { - return true; // L: 52 - } - } - } - - return false; // L: 57 - } else { - return true; - } - } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index fa6d2f90e6..be94a56702 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -4,1809 +4,2103 @@ 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("nm") + @ObfuscatedName("nt") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lht;" ) + @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ox") + @ObfuscatedName("of") @ObfuscatedGetter( - intValue = -738274361 + intValue = -967608343 ) - static int field881; + static int field748; + @ObfuscatedName("od") + @ObfuscatedGetter( + intValue = -159421781 + ) + @Export("rootWidgetCount") + static int rootWidgetCount; @ObfuscatedName("op") @ObfuscatedGetter( - intValue = -548379031 + longValue = 3335751163548503689L ) - static int rootWidgetCount; - @ObfuscatedName("ob") - @ObfuscatedGetter( - longValue = -5904511497921322921L - ) - static long field890; - @ObfuscatedName("oo") - static boolean[] field882; - @ObfuscatedName("or") - static boolean[] field884; - @ObfuscatedName("oz") - static boolean[] field883; - @ObfuscatedName("no") - static boolean field880; - @ObfuscatedName("ne") - @ObfuscatedGetter( - intValue = -565689219 - ) - static int cycleCntr; - @ObfuscatedName("ol") - static boolean isResizable; - @ObfuscatedName("sr") - @ObfuscatedGetter( - intValue = -509271729 - ) - public static int field946; - @ObfuscatedName("on") - @ObfuscatedGetter( - intValue = 1680416831 - ) - static int field870; - @ObfuscatedName("nx") - static boolean field799; - @ObfuscatedName("qk") - static boolean field704; - @ObfuscatedName("nc") - @ObfuscatedGetter( - intValue = -1698989409 - ) - static int widgetClickX; - @ObfuscatedName("nl") - @ObfuscatedGetter( - intValue = 907230791 - ) - static int widgetClickY; - @ObfuscatedName("ng") - @ObfuscatedGetter( - intValue = -1025599455 - ) - static int field856; - @ObfuscatedName("og") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - static NodeHashTable widgetFlags; - @ObfuscatedName("ny") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget clickedWidgetParent; - @ObfuscatedName("os") - static int[] rootWidgetXs; + static long field879; @ObfuscatedName("ou") - static int[] rootWidgetWidths; - @ObfuscatedName("nr") + static boolean[] field834; + @ObfuscatedName("ot") + static boolean[] field745; + @ObfuscatedName("oj") + static boolean[] field758; + @ObfuscatedName("nl") + static boolean field705; + @ObfuscatedName("no") @ObfuscatedGetter( - intValue = -2016835687 + intValue = -1723544013 ) - static int field785; - @ObfuscatedName("nn") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget viewportWidget; - @ObfuscatedName("ov") + @Export("cycleCntr") + static int cycleCntr; + @ObfuscatedName("pz") + @Export("isResizable") + static boolean isResizable; + @ObfuscatedName("sp") @ObfuscatedGetter( - intValue = 2115914755 + intValue = 954341551 ) - static int gameDrawingMode; + public static int field950; @ObfuscatedName("oy") - static int[] rootWidgetYs; - @ObfuscatedName("mb") @ObfuscatedGetter( - intValue = -1986502797 + intValue = 1826821479 ) - static int staffModLevel; - @ObfuscatedName("om") - static int[] rootWidgetHeights; - @ObfuscatedName("nz") + static int field874; + @ObfuscatedName("nx") + static boolean field859; + @ObfuscatedName("qq") + static boolean field916; + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = -1644651357 + intValue = -115501903 ) - static int field864; - @ObfuscatedName("ta") - @ObfuscatedSignature( - descriptor = "Lbv;" + @Export("widgetClickX") + static int widgetClickX; + @ObfuscatedName("nh") + @ObfuscatedGetter( + intValue = -1615551305 ) - static final ApproximateRouteStrategy field950; - @ObfuscatedName("oh") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - static NodeDeque scriptEvents; + @Export("widgetClickY") + static int widgetClickY; @ObfuscatedName("nd") @ObfuscatedGetter( - intValue = 1703929767 + intValue = 897589711 ) - static int field859; - @ObfuscatedName("nb") - @ObfuscatedGetter( - intValue = 1650820599 + static int field860; + @ObfuscatedName("ov") + @ObfuscatedSignature( + descriptor = "Llp;" ) - static int field947; + @Export("widgetFlags") + static NodeHashTable widgetFlags; @ObfuscatedName("ni") - @ObfuscatedGetter( - intValue = 918307921 + @ObfuscatedSignature( + descriptor = "Lht;" ) - static int field795; + @Export("clickedWidgetParent") + static Widget clickedWidgetParent; + @ObfuscatedName("ob") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("ol") + @Export("rootWidgetXs") + static int[] rootWidgetXs; + @ObfuscatedName("ng") + @ObfuscatedGetter( + intValue = -1965324355 + ) + static int field861; + @ObfuscatedName("nr") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("viewportWidget") + static Widget viewportWidget; + @ObfuscatedName("oa") + @ObfuscatedGetter( + intValue = -1215664047 + ) + @Export("gameDrawingMode") + static int gameDrawingMode; + @ObfuscatedName("on") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("ms") + @ObfuscatedGetter( + intValue = 1050326365 + ) + @Export("staffModLevel") + static int staffModLevel; + @ObfuscatedName("oh") + @Export("rootWidgetYs") + static int[] rootWidgetYs; + @ObfuscatedName("tz") + @ObfuscatedSignature( + descriptor = "Lbx;" + ) + static final ApproximateRouteStrategy field877; + @ObfuscatedName("og") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + @Export("scriptEvents") + static NodeDeque scriptEvents; + @ObfuscatedName("ne") + @ObfuscatedGetter( + intValue = -532029863 + ) + static int field931; + @ObfuscatedName("ny") + @ObfuscatedGetter( + intValue = -467484497 + ) + static int field868; + @ObfuscatedName("nz") + @ObfuscatedGetter( + intValue = -400221737 + ) + static int field701; + @ObfuscatedName("rj") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("po") + @ObfuscatedGetter( + intValue = 2067578655 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("px") + @ObfuscatedGetter( + intValue = -1857927441 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("tl") + static int[] field695; + @ObfuscatedName("tj") + static int[] field956; + @ObfuscatedName("np") + @Export("isDraggingWidget") + static boolean isDraggingWidget; @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = -1571954779 - ) - static int field775; - @ObfuscatedName("qu") - @ObfuscatedGetter( - intValue = -1071833827 - ) - static int currentTrackGroupId; - @ObfuscatedName("nw") - static int[] field863; - @ObfuscatedName("te") - static int[] field830; - @ObfuscatedName("tv") - static int[] field952; - @ObfuscatedName("nv") - static boolean isDraggingWidget; - @ObfuscatedName("mj") - @ObfuscatedGetter( - intValue = 965072955 - ) - static int runEnergy; - @ObfuscatedName("qr") - @ObfuscatedGetter( - intValue = -259926039 - ) - static int destinationX; - @ObfuscatedName("mk") - @ObfuscatedGetter( - intValue = 706119953 - ) - static int weight; - @ObfuscatedName("qe") - @ObfuscatedGetter( - intValue = 347041669 - ) - static int destinationY; - @ObfuscatedName("ow") - @ObfuscatedGetter( - intValue = 1612540519 + intValue = 1446456861 ) + @Export("mouseWheelRotation") static int mouseWheelRotation; + @ObfuscatedName("mg") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("mq") + @ObfuscatedGetter( + intValue = 1875055983 + ) + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("qy") + @ObfuscatedGetter( + intValue = 12933011 + ) + @Export("destinationX") + static int destinationX; + @ObfuscatedName("mt") + @ObfuscatedGetter( + intValue = 373944835 + ) + @Export("weight") + static int weight; + @ObfuscatedName("qb") + @ObfuscatedGetter( + intValue = 1660756197 + ) + @Export("destinationY") + static int destinationY; + @ObfuscatedName("rg") + static boolean[] field926; + @ObfuscatedName("rw") + static int[] field927; + @ObfuscatedName("sy") + @ObfuscatedGetter( + intValue = -905823515 + ) + static int field945; @ObfuscatedName("ro") - static boolean isCameraLocked; - @ObfuscatedName("ss") - @ObfuscatedGetter( - intValue = 940085397 - ) - static int field937; - @ObfuscatedName("sq") + static int[] field928; + @ObfuscatedName("sa") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhu;" ) + @Export("playerAppearance") static PlayerAppearance playerAppearance; - @ObfuscatedName("qf") + @ObfuscatedName("ru") + static int[] field898; + @ObfuscatedName("qh") @ObfuscatedGetter( - intValue = -812618355 + intValue = 1478190693 ) + @Export("areaSoundEffectVolume") static int areaSoundEffectVolume; - @ObfuscatedName("rz") - static boolean[] field922; - @ObfuscatedName("si") + @ObfuscatedName("sb") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("rp") + static int[] field918; + @ObfuscatedName("so") @ObfuscatedGetter( - intValue = 1407217563 + intValue = 1105285413 ) - static int field942; - @ObfuscatedName("nh") + static int field895; + @ObfuscatedName("nb") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lht;" ) + @Export("draggedOnWidget") static Widget draggedOnWidget; @ObfuscatedName("qn") @ObfuscatedGetter( - intValue = -751525007 + intValue = 2064359385 ) - static int soundEffectCount; - @ObfuscatedName("qo") - static int[] soundEffectIds; - @ObfuscatedName("mq") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget meslayerContinueWidget; - @ObfuscatedName("qi") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("qa") + @Export("minimapState") + static int minimapState; + @ObfuscatedName("sh") @ObfuscatedGetter( - intValue = 1720412197 - ) - static int musicVolume; - @ObfuscatedName("qp") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("sn") - static ArrayList archiveLoaders; - @ObfuscatedName("qx") - @ObfuscatedSignature( - descriptor = "[Ldj;" - ) - static SoundEffect[] soundEffects; - @ObfuscatedName("se") - @ObfuscatedGetter( - intValue = 1815598231 + intValue = -361533157 ) + @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("qt") + @ObfuscatedName("pb") + static long[] field900; + @ObfuscatedName("sn") + @ObfuscatedSignature( + descriptor = "[Lj;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("pa") + @ObfuscatedGetter( + intValue = 845536339 + ) + static int field901; + @ObfuscatedName("oc") + @ObfuscatedGetter( + intValue = 1746826411 + ) + static int field885; + @ObfuscatedName("nk") + static int[] field867; + @ObfuscatedName("oo") + @ObfuscatedGetter( + intValue = 1183562103 + ) + static int field878; + @ObfuscatedName("oe") + @ObfuscatedGetter( + intValue = -770002343 + ) + static int field875; + @ObfuscatedName("na") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("ox") + @ObfuscatedGetter( + intValue = -1931074951 + ) + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("pk") + @ObfuscatedGetter( + longValue = 7054518271740632067L + ) + static long field905; + @ObfuscatedName("pc") + @ObfuscatedGetter( + intValue = 743392311 + ) + static int field906; + @ObfuscatedName("sw") + @ObfuscatedSignature( + descriptor = "Lmy;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("ss") + @ObfuscatedGetter( + intValue = -1587883567 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("sr") + @ObfuscatedGetter( + intValue = -1411709539 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("sm") + @ObfuscatedGetter( + intValue = -1821649225 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("sq") + @ObfuscatedGetter( + intValue = 637100393 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("nv") + @Export("changedItemContainers") + static int[] changedItemContainers; + @ObfuscatedName("nq") + @ObfuscatedGetter( + intValue = -1001910639 + ) + static int field941; + @ObfuscatedName("qo") + @ObfuscatedGetter( + intValue = -696027355 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("qw") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("qv") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("qf") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("qj") + @ObfuscatedGetter( + intValue = 1888830449 + ) + @Export("musicVolume") + static int musicVolume; + @ObfuscatedName("qs") + @ObfuscatedSignature( + descriptor = "[Ldq;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("qc") + @ObfuscatedGetter( + intValue = -481995573 + ) + @Export("currentTrackGroupId") + static int currentTrackGroupId; + @ObfuscatedName("pe") + @ObfuscatedGetter( + intValue = 977040321 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("py") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("qg") + @Export("soundLocations") static int[] soundLocations; @ObfuscatedName("qd") @ObfuscatedGetter( - intValue = -549724569 - ) - static int minimapState; - @ObfuscatedName("qv") - @ObfuscatedGetter( - intValue = 512054773 + intValue = -1728090839 ) + @Export("soundEffectVolume") static int soundEffectVolume; @ObfuscatedName("pd") - @ObfuscatedGetter( - intValue = -1205130553 - ) - static int field902; - @ObfuscatedName("pb") - @ObfuscatedGetter( - longValue = -1783844530730786273L - ) - static long field901; - @ObfuscatedName("mt") - @ObfuscatedGetter( - intValue = 131534275 - ) - static int chatEffects; - @ObfuscatedName("st") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("rt") + static short field873; + @ObfuscatedName("rc") + static short field932; + @ObfuscatedName("rd") + static short field937; + @ObfuscatedName("rz") + static short field935; + @ObfuscatedName("qt") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "[Llc;" ) - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("mv") + @Export("mapIcons") + static Sprite[] mapIcons; + @ObfuscatedName("ra") + static short field753; + @ObfuscatedName("or") @ObfuscatedGetter( - intValue = -127705051 + intValue = -840703781 ) - static int field707; - @ObfuscatedName("mn") + static int field852; + @ObfuscatedName("sl") @ObfuscatedGetter( - intValue = 1491507455 + intValue = -462473275 ) - static int followerIndex; + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("rs") + static short field865; + @ObfuscatedName("mb") + @ObfuscatedGetter( + intValue = 476049569 + ) + @Export("chatEffects") + static int chatEffects; + @ObfuscatedName("sd") + @ObfuscatedGetter( + intValue = 996380993 + ) + static int field953; + @ObfuscatedName("mf") + @ObfuscatedGetter( + intValue = 1006230257 + ) + static int field846; @ObfuscatedName("pn") @ObfuscatedGetter( - intValue = -1223881297 + intValue = 1182698243 ) - static int mapIconCount; - @ObfuscatedName("rw") - static short field769; - @ObfuscatedName("ru") - static short field928; - @ObfuscatedName("np") - static int[] changedItemContainers; + static int field902; @ObfuscatedName("rm") - static short field938; - @ObfuscatedName("nt") - @ObfuscatedGetter( - intValue = 2062422777 - ) - static int field903; - @ObfuscatedName("pl") - static int[] mapIconXs; - @ObfuscatedName("ry") - static short field934; - @ObfuscatedName("rx") - static short field932; - @ObfuscatedName("sj") - @ObfuscatedGetter( - intValue = 1522828843 - ) - static int viewportZoom; - @ObfuscatedName("rq") - static short field931; - @ObfuscatedName("so") - @ObfuscatedGetter( - intValue = 112709455 - ) - static int viewportWidth; - @ObfuscatedName("pf") - @ObfuscatedSignature( - descriptor = "[Llp;" - ) - static Sprite[] mapIcons; - @ObfuscatedName("pk") - static int[] mapIconYs; - @ObfuscatedName("od") - @ObfuscatedGetter( - intValue = -618238831 - ) - static int field871; - @ObfuscatedName("py") - @ObfuscatedGetter( - intValue = -372222431 - ) - static int field898; - @ObfuscatedName("sv") - @ObfuscatedGetter( - intValue = -1397478813 - ) - static int viewportHeight; - @ObfuscatedName("rg") - @ObfuscatedGetter( - intValue = 1838939771 - ) - static int viewportOffsetX; - @ObfuscatedName("oj") - @ObfuscatedGetter( - intValue = -1096742287 - ) - static int field873; - @ObfuscatedName("sh") - @ObfuscatedGetter( - intValue = -1729596091 - ) - static int viewportOffsetY; - @ObfuscatedName("ps") - @ObfuscatedGetter( - intValue = -1158906153 - ) - static int tradeChatMode; - @ObfuscatedName("pc") - @ObfuscatedGetter( - intValue = -1755840079 - ) - static int publicChatMode; - @ObfuscatedName("rd") - static short zoomHeight; - @ObfuscatedName("rv") + @Export("zoomWidth") static short zoomWidth; - @ObfuscatedName("su") + @ObfuscatedName("ry") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = 197263845 + intValue = -1815216699 ) - static int field949; - @ObfuscatedName("pa") - static int[] field900; - @ObfuscatedName("po") - static int[] field899; - @ObfuscatedName("oc") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - static NodeDeque field877; - @ObfuscatedName("sc") - @ObfuscatedSignature( - descriptor = "[Lv;" - ) - static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("ok") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - static NodeDeque field912; - @ObfuscatedName("oi") - @ObfuscatedGetter( - intValue = -1452534743 - ) - static int field872; - @ObfuscatedName("rr") - static int[] field740; - @ObfuscatedName("rh") - static int[] field678; - @ObfuscatedName("rl") - static int[] field926; - @ObfuscatedName("rk") - static int[] field925; - @ObfuscatedName("mw") - @ObfuscatedGetter( - intValue = 250230651 - ) - static int field865; - @ObfuscatedName("ms") - @ObfuscatedGetter( - intValue = 2027886515 - ) - static int field840; - @ObfuscatedName("mm") - static boolean playerMod; - @ObfuscatedName("pj") - static long[] field896; - @ObfuscatedName("nq") - static int[] changedSkills; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = -1157540783 - ) - static int changedSkillsCount; - @ObfuscatedName("pt") - @ObfuscatedGetter( - intValue = -541473949 - ) - static int field794; - @ObfuscatedName("pr") - static int[] field892; + @Export("followerIndex") + static int followerIndex; @ObfuscatedName("pm") - static String field913; - @ObfuscatedName("sd") + static int[] field904; + @ObfuscatedName("pu") + static int[] field903; + @ObfuscatedName("oz") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lja;" ) - static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("oe") + static NodeDeque field881; + @ObfuscatedName("om") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + static NodeDeque field939; + @ObfuscatedName("ns") + @Export("playerMod") + static boolean playerMod; + @ObfuscatedName("mv") @ObfuscatedGetter( - intValue = -1163412349 + intValue = 1489885445 ) + static int field843; + @ObfuscatedName("ok") + @ObfuscatedGetter( + intValue = -1530697045 + ) + @Export("chatCycle") static int chatCycle; + @ObfuscatedName("ml") + @ObfuscatedGetter( + intValue = 1279066227 + ) + static int field844; + @ObfuscatedName("ps") + static String field710; + @ObfuscatedName("pq") + static int[] field896; + @ObfuscatedName("su") + @ObfuscatedSignature( + descriptor = "Lbu;" + ) + @Export("GrandExchangeEvents_worldComparator") + static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; + @ObfuscatedName("s") + static String[] field957; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lft;" + descriptor = "[Lfh;" ) + @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ac") - static boolean field841; - @ObfuscatedName("bl") + @ObfuscatedName("ad") + static boolean field772; + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 908915111 + intValue = -1952252433 ) + @Export("worldId") public static int worldId; - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -2146116225 + intValue = 1836293151 ) + @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bj") - @ObfuscatedGetter( - intValue = -77282259 - ) - static int gameBuild; @ObfuscatedName("bg") - public static boolean isMembersWorld; - @ObfuscatedName("br") - static boolean isLowDetail; - @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1456761211 + intValue = 1500455873 ) + @Export("gameBuild") + static int gameBuild; + @ObfuscatedName("bl") + @Export("isMembersWorld") + public static boolean isMembersWorld; + @ObfuscatedName("bn") + @Export("isLowDetail") + static boolean isLowDetail; + @ObfuscatedName("bw") + @ObfuscatedGetter( + intValue = 530446497 + ) + @Export("clientType") static int clientType; - @ObfuscatedName("ba") - static boolean onMobile; @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1382758875 - ) - static int gameState; - @ObfuscatedName("cu") - static boolean isLoading; - @ObfuscatedName("cw") - @ObfuscatedGetter( - intValue = -925075011 - ) - static int cycle; - @ObfuscatedName("cq") - @ObfuscatedGetter( - longValue = -6291898819943529903L - ) - static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cf") - @ObfuscatedGetter( - intValue = -359806485 - ) - static int field798; - @ObfuscatedName("cj") - @ObfuscatedGetter( - intValue = -40955973 + intValue = -1817623855 ) static int field686; + @ObfuscatedName("by") + @Export("onMobile") + static boolean onMobile; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = 1008452177 + ) + @Export("gameState") + static int gameState; + @ObfuscatedName("ca") + @Export("isLoading") + static boolean isLoading; + @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = -1633145881 + ) + @Export("cycle") + static int cycle; + @ObfuscatedName("cw") + @ObfuscatedGetter( + longValue = -7364036271402416249L + ) + @Export("mouseLastLastPressedTimeMillis") + static long mouseLastLastPressedTimeMillis; + @ObfuscatedName("cq") + @ObfuscatedGetter( + intValue = -345670979 + ) + static int field719; @ObfuscatedName("cd") @ObfuscatedGetter( - longValue = -3347850541832475541L + intValue = 711078459 ) - static long field687; - @ObfuscatedName("cx") + static int field693; + @ObfuscatedName("cj") + @ObfuscatedGetter( + longValue = 6513468436641987539L + ) + static long field694; + @ObfuscatedName("cm") + @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cp") + @ObfuscatedName("cb") + @Export("displayFps") static boolean displayFps; - @ObfuscatedName("ch") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 1440208899 + intValue = -1097232173 ) + @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cs") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -1549228635 + intValue = 663263241 ) + @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("ck") - @ObfuscatedGetter( - intValue = 748257717 - ) - static int hintArrowNpcIndex; - @ObfuscatedName("co") - @ObfuscatedGetter( - intValue = 1282268129 - ) - static int hintArrowPlayerIndex; @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 1561023113 + intValue = -1168701183 ) + @Export("hintArrowNpcIndex") + static int hintArrowNpcIndex; + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = -1852952069 + ) + @Export("hintArrowPlayerIndex") + static int hintArrowPlayerIndex; + @ObfuscatedName("co") + @ObfuscatedGetter( + intValue = 1012584603 + ) + @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cy") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 4072295 + intValue = 285496787 ) + @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cb") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -1130712819 + intValue = -679069747 ) + @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("cl") + @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = 573846843 + intValue = 286843445 ) + @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("dx") - @ObfuscatedGetter( - intValue = -1575899159 - ) - static int hintArrowSubY; - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "Lcd;" - ) - static AttackOption playerAttackOption; - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "Lcd;" - ) - static AttackOption npcAttackOption; @ObfuscatedName("db") @ObfuscatedGetter( - intValue = -1866562123 + intValue = 551746543 ) - static int titleLoadingStage; - @ObfuscatedName("de") + @Export("hintArrowSubY") + static int hintArrowSubY; + @ObfuscatedName("df") + @ObfuscatedSignature( + descriptor = "Lcd;" + ) + @Export("playerAttackOption") + static AttackOption playerAttackOption; + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Lcd;" + ) + @Export("npcAttackOption") + static AttackOption npcAttackOption; + @ObfuscatedName("dq") @ObfuscatedGetter( - intValue = -1673766287 + intValue = -772944549 ) + @Export("titleLoadingStage") + static int titleLoadingStage; + @ObfuscatedName("dm") + @ObfuscatedGetter( + intValue = -207137197 + ) + @Export("js5ConnectState") static int js5ConnectState; + @ObfuscatedName("dh") + @ObfuscatedGetter( + intValue = -910834387 + ) + static int field794; @ObfuscatedName("da") @ObfuscatedGetter( - intValue = -1209579601 + longValue = 1178443596221129289L ) - static int field712; - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive1; - @ObfuscatedName("ek") + static long field696; + @ObfuscatedName("eh") @ObfuscatedGetter( - intValue = -55276913 + intValue = -85937083 ) + @Export("js5Errors") static int js5Errors; @ObfuscatedName("ep") @ObfuscatedGetter( - intValue = -789394093 + intValue = 474300455 ) + @Export("loginState") static int loginState; - @ObfuscatedName("eg") + @ObfuscatedName("et") @ObfuscatedGetter( - intValue = -600822047 + intValue = 506244731 ) - static int field822; - @ObfuscatedName("eq") + static int field947; + @ObfuscatedName("eu") @ObfuscatedGetter( - intValue = -1163587017 + intValue = 1618145807 ) - static int field708; - @ObfuscatedName("em") + static int field715; + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = 1593310077 + intValue = 764009473 ) - static int field709; - @ObfuscatedName("eh") + static int field716; + @ObfuscatedName("ef") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfz;" ) - static class169 field710; - @ObfuscatedName("ej") - @ObfuscatedGetter( - intValue = -764965423 - ) - static int port1; - @ObfuscatedName("ex") + static class169 field717; + @ObfuscatedName("el") + @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ed") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lct;" ) + @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fq") - static byte[] randomDatData; - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "[Lcw;" - ) - static NPC[] npcs; - @ObfuscatedName("fv") - @ObfuscatedGetter( - intValue = 1098794217 - ) - static int npcCount; - @ObfuscatedName("fz") - static int[] npcIndices; - @ObfuscatedName("fk") - @ObfuscatedGetter( - intValue = -1040652309 - ) - static int field702; - @ObfuscatedName("fe") - static int[] field721; - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "Ldx;" - ) - public static final PacketWriter packetWriter; - @ObfuscatedName("ff") - @ObfuscatedGetter( - intValue = 1553785571 - ) - static int logoutTimer; - @ObfuscatedName("fr") - static boolean field713; - @ObfuscatedName("fi") - static boolean useBufferedSocket; - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "Ljz;" - ) - static Timer timer; @ObfuscatedName("fw") + @Export("randomDatData") + static byte[] randomDatData; + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "[Lca;" + ) + @Export("npcs") + static NPC[] npcs; + @ObfuscatedName("fy") + @ObfuscatedGetter( + intValue = -2146265857 + ) + @Export("npcCount") + static int npcCount; + @ObfuscatedName("ff") + @Export("npcIndices") + static int[] npcIndices; + @ObfuscatedName("fb") + @ObfuscatedGetter( + intValue = -1153230115 + ) + static int field726; + @ObfuscatedName("fv") + static int[] field727; + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "Ldg;" + ) + @Export("packetWriter") + public static final PacketWriter packetWriter; + @ObfuscatedName("fd") + @ObfuscatedGetter( + intValue = 416640201 + ) + @Export("logoutTimer") + static int logoutTimer; + @ObfuscatedName("fe") + static boolean field730; + @ObfuscatedName("fx") + @Export("useBufferedSocket") + static boolean useBufferedSocket; + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "Ljr;" + ) + @Export("timer") + static Timer timer; + @ObfuscatedName("ft") + @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("gj") + @ObfuscatedName("gf") @ObfuscatedGetter( - intValue = -621015009 + intValue = 955711481 ) - static int field728; - @ObfuscatedName("gm") + static int field734; + @ObfuscatedName("gq") @ObfuscatedGetter( - intValue = -1370106321 + intValue = 926514475 ) - static int field711; - @ObfuscatedName("gr") + static int field735; + @ObfuscatedName("gh") @ObfuscatedGetter( - intValue = -814779395 + intValue = 1079386381 ) - static int field895; - @ObfuscatedName("gv") - @ObfuscatedGetter( - intValue = -544516033 - ) - static int field791; - @ObfuscatedName("gw") - @ObfuscatedGetter( - intValue = 1012536071 - ) - static int field732; - @ObfuscatedName("gp") - static boolean isInInstance; - @ObfuscatedName("gt") - static int[][][] instanceChunkTemplates; + static int field848; @ObfuscatedName("gn") - static final int[] field736; - @ObfuscatedName("gu") @ObfuscatedGetter( - intValue = -570359939 + intValue = 28672383 ) static int field737; - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "[Llp;" - ) - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("hh") + @ObfuscatedName("gt") @ObfuscatedGetter( - intValue = 1066075353 + intValue = 1298064441 ) - static int field739; + static int field722; + @ObfuscatedName("gu") + @Export("isInInstance") + static boolean isInInstance; + @ObfuscatedName("gb") + @Export("instanceChunkTemplates") + static int[][][] instanceChunkTemplates; + @ObfuscatedName("gj") + static final int[] field954; + @ObfuscatedName("ga") + @ObfuscatedGetter( + intValue = -1423039985 + ) + static int field743; + @ObfuscatedName("hv") + @ObfuscatedGetter( + intValue = 2098595987 + ) + static int field925; + @ObfuscatedName("hn") + @ObfuscatedGetter( + intValue = -1305614333 + ) + static int field765; + @ObfuscatedName("hq") + @ObfuscatedGetter( + intValue = 1632535067 + ) + static int field746; @ObfuscatedName("hi") @ObfuscatedGetter( - intValue = 41176893 + intValue = 845386571 ) - static int field670; - @ObfuscatedName("hk") - @ObfuscatedGetter( - intValue = -50916181 - ) - static int field741; + static int field747; @ObfuscatedName("hp") - @ObfuscatedGetter( - intValue = 1119037931 - ) - static int field742; - @ObfuscatedName("ht") - static boolean field743; + static boolean field690; @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = -977399091 + intValue = -504309469 ) + @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hs") + @ObfuscatedName("hc") @ObfuscatedGetter( - intValue = -1443068431 + intValue = 694250825 ) + @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hr") + @ObfuscatedName("ha") @ObfuscatedGetter( - intValue = -711285885 + intValue = -1414005751 ) + @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hl") + @ObfuscatedName("hf") @ObfuscatedGetter( - intValue = 1183878553 + intValue = -1795969885 ) + @Export("camAngleDY") static int camAngleDY; @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -1283166721 + intValue = -56354123 ) + @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hm") + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = -759899857 + intValue = 2135930637 ) + @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hw") + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = -1838293597 + intValue = -77775685 ) + @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hy") - @ObfuscatedGetter( - intValue = 170315783 - ) - static int oculusOrbState; - @ObfuscatedName("ia") - @ObfuscatedGetter( - intValue = -1104542973 - ) - static int camFollowHeight; @ObfuscatedName("is") @ObfuscatedGetter( - intValue = 692568591 + intValue = -1649155215 ) - static int field753; - @ObfuscatedName("ig") + @Export("oculusOrbState") + static int oculusOrbState; + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = -1371213621 + intValue = 39732577 ) - static int field796; + @Export("camFollowHeight") + static int camFollowHeight; + @ObfuscatedName("in") + @ObfuscatedGetter( + intValue = 1110148459 + ) + static int field692; @ObfuscatedName("io") @ObfuscatedGetter( - intValue = 1555483319 + intValue = -2023417181 ) - static int field755; - @ObfuscatedName("ip") + static int field759; + @ObfuscatedName("ik") @ObfuscatedGetter( - intValue = 1271248647 + intValue = 2143690291 ) - static int oculusOrbNormalSpeed; + static int field760; @ObfuscatedName("iw") @ObfuscatedGetter( - intValue = -883817203 + intValue = -1776720113 ) - static int oculusOrbSlowedSpeed; - @ObfuscatedName("ii") + @Export("oculusOrbNormalSpeed") + static int oculusOrbNormalSpeed; + @ObfuscatedName("il") @ObfuscatedGetter( - intValue = 1521960939 + intValue = -285231223 ) - static int field758; + @Export("oculusOrbSlowedSpeed") + static int oculusOrbSlowedSpeed; @ObfuscatedName("id") - static boolean field759; - @ObfuscatedName("it") - static String selectedItemName; + @ObfuscatedGetter( + intValue = 1473843199 + ) + static int field763; + @ObfuscatedName("ib") + static boolean field725; @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = -1208339905 + intValue = 1886979431 ) - static int field829; - @ObfuscatedName("ik") - static boolean field761; - @ObfuscatedName("iv") - @ObfuscatedGetter( - intValue = 1611520535 - ) - static int field762; - @ObfuscatedName("ib") - @ObfuscatedGetter( - intValue = 997551691 - ) - static int overheadTextCount; - @ObfuscatedName("ih") - @ObfuscatedGetter( - intValue = -1325247089 - ) - static int overheadTextLimit; - @ObfuscatedName("iu") - static int[] overheadTextXs; - @ObfuscatedName("ie") - static int[] overheadTextYs; + static int field882; @ObfuscatedName("ir") + static boolean field750; + @ObfuscatedName("it") + @Export("selectedItemName") + static String selectedItemName; + @ObfuscatedName("ig") + @ObfuscatedGetter( + intValue = 300729757 + ) + static int field810; + @ObfuscatedName("ij") + @ObfuscatedGetter( + intValue = -735595377 + ) + @Export("overheadTextCount") + static int overheadTextCount; + @ObfuscatedName("if") + @ObfuscatedGetter( + intValue = -251508065 + ) + @Export("overheadTextLimit") + static int overheadTextLimit; + @ObfuscatedName("ie") + @Export("overheadTextXs") + static int[] overheadTextXs; + @ObfuscatedName("ia") + @Export("overheadTextYs") + static int[] overheadTextYs; + @ObfuscatedName("ii") + @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("in") + @ObfuscatedName("iu") + @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; @ObfuscatedName("iy") + @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("il") - static int[] overheadTextEffects; - @ObfuscatedName("jj") - static int[] overheadTextCyclesRemaining; - @ObfuscatedName("jp") - static String[] overheadText; - @ObfuscatedName("jd") - static int[][] tileLastDrawnActor; - @ObfuscatedName("jg") - @ObfuscatedGetter( - intValue = -383835205 - ) - static int viewportDrawCount; - @ObfuscatedName("jq") - @ObfuscatedGetter( - intValue = -22531197 - ) - static int viewportTempX; @ObfuscatedName("ju") - @ObfuscatedGetter( - intValue = -1575851953 - ) - static int viewportTempY; + @Export("overheadTextEffects") + static int[] overheadTextEffects; + @ObfuscatedName("jo") + @Export("overheadTextCyclesRemaining") + static int[] overheadTextCyclesRemaining; + @ObfuscatedName("jd") + @Export("overheadText") + static String[] overheadText; @ObfuscatedName("jx") - @ObfuscatedGetter( - intValue = -693132223 - ) - static int mouseCrossX; - @ObfuscatedName("jt") - @ObfuscatedGetter( - intValue = 1819425115 - ) - static int mouseCrossY; - @ObfuscatedName("jm") - @ObfuscatedGetter( - intValue = -1679326135 - ) - static int mouseCrossState; - @ObfuscatedName("jl") - @ObfuscatedGetter( - intValue = -1707383795 - ) - static int mouseCrossColor; - @ObfuscatedName("jv") - static boolean showMouseCross; - @ObfuscatedName("jb") - @ObfuscatedGetter( - intValue = 505509921 - ) - static int field782; + @Export("tileLastDrawnActor") + static int[][] tileLastDrawnActor; @ObfuscatedName("je") @ObfuscatedGetter( - intValue = 11951309 + intValue = -1171972661 ) - static int field944; - @ObfuscatedName("jw") - @ObfuscatedGetter( - intValue = 526374909 - ) - static int dragItemSlotSource; - @ObfuscatedName("jr") - @ObfuscatedGetter( - intValue = -1126513777 - ) - static int draggedWidgetX; - @ObfuscatedName("ja") - @ObfuscatedGetter( - intValue = -1580012453 - ) - static int draggedWidgetY; + @Export("viewportDrawCount") + static int viewportDrawCount; @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = -1831513887 + intValue = 1986908281 ) - static int dragItemSlotDestination; + @Export("viewportTempX") + static int viewportTempX; @ObfuscatedName("jy") - static boolean field788; - @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = -1995966425 + intValue = 1344112683 ) + @Export("viewportTempY") + static int viewportTempY; + @ObfuscatedName("jn") + @ObfuscatedGetter( + intValue = -1678392525 + ) + @Export("mouseCrossX") + static int mouseCrossX; + @ObfuscatedName("jp") + @ObfuscatedGetter( + intValue = 379363511 + ) + @Export("mouseCrossY") + static int mouseCrossY; + @ObfuscatedName("jg") + @ObfuscatedGetter( + intValue = 2115175527 + ) + @Export("mouseCrossState") + static int mouseCrossState; + @ObfuscatedName("jv") + @ObfuscatedGetter( + intValue = -1792879987 + ) + @Export("mouseCrossColor") + static int mouseCrossColor; + @ObfuscatedName("js") + @Export("showMouseCross") + static boolean showMouseCross; + @ObfuscatedName("jj") + @ObfuscatedGetter( + intValue = 1659427899 + ) + static int field828; + @ObfuscatedName("jb") + @ObfuscatedGetter( + intValue = -1858381215 + ) + static int field788; + @ObfuscatedName("ji") + @ObfuscatedGetter( + intValue = 1955491125 + ) + @Export("dragItemSlotSource") + static int dragItemSlotSource; + @ObfuscatedName("jq") + @ObfuscatedGetter( + intValue = 2107596607 + ) + @Export("draggedWidgetX") + static int draggedWidgetX; + @ObfuscatedName("jm") + @ObfuscatedGetter( + intValue = -1255636543 + ) + @Export("draggedWidgetY") + static int draggedWidgetY; + @ObfuscatedName("jl") + @ObfuscatedGetter( + intValue = 1843538815 + ) + @Export("dragItemSlotDestination") + static int dragItemSlotDestination; + @ObfuscatedName("jw") + static boolean field830; + @ObfuscatedName("jr") + @ObfuscatedGetter( + intValue = 1543846117 + ) + @Export("itemDragDuration") static int itemDragDuration; @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = -331224419 + intValue = 1665596697 ) - static int field790; - @ObfuscatedName("jn") + static int field795; + @ObfuscatedName("jz") + @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ka") + @ObfuscatedName("ku") @ObfuscatedSignature( - descriptor = "[Lbf;" + descriptor = "[Lbi;" ) + @Export("players") static Player[] players; - @ObfuscatedName("ko") - @ObfuscatedGetter( - intValue = -1852431749 - ) - static int localPlayerIndex; - @ObfuscatedName("kp") - @ObfuscatedGetter( - intValue = 648141605 - ) - static int field888; - @ObfuscatedName("kw") - static boolean renderSelf; - @ObfuscatedName("kh") - @ObfuscatedGetter( - intValue = -1302257309 - ) - static int drawPlayerNames; - @ObfuscatedName("kt") - @ObfuscatedGetter( - intValue = 157805175 - ) - static int field771; - @ObfuscatedName("ks") - static int[] field930; - @ObfuscatedName("kd") - static final int[] playerMenuOpcodes; - @ObfuscatedName("kz") - static String[] playerMenuActions; @ObfuscatedName("kl") - static boolean[] playerOptionsPriorities; - @ObfuscatedName("kv") - static int[] defaultRotations; - @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = 1152347413 + intValue = 1876036055 ) - static int combatTargetPlayerIndex; - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "[[[Lji;" + @Export("localPlayerIndex") + static int localPlayerIndex; + @ObfuscatedName("ka") + @ObfuscatedGetter( + intValue = -651069671 ) - static NodeDeque[][][] groundItems; - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "Lji;" + static int field799; + @ObfuscatedName("kd") + @Export("renderSelf") + static boolean renderSelf; + @ObfuscatedName("kx") + @ObfuscatedGetter( + intValue = 1408541917 ) - static NodeDeque pendingSpawns; + @Export("drawPlayerNames") + static int drawPlayerNames; + @ObfuscatedName("kg") + @ObfuscatedGetter( + intValue = 725006111 + ) + static int field802; + @ObfuscatedName("kf") + static int[] field803; + @ObfuscatedName("kr") + @Export("playerMenuOpcodes") + static final int[] playerMenuOpcodes; + @ObfuscatedName("ko") + @Export("playerMenuActions") + static String[] playerMenuActions; + @ObfuscatedName("kn") + @Export("playerOptionsPriorities") + static boolean[] playerOptionsPriorities; + @ObfuscatedName("kc") + @Export("defaultRotations") + static int[] defaultRotations; @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "Lji;" + @ObfuscatedGetter( + intValue = -1515987941 ) - static NodeDeque projectiles; + @Export("combatTargetPlayerIndex") + static int combatTargetPlayerIndex; @ObfuscatedName("ky") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "[[[Lja;" ) + @Export("groundItems") + static NodeDeque[][][] groundItems; + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + @Export("pendingSpawns") + static NodeDeque pendingSpawns; + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + @Export("projectiles") + static NodeDeque projectiles; + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kf") + @ObfuscatedName("kb") + @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kn") + @ObfuscatedName("kh") + @Export("levels") static int[] levels; - @ObfuscatedName("kg") + @ObfuscatedName("ln") + @Export("experience") static int[] experience; - @ObfuscatedName("li") + @ObfuscatedName("lj") @ObfuscatedGetter( - intValue = -475626583 + intValue = 1331910575 ) + @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("ll") - static boolean isMenuOpen; - @ObfuscatedName("lk") - @ObfuscatedGetter( - intValue = 366838629 - ) - static int menuY; - @ObfuscatedName("ld") - @ObfuscatedGetter( - intValue = 1781251597 - ) - static int menuOptionsCount; - @ObfuscatedName("la") - static int[] menuArguments1; - @ObfuscatedName("lb") - static int[] menuArguments2; - @ObfuscatedName("ly") - static int[] menuOpcodes; - @ObfuscatedName("lt") - static int[] menuIdentifiers; @ObfuscatedName("lg") - static String[] menuActions; - @ObfuscatedName("lq") - static String[] menuTargets; + @Export("isMenuOpen") + static boolean isMenuOpen; + @ObfuscatedName("lb") + @ObfuscatedGetter( + intValue = -315201447 + ) + @Export("menuOptionsCount") + static int menuOptionsCount; + @ObfuscatedName("lk") + @Export("menuArguments1") + static int[] menuArguments1; @ObfuscatedName("lo") - static boolean[] menuShiftClick; - @ObfuscatedName("lc") - static boolean followerOpsLowPriority; - @ObfuscatedName("lu") - static boolean shiftClickDrop; - @ObfuscatedName("lv") - static boolean tapToDrop; - @ObfuscatedName("lw") - static boolean showMouseOverText; - @ObfuscatedName("lm") - @ObfuscatedGetter( - intValue = 2121046681 - ) - static int viewportX; - @ObfuscatedName("ls") - @ObfuscatedGetter( - intValue = -116000717 - ) - static int viewportY; + @Export("menuArguments2") + static int[] menuArguments2; @ObfuscatedName("lh") + @Export("menuOpcodes") + static int[] menuOpcodes; + @ObfuscatedName("lr") + @Export("menuIdentifiers") + static int[] menuIdentifiers; + @ObfuscatedName("la") + @Export("menuActions") + static String[] menuActions; + @ObfuscatedName("ll") + @Export("menuTargets") + static String[] menuTargets; + @ObfuscatedName("ls") + @Export("menuShiftClick") + static boolean[] menuShiftClick; + @ObfuscatedName("lp") + @Export("followerOpsLowPriority") + static boolean followerOpsLowPriority; + @ObfuscatedName("lf") + @Export("shiftClickDrop") + static boolean shiftClickDrop; + @ObfuscatedName("lm") + @Export("tapToDrop") + static boolean tapToDrop; + @ObfuscatedName("ly") + @Export("showMouseOverText") + static boolean showMouseOverText; + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = 1628287905 + intValue = -689178451 ) - static int field828; - @ObfuscatedName("mf") + @Export("viewportX") + static int viewportX; + @ObfuscatedName("le") @ObfuscatedGetter( - intValue = -1310390487 + intValue = -1951728151 ) - static int field770; - @ObfuscatedName("mo") + @Export("viewportY") + static int viewportY; + @ObfuscatedName("mh") @ObfuscatedGetter( - intValue = -1061875105 + intValue = 812853429 ) + static int field832; + @ObfuscatedName("mx") + @ObfuscatedGetter( + intValue = -2049020101 + ) + static int field833; + @ObfuscatedName("my") + @ObfuscatedGetter( + intValue = 1700020883 + ) + @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("md") - static boolean isSpellSelected; @ObfuscatedName("ma") + @Export("isSpellSelected") + static boolean isSpellSelected; + @ObfuscatedName("mw") @ObfuscatedGetter( - intValue = -1613408879 + intValue = -718961001 ) + @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mc") + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = -1738766663 + intValue = 2082291921 ) - static int field834; - @ObfuscatedName("mp") + static int field838; + @ObfuscatedName("mo") + @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mu") + @ObfuscatedName("mc") + @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mi") + @ObfuscatedName("mn") @ObfuscatedGetter( - intValue = -1035655229 + intValue = -906778899 ) + @Export("rootInterface") static int rootInterface; - @ObfuscatedName("mg") + @ObfuscatedName("mm") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Llp;" ) + @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("el") + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkb;" ) - Buffer field754; - @ObfuscatedName("ea") + Buffer field720; + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lt;" ) - class9 field714; + class9 field721; static { - field841 = true; // L: 183 + field772 = true; // L: 183 worldId = 1; // L: 184 worldProperties = 0; // L: 185 gameBuild = 0; // L: 187 isMembersWorld = false; // L: 190 isLowDetail = false; // L: 191 clientType = -1; // L: 196 - onMobile = false; // L: 197 - gameState = 0; // L: 198 - isLoading = true; // L: 219 - cycle = 0; // L: 220 - mouseLastLastPressedTimeMillis = -1L; // L: 221 - field798 = -1; // L: 223 - field686 = -1; // L: 224 - field687 = -1L; // L: 225 - hadFocus = true; // L: 226 - displayFps = false; // L: 227 - rebootTimer = 0; // L: 228 - hintArrowType = 0; // L: 229 - hintArrowNpcIndex = 0; // L: 230 - hintArrowPlayerIndex = 0; // L: 231 - hintArrowX = 0; // L: 232 - hintArrowY = 0; // L: 233 - hintArrowHeight = 0; // L: 234 - hintArrowSubX = 0; // L: 235 - hintArrowSubY = 0; // L: 236 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 238 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 239 - titleLoadingStage = 0; // L: 241 - js5ConnectState = 0; // L: 244 - field712 = 0; // L: 245 - js5Errors = 0; // L: 267 - loginState = 0; // L: 269 - field822 = 0; // L: 270 - field708 = 0; // L: 271 - field709 = 0; // L: 272 - field710 = class169.field2043; // L: 273 - Login_isUsernameRemembered = false; // L: 282 - secureRandomFuture = new SecureRandomFuture(); // L: 283 - randomDatData = null; // L: 288 - npcs = new NPC[32768]; // L: 292 - npcCount = 0; // L: 293 - npcIndices = new int[32768]; // L: 294 - field702 = 0; // L: 295 - field721 = new int[250]; // L: 296 - packetWriter = new PacketWriter(); // L: 299 - logoutTimer = 0; // L: 301 - field713 = false; // L: 302 - useBufferedSocket = true; // L: 303 - timer = new Timer(); // L: 304 - fontsMap = new HashMap(); // L: 310 - field728 = 0; // L: 317 - field711 = 1; // L: 318 - field895 = 0; // L: 319 - field791 = 1; // L: 320 - field732 = 0; // L: 321 - collisionMaps = new CollisionMap[4]; // L: 329 - isInInstance = false; // L: 330 - instanceChunkTemplates = new int[4][13][13]; // L: 331 - field736 = 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}; // L: 332 - field737 = 0; // L: 335 - field739 = 2301979; // L: 347 - field670 = 5063219; // L: 348 - field741 = 3353893; // L: 349 - field742 = 7759444; // L: 350 - field743 = false; // L: 351 - alternativeScrollbarWidth = 0; // L: 352 - camAngleX = 128; // L: 360 - camAngleY = 0; // L: 361 - camAngleDY = 0; // L: 362 - camAngleDX = 0; // L: 363 - mouseCamClickedX = 0; // L: 364 - mouseCamClickedY = 0; // L: 365 - oculusOrbState = 0; // L: 366 - camFollowHeight = 50; // L: 367 - field753 = 0; // L: 371 - field796 = 0; // L: 372 - field755 = 0; // L: 373 - oculusOrbNormalSpeed = 12; // L: 375 - oculusOrbSlowedSpeed = 6; // L: 376 - field758 = 0; // L: 377 - field759 = false; // L: 378 - field829 = 0; // L: 379 - field761 = false; // L: 380 - field762 = 0; // L: 381 - overheadTextCount = 0; // L: 382 - overheadTextLimit = 50; // L: 383 - overheadTextXs = new int[overheadTextLimit]; // L: 384 - overheadTextYs = new int[overheadTextLimit]; // L: 385 - overheadTextAscents = new int[overheadTextLimit]; // L: 386 - overheadTextXOffsets = new int[overheadTextLimit]; // L: 387 - overheadTextColors = new int[overheadTextLimit]; // L: 388 - overheadTextEffects = new int[overheadTextLimit]; // L: 389 - overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 390 - overheadText = new String[overheadTextLimit]; // L: 391 - tileLastDrawnActor = new int[104][104]; // L: 392 - viewportDrawCount = 0; // L: 393 - viewportTempX = -1; // L: 394 - viewportTempY = -1; // L: 395 - mouseCrossX = 0; // L: 396 - mouseCrossY = 0; // L: 397 - mouseCrossState = 0; // L: 398 - mouseCrossColor = 0; // L: 399 - showMouseCross = true; // L: 400 - field782 = 0; // L: 402 - field944 = 0; // L: 403 - dragItemSlotSource = 0; // L: 406 - draggedWidgetX = 0; // L: 407 - draggedWidgetY = 0; // L: 408 - dragItemSlotDestination = 0; // L: 409 - field788 = false; // L: 410 - itemDragDuration = 0; // L: 411 - field790 = 0; // L: 412 - showLoadingMessages = true; // L: 414 - players = new Player[2048]; // L: 416 - localPlayerIndex = -1; // L: 418 - field888 = 0; // L: 419 - renderSelf = true; // L: 421 - drawPlayerNames = 0; // L: 426 - field771 = 0; // L: 427 - field930 = new int[1000]; // L: 428 - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 430 - playerMenuActions = new String[8]; // L: 431 - playerOptionsPriorities = new boolean[8]; // L: 432 - defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 433 - combatTargetPlayerIndex = -1; // L: 434 - groundItems = new NodeDeque[4][104][104]; // L: 435 - pendingSpawns = new NodeDeque(); // L: 436 - projectiles = new NodeDeque(); // L: 437 - graphicsObjects = new NodeDeque(); // L: 438 - currentLevels = new int[25]; // L: 439 - levels = new int[25]; // L: 440 - experience = new int[25]; // L: 441 - leftClickOpensMenu = 0; // L: 442 - isMenuOpen = false; // L: 443 - menuOptionsCount = 0; // L: 449 - menuArguments1 = new int[500]; // L: 450 - menuArguments2 = new int[500]; // L: 451 - menuOpcodes = new int[500]; // L: 452 - menuIdentifiers = new int[500]; // L: 453 - menuActions = new String[500]; // L: 454 - menuTargets = new String[500]; // L: 455 - menuShiftClick = new boolean[500]; // L: 456 - followerOpsLowPriority = false; // L: 457 - shiftClickDrop = false; // L: 459 - tapToDrop = false; // L: 460 - showMouseOverText = true; // L: 461 - viewportX = -1; // L: 462 - viewportY = -1; // L: 463 - field828 = 0; // L: 467 - field770 = 50; // L: 468 - isItemSelected = 0; // L: 469 - selectedItemName = null; // L: 473 - isSpellSelected = false; // L: 474 - selectedSpellChildIndex = -1; // L: 476 - field834 = -1; // L: 477 - selectedSpellActionName = null; // L: 479 - selectedSpellName = null; // L: 480 - rootInterface = -1; // L: 481 - interfaceParents = new NodeHashTable(8); // L: 482 - field865 = 0; // L: 487 - field840 = -1; // L: 488 - chatEffects = 0; // L: 489 - field707 = 0; // L: 490 - meslayerContinueWidget = null; // L: 491 - runEnergy = 0; // L: 492 - weight = 0; // L: 493 - staffModLevel = 0; // L: 494 - followerIndex = -1; // L: 495 - playerMod = false; // L: 496 - viewportWidget = null; // L: 497 - clickedWidget = null; // L: 498 - clickedWidgetParent = null; // L: 499 - widgetClickX = 0; // L: 500 - widgetClickY = 0; // L: 501 - draggedOnWidget = null; // L: 502 - field799 = false; // L: 503 - field856 = -1; // L: 504 - field785 = -1; // L: 505 - field880 = false; // L: 506 - field859 = -1; // L: 507 - field795 = -1; // L: 508 - isDraggingWidget = false; // L: 509 - cycleCntr = 1; // L: 514 - field863 = new int[32]; // L: 517 - field864 = 0; // L: 518 - changedItemContainers = new int[32]; // L: 519 - field903 = 0; // L: 520 - changedSkills = new int[32]; // L: 521 - changedSkillsCount = 0; // L: 522 - chatCycle = 0; // L: 523 - field870 = 0; // L: 524 - field871 = 0; // L: 525 - field872 = 0; // L: 526 - field873 = 0; // L: 527 - field775 = 0; // L: 528 - mouseWheelRotation = 0; // L: 531 - scriptEvents = new NodeDeque(); // L: 532 - field877 = new NodeDeque(); // L: 533 - field912 = new NodeDeque(); // L: 534 - widgetFlags = new NodeHashTable(512); // L: 535 - rootWidgetCount = 0; // L: 537 - field881 = -2; // L: 538 - field882 = new boolean[100]; // L: 539 - field883 = new boolean[100]; // L: 540 - field884 = new boolean[100]; // L: 541 - rootWidgetXs = new int[100]; // L: 542 - rootWidgetYs = new int[100]; // L: 543 - rootWidgetWidths = new int[100]; // L: 544 - rootWidgetHeights = new int[100]; // L: 545 - gameDrawingMode = 0; // L: 546 - field890 = 0L; // L: 547 - isResizable = true; // L: 548 - field892 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 555 - publicChatMode = 0; // L: 556 - tradeChatMode = 0; // L: 558 - field913 = ""; // L: 559 - field896 = new long[100]; // L: 561 - field794 = 0; // L: 562 - field898 = 0; // L: 564 - field899 = new int[128]; // L: 565 - field900 = new int[128]; // L: 566 - field901 = -1L; // L: 567 - field902 = -1; // L: 570 - mapIconCount = 0; // L: 571 - mapIconXs = new int[1000]; // L: 572 - mapIconYs = new int[1000]; // L: 573 - mapIcons = new Sprite[1000]; // L: 574 - destinationX = 0; // L: 575 - destinationY = 0; // L: 576 - minimapState = 0; // L: 583 - musicVolume = 255; // L: 584 - currentTrackGroupId = -1; // L: 585 - field704 = false; // L: 586 - soundEffectVolume = 127; // L: 588 - areaSoundEffectVolume = 127; // L: 589 - soundEffectCount = 0; // L: 594 - soundEffectIds = new int[50]; // L: 595 - queuedSoundEffectLoops = new int[50]; // L: 596 - queuedSoundEffectDelays = new int[50]; // L: 597 - soundLocations = new int[50]; // L: 598 - soundEffects = new SoundEffect[50]; // L: 599 - isCameraLocked = false; // L: 601 - field922 = new boolean[5]; // L: 613 - field678 = new int[5]; // L: 614 - field740 = new int[5]; // L: 615 - field925 = new int[5]; // L: 616 - field926 = new int[5]; // L: 617 - field769 = 256; // L: 618 - field928 = 205; // L: 619 - zoomHeight = 256; // L: 620 - zoomWidth = 320; // L: 621 - field931 = 1; // L: 622 - field932 = 32767; // L: 623 - field938 = 1; // L: 624 - field934 = 32767; // L: 625 - viewportOffsetX = 0; // L: 626 - viewportOffsetY = 0; // L: 627 - viewportWidth = 0; // L: 628 - viewportHeight = 0; // L: 629 - viewportZoom = 0; // L: 630 - playerAppearance = new PlayerAppearance(); // L: 632 - field937 = -1; // L: 633 - field942 = -1; // L: 634 - platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 636 - grandExchangeOffers = new GrandExchangeOffer[8]; // L: 638 - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 641 - field946 = -1; // L: 648 - archiveLoaders = new ArrayList(10); // L: 649 - archiveLoadersDone = 0; // L: 650 - field949 = 0; // L: 651 - field950 = new ApproximateRouteStrategy(); // L: 660 - field830 = new int[50]; // L: 661 - field952 = new int[50]; // L: 662 + field686 = -1; // L: 197 + onMobile = false; // L: 198 + gameState = 0; // L: 199 + isLoading = true; // L: 220 + cycle = 0; // L: 221 + mouseLastLastPressedTimeMillis = -1L; // L: 222 + field719 = -1; // L: 224 + field693 = -1; // L: 225 + field694 = -1L; // L: 226 + hadFocus = true; // L: 227 + displayFps = false; // L: 228 + rebootTimer = 0; // L: 229 + hintArrowType = 0; // L: 230 + hintArrowNpcIndex = 0; // L: 231 + hintArrowPlayerIndex = 0; // L: 232 + hintArrowX = 0; // L: 233 + hintArrowY = 0; // L: 234 + hintArrowHeight = 0; // L: 235 + hintArrowSubX = 0; // L: 236 + hintArrowSubY = 0; // L: 237 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 239 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 240 + titleLoadingStage = 0; // L: 242 + js5ConnectState = 0; // L: 245 + field794 = 0; // L: 246 + js5Errors = 0; // L: 268 + loginState = 0; // L: 270 + field947 = 0; // L: 271 + field715 = 0; // L: 272 + field716 = 0; // L: 273 + field717 = class169.field2028; // L: 274 + Login_isUsernameRemembered = false; // L: 283 + secureRandomFuture = new SecureRandomFuture(); // L: 284 + randomDatData = null; // L: 289 + npcs = new NPC[32768]; // L: 293 + npcCount = 0; // L: 294 + npcIndices = new int[32768]; // L: 295 + field726 = 0; // L: 296 + field727 = new int[250]; // L: 297 + packetWriter = new PacketWriter(); // L: 300 + logoutTimer = 0; // L: 302 + field730 = false; // L: 303 + useBufferedSocket = true; // L: 304 + timer = new Timer(); // L: 305 + fontsMap = new HashMap(); // L: 311 + field734 = 0; // L: 318 + field735 = 1; // L: 319 + field848 = 0; // L: 320 + field737 = 1; // L: 321 + field722 = 0; // L: 322 + collisionMaps = new CollisionMap[4]; // L: 330 + isInInstance = false; // L: 331 + instanceChunkTemplates = new int[4][13][13]; // L: 332 + field954 = 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}; // L: 333 + field743 = 0; // L: 336 + field925 = 2301979; // L: 348 + field765 = 5063219; // L: 349 + field746 = 3353893; // L: 350 + field747 = 7759444; // L: 351 + field690 = false; // L: 352 + alternativeScrollbarWidth = 0; // L: 353 + camAngleX = 128; // L: 361 + camAngleY = 0; // L: 362 + camAngleDY = 0; // L: 363 + camAngleDX = 0; // L: 364 + mouseCamClickedX = 0; // L: 365 + mouseCamClickedY = 0; // L: 366 + oculusOrbState = 0; // L: 367 + camFollowHeight = 50; // L: 368 + field692 = 0; // L: 372 + field759 = 0; // L: 373 + field760 = 0; // L: 374 + oculusOrbNormalSpeed = 12; // L: 376 + oculusOrbSlowedSpeed = 6; // L: 377 + field763 = 0; // L: 378 + field725 = false; // L: 379 + field882 = 0; // L: 380 + field750 = false; // L: 381 + field810 = 0; // L: 382 + overheadTextCount = 0; // L: 383 + overheadTextLimit = 50; // L: 384 + overheadTextXs = new int[overheadTextLimit]; // L: 385 + overheadTextYs = new int[overheadTextLimit]; // L: 386 + overheadTextAscents = new int[overheadTextLimit]; // L: 387 + overheadTextXOffsets = new int[overheadTextLimit]; // L: 388 + overheadTextColors = new int[overheadTextLimit]; // L: 389 + overheadTextEffects = new int[overheadTextLimit]; // L: 390 + overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 391 + overheadText = new String[overheadTextLimit]; // L: 392 + tileLastDrawnActor = new int[104][104]; // L: 393 + viewportDrawCount = 0; // L: 394 + viewportTempX = -1; // L: 395 + viewportTempY = -1; // L: 396 + mouseCrossX = 0; // L: 397 + mouseCrossY = 0; // L: 398 + mouseCrossState = 0; // L: 399 + mouseCrossColor = 0; // L: 400 + showMouseCross = true; // L: 401 + field828 = 0; // L: 403 + field788 = 0; // L: 404 + dragItemSlotSource = 0; // L: 407 + draggedWidgetX = 0; // L: 408 + draggedWidgetY = 0; // L: 409 + dragItemSlotDestination = 0; // L: 410 + field830 = false; // L: 411 + itemDragDuration = 0; // L: 412 + field795 = 0; // L: 413 + showLoadingMessages = true; // L: 415 + players = new Player[2048]; // L: 417 + localPlayerIndex = -1; // L: 419 + field799 = 0; // L: 420 + renderSelf = true; // L: 422 + drawPlayerNames = 0; // L: 427 + field802 = 0; // L: 428 + field803 = new int[1000]; // L: 429 + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 431 + playerMenuActions = new String[8]; // L: 432 + playerOptionsPriorities = new boolean[8]; // L: 433 + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 434 + combatTargetPlayerIndex = -1; // L: 435 + groundItems = new NodeDeque[4][104][104]; // L: 436 + pendingSpawns = new NodeDeque(); // L: 437 + projectiles = new NodeDeque(); // L: 438 + graphicsObjects = new NodeDeque(); // L: 439 + currentLevels = new int[25]; // L: 440 + levels = new int[25]; // L: 441 + experience = new int[25]; // L: 442 + leftClickOpensMenu = 0; // L: 443 + isMenuOpen = false; // L: 444 + menuOptionsCount = 0; // L: 450 + menuArguments1 = new int[500]; // L: 451 + menuArguments2 = new int[500]; // L: 452 + menuOpcodes = new int[500]; // L: 453 + menuIdentifiers = new int[500]; // L: 454 + menuActions = new String[500]; // L: 455 + menuTargets = new String[500]; // L: 456 + menuShiftClick = new boolean[500]; // L: 457 + followerOpsLowPriority = false; // L: 458 + shiftClickDrop = false; // L: 460 + tapToDrop = false; // L: 461 + showMouseOverText = true; // L: 462 + viewportX = -1; // L: 463 + viewportY = -1; // L: 464 + field832 = 0; // L: 468 + field833 = 50; // L: 469 + isItemSelected = 0; // L: 470 + selectedItemName = null; // L: 474 + isSpellSelected = false; // L: 475 + selectedSpellChildIndex = -1; // L: 477 + field838 = -1; // L: 478 + selectedSpellActionName = null; // L: 480 + selectedSpellName = null; // L: 481 + rootInterface = -1; // L: 482 + interfaceParents = new NodeHashTable(8); // L: 483 + field843 = 0; // L: 488 + field844 = -1; // L: 489 + chatEffects = 0; // L: 490 + field846 = 0; // L: 491 + meslayerContinueWidget = null; // L: 492 + runEnergy = 0; // L: 493 + weight = 0; // L: 494 + staffModLevel = 0; // L: 495 + followerIndex = -1; // L: 496 + playerMod = false; // L: 497 + viewportWidget = null; // L: 498 + clickedWidget = null; // L: 499 + clickedWidgetParent = null; // L: 500 + widgetClickX = 0; // L: 501 + widgetClickY = 0; // L: 502 + draggedOnWidget = null; // L: 503 + field859 = false; // L: 504 + field860 = -1; // L: 505 + field861 = -1; // L: 506 + field705 = false; // L: 507 + field931 = -1; // L: 508 + field701 = -1; // L: 509 + isDraggingWidget = false; // L: 510 + cycleCntr = 1; // L: 515 + field867 = new int[32]; // L: 518 + field868 = 0; // L: 519 + changedItemContainers = new int[32]; // L: 520 + field941 = 0; // L: 521 + changedSkills = new int[32]; // L: 522 + changedSkillsCount = 0; // L: 523 + chatCycle = 0; // L: 524 + field874 = 0; // L: 525 + field875 = 0; // L: 526 + field885 = 0; // L: 527 + field852 = 0; // L: 528 + field878 = 0; // L: 529 + mouseWheelRotation = 0; // L: 532 + scriptEvents = new NodeDeque(); // L: 533 + field881 = new NodeDeque(); // L: 534 + field939 = new NodeDeque(); // L: 535 + widgetFlags = new NodeHashTable(512); // L: 536 + rootWidgetCount = 0; // L: 538 + field748 = -2; // L: 539 + field834 = new boolean[100]; // L: 540 + field758 = new boolean[100]; // L: 541 + field745 = new boolean[100]; // L: 542 + rootWidgetXs = new int[100]; // L: 543 + rootWidgetYs = new int[100]; // L: 544 + rootWidgetWidths = new int[100]; // L: 545 + rootWidgetHeights = new int[100]; // L: 546 + gameDrawingMode = 0; // L: 547 + field879 = 0L; // L: 548 + isResizable = true; // L: 549 + field896 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 556 + publicChatMode = 0; // L: 557 + tradeChatMode = 0; // L: 559 + field710 = ""; // L: 560 + field900 = new long[100]; // L: 562 + field901 = 0; // L: 563 + field902 = 0; // L: 565 + field903 = new int[128]; // L: 566 + field904 = new int[128]; // L: 567 + field905 = -1L; // L: 568 + field906 = -1; // L: 571 + mapIconCount = 0; // L: 572 + mapIconXs = new int[1000]; // L: 573 + mapIconYs = new int[1000]; // L: 574 + mapIcons = new Sprite[1000]; // L: 575 + destinationX = 0; // L: 576 + destinationY = 0; // L: 577 + minimapState = 0; // L: 584 + musicVolume = 255; // L: 585 + currentTrackGroupId = -1; // L: 586 + field916 = false; // L: 587 + soundEffectVolume = 127; // L: 589 + areaSoundEffectVolume = 127; // L: 590 + soundEffectCount = 0; // L: 595 + soundEffectIds = new int[50]; // L: 596 + queuedSoundEffectLoops = new int[50]; // L: 597 + queuedSoundEffectDelays = new int[50]; // L: 598 + soundLocations = new int[50]; // L: 599 + soundEffects = new SoundEffect[50]; // L: 600 + isCameraLocked = false; // L: 602 + field926 = new boolean[5]; // L: 614 + field927 = new int[5]; // L: 615 + field928 = new int[5]; // L: 616 + field898 = new int[5]; // L: 617 + field918 = new int[5]; // L: 618 + field873 = 256; // L: 619 + field932 = 205; // L: 620 + zoomHeight = 256; // L: 621 + zoomWidth = 320; // L: 622 + field865 = 1; // L: 623 + field753 = 32767; // L: 624 + field937 = 1; // L: 625 + field935 = 32767; // L: 626 + viewportOffsetX = 0; // L: 627 + viewportOffsetY = 0; // L: 628 + viewportWidth = 0; // L: 629 + viewportHeight = 0; // L: 630 + viewportZoom = 0; // L: 631 + playerAppearance = new PlayerAppearance(); // L: 633 + field945 = -1; // L: 634 + field895 = -1; // L: 635 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 637 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 639 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 642 + field950 = -1; // L: 649 + archiveLoaders = new ArrayList(10); // L: 650 + archiveLoadersDone = 0; // L: 651 + field953 = 0; // L: 652 + field877 = new ApproximateRouteStrategy(); // L: 661 + field695 = new int[50]; // L: 662 + field956 = new int[50]; // L: 663 } - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "912814062" + garbageValue = "-1977357922" ) + @Export("resizeGame") protected final void resizeGame() { - field890 = PacketWriter.currentTimeMillis() + 500L; // L: 3888 - this.resizeJS(); // L: 3889 - if (rootInterface != -1) { // L: 3890 + field879 = User.currentTimeMillis() + 500L; // L: 4226 + this.resizeJS(); // L: 4227 + if (rootInterface != -1) { // L: 4228 this.resizeRoot(true); } - } // L: 3891 + } // L: 4229 - @ObfuscatedName("ar") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1974240025" + garbageValue = "1060461771" ) + @Export("setUp") protected final void setUp() { - class277.method5089(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 784 - port1 = gameBuild == 0 ? 43594 : worldId + 40000; // L: 785 - class23.port2 = gameBuild == 0 ? 443 : worldId + 50000; // L: 786 - WorldMapScaleHandler.port3 = port1; // L: 787 - Calendar.field2535 = class224.field2587; // L: 788 - WorldMapSprite.field253 = class224.field2589; // L: 789 - GrandExchangeOfferTotalQuantityComparator.field83 = class224.field2584; // L: 790 - UserComparator7.field2021 = class224.field2586; // L: 791 - UserComparator4.urlRequester = new UrlRequester(); // L: 792 - this.setUpKeyboard(); // L: 793 - this.setUpMouse(); // L: 794 - Player.mouseWheel = this.mouseWheel(); // L: 795 - Skeleton.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 796 - AccessFile var2 = null; // L: 799 - ClientPreferences var3 = new ClientPreferences(); // L: 800 + FaceNormal.method3392(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 798 + Coord.port1 = gameBuild == 0 ? 43594 : worldId + 40000; // L: 799 + Coord.port2 = gameBuild == 0 ? 443 : worldId + 50000; // L: 800 + class41.port3 = Coord.port1; // L: 801 + PlayerAppearance.field2559 = class224.field2570; // L: 802 + MouseRecorder.field628 = class224.field2573; // L: 803 + FriendLoginUpdate.field3671 = class224.field2571; // L: 804 + MusicPatchPcmStream.field2516 = class224.field2572; // L: 805 + class52.urlRequester = new UrlRequester(); // L: 806 + this.setUpKeyboard(); // L: 807 + this.setUpMouse(); // L: 808 + class8.mouseWheel = this.mouseWheel(); // L: 809 + GrandExchangeOfferWorldComparator.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 810 + AccessFile var2 = null; // L: 813 + ClientPreferences var3 = new ClientPreferences(); // L: 814 try { - var2 = class2.getPreferencesFile("", Tiles.field532.name, false); // L: 802 - byte[] var4 = new byte[(int)var2.length()]; // L: 803 + var2 = WorldMapID.getPreferencesFile("", GrandExchangeOfferWorldComparator.field58.name, false); // L: 816 + byte[] var4 = new byte[(int)var2.length()]; // L: 817 int var6; - for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 804 805 808 - var6 = var2.read(var4, var5, var4.length - var5); // L: 806 - if (var6 == -1) { // L: 807 + for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 818 819 822 + var6 = var2.read(var4, var5, var4.length - var5); // L: 820 + if (var6 == -1) { // L: 821 throw new IOException(); } } - var3 = new ClientPreferences(new Buffer(var4)); // L: 810 - } catch (Exception var8) { // L: 812 + var3 = new ClientPreferences(new Buffer(var4)); // L: 824 + } catch (Exception var8) { // L: 826 } try { - if (var2 != null) { // L: 814 + if (var2 != null) { // L: 828 var2.close(); } - } catch (Exception var7) { // L: 816 + } catch (Exception var7) { // L: 830 } - Tile.clientPreferences = var3; // L: 819 - this.setUpClipboard(); // L: 820 - VarbitDefinition.method4593(this, class60.null_string); // L: 821 - if (gameBuild != 0) { // L: 822 + GrandExchangeOfferAgeComparator.clientPreferences = var3; // L: 833 + this.setUpClipboard(); // L: 834 + String var9 = PendingSpawn.null_string; // L: 836 + class60.applet = this; // L: 838 + if (var9 != null) { // L: 839 + class60.field453 = var9; + } + + if (gameBuild != 0) { // L: 841 displayFps = true; } - FontName.setWindowedMode(Tile.clientPreferences.windowMode); // L: 823 - class60.friendSystem = new FriendSystem(WorldMapAreaData.loginType); // L: 824 - } // L: 825 + class277.setWindowedMode(GrandExchangeOfferAgeComparator.clientPreferences.windowMode); // L: 842 + WorldMapLabelSize.friendSystem = new FriendSystem(UserComparator4.loginType); // L: 843 + } // L: 844 - @ObfuscatedName("at") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-720509728" + garbageValue = "1100660042" ) + @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 828 - this.doCycleJs5(); // L: 829 - class58.method907(); // L: 830 - GraphicsObject.method2095(); // L: 831 - RouteStrategy.playPcmPlayers(); // L: 832 - int var2; - synchronized(KeyHandler.KeyHandler_instance) { // L: 834 - ++KeyHandler.KeyHandler_idleCycles; // L: 835 - KeyHandler.field423 = KeyHandler.field399; // L: 836 - KeyHandler.field422 = 0; // L: 837 - if (KeyHandler.field418 >= 0) { // L: 838 - while (KeyHandler.field418 != KeyHandler.field417) { // L: 843 - var2 = KeyHandler.field409[KeyHandler.field417]; // L: 844 - KeyHandler.field417 = KeyHandler.field417 + 1 & 127; // L: 845 - if (var2 < 0) { // L: 846 - KeyHandler.KeyHandler_pressedKeys[~var2] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field422 < KeyHandler.field421.length - 1) { // L: 848 - KeyHandler.field421[++KeyHandler.field422 - 1] = var2; // L: 849 - } + ++cycle; // L: 847 + this.doCycleJs5(); // L: 848 - KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 851 - } - } - } else { - for (var2 = 0; var2 < 112; ++var2) { // L: 839 - KeyHandler.KeyHandler_pressedKeys[var2] = false; - } + while (true) { + ArchiveDiskAction var1; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 852 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 853 + } // L: 854 - KeyHandler.field418 = KeyHandler.field417; // L: 840 - } - - if (KeyHandler.field422 > 0) { // L: 855 - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field399 = KeyHandler.field424; // L: 856 - } - - WallDecoration.method3409(); // L: 859 - if (Player.mouseWheel != null) { // L: 860 - int var43 = Player.mouseWheel.useRotation(); // L: 861 - mouseWheelRotation = var43; // L: 862 - } - - if (gameState == 0) { // L: 864 - class3.load(); // L: 865 - WorldMapLabel.method498(); // L: 866 - } else if (gameState == 5) { // L: 868 - class3.doCycleTitle(this); // L: 869 - class3.load(); // L: 870 - WorldMapLabel.method498(); // L: 871 - } else if (gameState != 10 && gameState != 11) { // L: 873 - if (gameState == 20) { // L: 874 - class3.doCycleTitle(this); // L: 875 - this.doCycleLoggedOut(); // L: 876 - } else if (gameState == 25) { // L: 878 - AttackOption.method2154(false); // L: 879 - field728 = 0; // L: 880 - boolean var54 = true; // L: 881 - - for (var2 = 0; var2 < AbstractUserComparator.regionLandArchives.length; ++var2) { // L: 882 - if (GrandExchangeEvents.regionMapArchiveIds[var2] != -1 && AbstractUserComparator.regionLandArchives[var2] == null) { // L: 883 884 - AbstractUserComparator.regionLandArchives[var2] = WorldMapLabel.archive5.takeFile(GrandExchangeEvents.regionMapArchiveIds[var2], 0); // L: 885 - if (AbstractUserComparator.regionLandArchives[var2] == null) { // L: 886 - var54 = false; // L: 887 - ++field728; // L: 888 - } - } - - if (Skeleton.regionLandArchiveIds[var2] != -1 && AbstractWorldMapData.regionMapArchives[var2] == null) { // L: 892 893 - AbstractWorldMapData.regionMapArchives[var2] = WorldMapLabel.archive5.takeFileEncrypted(Skeleton.regionLandArchiveIds[var2], 0, BoundaryObject.xteaKeys[var2]); // L: 894 - if (AbstractWorldMapData.regionMapArchives[var2] == null) { // L: 895 - var54 = false; // L: 896 - ++field728; // L: 897 - } - } - } - - if (!var54) { // L: 902 - field732 = 1; // L: 903 - } else { - field895 = 0; // L: 906 - var54 = true; // L: 907 - - int var4; - int var5; - for (var2 = 0; var2 < AbstractUserComparator.regionLandArchives.length; ++var2) { // L: 908 - byte[] var3 = AbstractWorldMapData.regionMapArchives[var2]; // L: 909 - if (var3 != null) { // L: 910 - var4 = (class90.regions[var2] >> 8) * 64 - WorldMapManager.baseX; // L: 911 - var5 = (class90.regions[var2] & 255) * 64 - WorldMapLabel.baseY; // L: 912 - if (isInInstance) { // L: 913 - var4 = 10; // L: 914 - var5 = 10; // L: 915 + if (var1 == null) { // L: 855 + int var45; + try { + if (class206.musicPlayerStatus == 1) { // L: 861 + var45 = class13.midiPcmStream.method3856(); // L: 862 + if (var45 > 0 && class13.midiPcmStream.isReady()) { // L: 863 + var45 -= MusicPatch.pcmSampleLength; // L: 864 + if (var45 < 0) { // L: 865 + var45 = 0; } - var54 &= class224.method4117(var3, var4, var5); // L: 917 + class13.midiPcmStream.setPcmStreamVolume(var45); // L: 866 + } else { + class13.midiPcmStream.clear(); // L: 869 + class13.midiPcmStream.removeAll(); // L: 870 + if (class23.musicTrackArchive != null) { // L: 871 + class206.musicPlayerStatus = 2; + } else { + class206.musicPlayerStatus = 0; // L: 872 + } + + InterfaceParent.musicTrack = null; // L: 873 + LoginType.soundCache = null; // L: 874 } } + } catch (Exception var64) { // L: 877 + var64.printStackTrace(); // L: 878 + class13.midiPcmStream.clear(); // L: 879 + class206.musicPlayerStatus = 0; // L: 880 + InterfaceParent.musicTrack = null; // L: 881 + LoginType.soundCache = null; // L: 882 + class23.musicTrackArchive = null; // L: 883 + } - if (!var54) { // L: 920 - field732 = 2; // L: 921 - } else { - if (field732 != 0) { // L: 924 - Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } + FriendSystem.playPcmPlayers(); // L: 886 + FriendSystem.method2017(); // L: 887 + synchronized(MouseHandler.MouseHandler_instance) { // L: 889 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 890 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 891 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 892 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 893 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 894 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 895 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 896 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 897 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 898 + } // L: 899 - RouteStrategy.playPcmPlayers(); // L: 925 - ScriptEvent.scene.clear(); // L: 926 + if (class8.mouseWheel != null) { // L: 901 + var45 = class8.mouseWheel.useRotation(); // L: 902 + mouseWheelRotation = var45; // L: 903 + } - for (var2 = 0; var2 < 4; ++var2) { // L: 927 - collisionMaps[var2].clear(); - } + if (gameState == 0) { // L: 905 + class336.load(); // L: 906 + WorldMapLabel.method519(); // L: 907 + } else if (gameState == 5) { // L: 909 + Canvas.doCycleTitle(this); // L: 910 + class336.load(); // L: 911 + WorldMapLabel.method519(); // L: 912 + } else if (gameState != 10 && gameState != 11) { // L: 914 + if (gameState == 20) { // L: 915 + Canvas.doCycleTitle(this); // L: 916 + this.doCycleLoggedOut(); // L: 917 + } else if (gameState == 25) { // L: 919 + GrandExchangeOfferAgeComparator.method243(false); // L: 920 + field734 = 0; // L: 921 + boolean var75 = true; // L: 922 - int var44; - for (var2 = 0; var2 < 4; ++var2) { // L: 928 - for (var44 = 0; var44 < 104; ++var44) { // L: 929 - for (var4 = 0; var4 < 104; ++var4) { // L: 930 - Tiles.Tiles_renderFlags[var2][var44][var4] = 0; // L: 931 + int var46; + for (var46 = 0; var46 < GrandExchangeOffer.regionLandArchives.length; ++var46) { // L: 923 + if (class22.regionMapArchiveIds[var46] != -1 && GrandExchangeOffer.regionLandArchives[var46] == null) { // L: 924 925 + GrandExchangeOffer.regionLandArchives[var46] = Varcs.archive5.takeFile(class22.regionMapArchiveIds[var46], 0); // L: 926 + if (GrandExchangeOffer.regionLandArchives[var46] == null) { // L: 927 + var75 = false; // L: 928 + ++field734; // L: 929 + } + } + + if (WallDecoration.regionLandArchiveIds[var46] != -1 && GameShell.regionMapArchives[var46] == null) { // L: 933 934 + GameShell.regionMapArchives[var46] = Varcs.archive5.takeFileEncrypted(WallDecoration.regionLandArchiveIds[var46], 0, WorldMapEvent.xteaKeys[var46]); // L: 935 + if (GameShell.regionMapArchives[var46] == null) { // L: 936 + var75 = false; // L: 937 + ++field734; // L: 938 } } } - RouteStrategy.playPcmPlayers(); // L: 935 - MidiPcmStream.method3920(); // L: 936 - var2 = AbstractUserComparator.regionLandArchives.length; // L: 937 - ModeWhere.method3772(); // L: 938 - AttackOption.method2154(true); // L: 939 - int var7; - int var8; - int var10; - int var11; - int var12; - int var13; - int[] var10000; - int var47; - if (!isInInstance) { // L: 940 - var44 = 0; + if (!var75) { // L: 943 + field722 = 1; // L: 944 + } else { + field848 = 0; // L: 947 + var75 = true; // L: 948 - label624: - while (true) { - byte[] var6; - if (var44 >= var2) { - for (var44 = 0; var44 < var2; ++var44) { // L: 969 - var4 = (class90.regions[var44] >> 8) * 64 - WorldMapManager.baseX; // L: 970 - var5 = (class90.regions[var44] & 255) * 64 - WorldMapLabel.baseY; // L: 971 - var6 = AbstractUserComparator.regionLandArchives[var44]; // L: 972 - if (var6 == null && SpotAnimationDefinition.field3261 < 800) { // L: 973 - RouteStrategy.playPcmPlayers(); // L: 974 - Player.method1327(var4, var5, 64, 64); // L: 975 - } + int var5; + Buffer var9; + int var10; + int var11; + int var12; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var47; + for (var46 = 0; var46 < GrandExchangeOffer.regionLandArchives.length; ++var46) { // L: 949 + byte[] var3 = GameShell.regionMapArchives[var46]; // L: 950 + if (var3 != null) { // L: 951 + var47 = (class52.regions[var46] >> 8) * 64 - FloorDecoration.baseX; // L: 952 + var5 = (class52.regions[var46] & 255) * 64 - WorldMapData_0.baseY; // L: 953 + if (isInInstance) { // L: 954 + var47 = 10; // L: 955 + var5 = 10; // L: 956 } - AttackOption.method2154(true); // L: 978 - var44 = 0; + boolean var8 = true; // L: 961 + var9 = new Buffer(var3); // L: 962 + var10 = -1; // L: 963 + label1377: while (true) { - if (var44 >= var2) { - break label624; + var11 = var9.method5743(); // L: 965 + if (var11 == 0) { // L: 966 + var75 &= var8; // L: 999 + break; } - byte[] var46 = AbstractWorldMapData.regionMapArchives[var44]; // L: 980 - if (var46 != null) { // L: 981 - var5 = (class90.regions[var44] >> 8) * 64 - WorldMapManager.baseX; // L: 982 - var47 = (class90.regions[var44] & 255) * 64 - WorldMapLabel.baseY; // L: 983 - RouteStrategy.playPcmPlayers(); // L: 984 - BuddyRankComparator.method3524(var46, var5, var47, ScriptEvent.scene, collisionMaps); // L: 985 - } + var10 += var11; // L: 967 + var12 = 0; // L: 968 + boolean var13 = false; // L: 969 - ++var44; // L: 979 - } - } - - var4 = (class90.regions[var44] >> 8) * 64 - WorldMapManager.baseX; // L: 942 - var5 = (class90.regions[var44] & 255) * 64 - WorldMapLabel.baseY; // L: 943 - var6 = AbstractUserComparator.regionLandArchives[var44]; // L: 944 - if (var6 != null) { // L: 945 - RouteStrategy.playPcmPlayers(); // L: 946 - var7 = class52.field396 * 8 - 48; // L: 947 - var8 = SpotAnimationDefinition.field3261 * 8 - 48; // L: 948 - CollisionMap[] var9 = collisionMaps; // L: 949 - var10 = 0; - - label621: - while (true) { - if (var10 >= 4) { - Buffer var45 = new Buffer(var6); // L: 958 - var11 = 0; - - while (true) { - if (var11 >= 4) { - break label621; + while (true) { + while (!var13) { // L: 971 + var14 = var9.readUShortSmart(); // L: 977 + if (var14 == 0) { // L: 978 + continue label1377; } - for (var12 = 0; var12 < 64; ++var12) { // L: 960 - for (var13 = 0; var13 < 64; ++var13) { // L: 961 - DynamicObject.loadTerrain(var45, var11, var4 + var12, var5 + var13, var7, var8, 0); // L: 962 + var12 += var14 - 1; // L: 979 + var15 = var12 & 63; // L: 980 + var16 = var12 >> 6 & 63; // L: 981 + var17 = var9.readUnsignedByte() >> 2; // L: 982 + var18 = var47 + var16; // L: 983 + var19 = var15 + var5; // L: 984 + if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) { // L: 985 + ObjectDefinition var20 = ScriptEvent.getObjectDefinition(var10); // L: 986 + if (var17 != 22 || !isLowDetail || var20.int1 != 0 || var20.interactType == 1 || var20.boolean2) { // L: 987 + if (!var20.needsModelFiles()) { // L: 988 + ++field848; // L: 989 + var8 = false; // L: 990 + } + + var13 = true; // L: 992 } } - - ++var11; // L: 959 } - } - for (var11 = 0; var11 < 64; ++var11) { // L: 952 - for (var12 = 0; var12 < 64; ++var12) { // L: 953 - if (var4 + var11 > 0 && var4 + var11 < 103 && var12 + var5 > 0 && var5 + var12 < 103) { // L: 954 - var10000 = var9[var10].flags[var11 + var4]; - var10000[var12 + var5] &= -16777217; - } + var14 = var9.readUShortSmart(); // L: 972 + if (var14 == 0) { // L: 973 + break; } - } - ++var10; // L: 951 + var9.readUnsignedByte(); // L: 974 + } + } + } + } + + if (!var75) { // L: 1002 + field722 = 2; // L: 1003 + } else { + if (field722 != 0) { // L: 1006 + AbstractWorldMapData.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + FriendSystem.playPcmPlayers(); // L: 1007 + ModeWhere.scene.clear(); // L: 1008 + + for (var46 = 0; var46 < 4; ++var46) { // L: 1009 + collisionMaps[var46].clear(); + } + + int var48; + for (var46 = 0; var46 < 4; ++var46) { // L: 1010 + for (var48 = 0; var48 < 104; ++var48) { // L: 1011 + for (var47 = 0; var47 < 104; ++var47) { // L: 1012 + Tiles.Tiles_renderFlags[var46][var48][var47] = 0; // L: 1013 + } } } - ++var44; // L: 941 - } - } + FriendSystem.playPcmPlayers(); // L: 1017 + AbstractArchive.method4397(); // L: 1018 + var46 = GrandExchangeOffer.regionLandArchives.length; // L: 1019 - int var48; - if (isInInstance) { // L: 989 - var44 = 0; + for (ObjectSound var65 = (ObjectSound)ObjectSound.objectSounds.last(); var65 != null; var65 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 1021 + if (var65.stream1 != null) { // L: 1022 + GrandExchangeEvents.pcmStreamMixer.removeSubStream(var65.stream1); // L: 1023 + var65.stream1 = null; // L: 1024 + } - label570: - while (true) { - int var15; - int var16; - int var17; - CollisionMap[] var19; + if (var65.stream2 != null) { // L: 1026 + GrandExchangeEvents.pcmStreamMixer.removeSubStream(var65.stream2); // L: 1027 + var65.stream2 = null; // L: 1028 + } + } + + ObjectSound.objectSounds.clear(); // L: 1031 + GrandExchangeOfferAgeComparator.method243(true); // L: 1033 + int var6; + int var7; + int[] var10000; int var21; int var22; - int var23; - Buffer var49; - if (var44 >= 4) { - for (var44 = 0; var44 < 13; ++var44) { // L: 1039 - for (var4 = 0; var4 < 13; ++var4) { // L: 1040 - var5 = instanceChunkTemplates[0][var44][var4]; // L: 1041 - if (var5 == -1) { // L: 1042 - Player.method1327(var44 * 8, var4 * 8, 8, 8); // L: 1043 - } - } - } - - AttackOption.method2154(true); // L: 1047 - var44 = 0; + int var53; + int var69; + int var71; + if (!isInInstance) { // L: 1034 + var48 = 0; + label1309: while (true) { - if (var44 >= 4) { - break label570; - } + byte[] var49; + if (var48 >= var46) { + for (var48 = 0; var48 < var46; ++var48) { // L: 1063 + var47 = (class52.regions[var48] >> 8) * 64 - FloorDecoration.baseX; // L: 1064 + var5 = (class52.regions[var48] & 255) * 64 - WorldMapData_0.baseY; // L: 1065 + var49 = GrandExchangeOffer.regionLandArchives[var48]; // L: 1066 + if (var49 == null && AbstractWorldMapData.field198 < 800) { // L: 1067 + FriendSystem.playPcmPlayers(); // L: 1068 + method1838(var47, var5, 64, 64); // L: 1069 + } + } - RouteStrategy.playPcmPlayers(); // L: 1049 + GrandExchangeOfferAgeComparator.method243(true); // L: 1072 + var48 = 0; - for (var4 = 0; var4 < 13; ++var4) { // L: 1050 - label493: - for (var5 = 0; var5 < 13; ++var5) { // L: 1051 - var47 = instanceChunkTemplates[var44][var4][var5]; // L: 1052 - if (var47 != -1) { // L: 1053 - var7 = var47 >> 24 & 3; // L: 1054 - var8 = var47 >> 1 & 3; // L: 1055 - var48 = var47 >> 14 & 1023; // L: 1056 - var10 = var47 >> 3 & 2047; // L: 1057 - var11 = (var48 / 8 << 8) + var10 / 8; // L: 1058 + while (true) { + if (var48 >= var46) { + break label1309; + } - for (var12 = 0; var12 < class90.regions.length; ++var12) { // L: 1059 - if (class90.regions[var12] == var11 && AbstractWorldMapData.regionMapArchives[var12] != null) { // L: 1060 - byte[] var50 = AbstractWorldMapData.regionMapArchives[var12]; // L: 1061 - int var51 = var4 * 8; // L: 1062 - var15 = var5 * 8; // L: 1063 - var16 = (var48 & 7) * 8; // L: 1064 - var17 = (var10 & 7) * 8; // L: 1065 - Scene var52 = ScriptEvent.scene; // L: 1066 - var19 = collisionMaps; // L: 1067 - var49 = new Buffer(var50); // L: 1069 - var21 = -1; // L: 1070 + byte[] var4 = GameShell.regionMapArchives[var48]; // L: 1074 + if (var4 != null) { // L: 1075 + var5 = (class52.regions[var48] >> 8) * 64 - FloorDecoration.baseX; // L: 1076 + var6 = (class52.regions[var48] & 255) * 64 - WorldMapData_0.baseY; // L: 1077 + FriendSystem.playPcmPlayers(); // L: 1078 + Scene var51 = ModeWhere.scene; // L: 1079 + CollisionMap[] var52 = collisionMaps; // L: 1080 + var9 = new Buffer(var4); // L: 1082 + var10 = -1; // L: 1083 - while (true) { - var22 = var49.method5632(); // L: 1072 - if (var22 == 0) { // L: 1073 - continue label493; + while (true) { + var11 = var9.method5743(); // L: 1085 + if (var11 == 0) { // L: 1086 + break; + } + + var10 += var11; // L: 1087 + var12 = 0; // L: 1088 + + while (true) { + var71 = var9.readUShortSmart(); // L: 1090 + if (var71 == 0) { // L: 1091 + break; + } + + var12 += var71 - 1; // L: 1092 + var14 = var12 & 63; // L: 1093 + var15 = var12 >> 6 & 63; // L: 1094 + var16 = var12 >> 12; // L: 1095 + var17 = var9.readUnsignedByte(); // L: 1096 + var18 = var17 >> 2; // L: 1097 + var19 = var17 & 3; // L: 1098 + var53 = var5 + var15; // L: 1099 + var21 = var14 + var6; // L: 1100 + if (var53 > 0 && var21 > 0 && var53 < 103 && var21 < 103) { // L: 1101 + var22 = var16; // L: 1102 + if ((Tiles.Tiles_renderFlags[1][var53][var21] & 2) == 2) { // L: 1103 + var22 = var16 - 1; } - var21 += var22; // L: 1074 - var23 = 0; // L: 1075 + CollisionMap var23 = null; // L: 1104 + if (var22 >= 0) { // L: 1105 + var23 = var52[var22]; + } - while (true) { - int var24 = var49.readUShortSmart(); // L: 1077 - if (var24 == 0) { // L: 1078 - break; - } + NPC.method2160(var16, var53, var21, var10, var19, var18, var51, var23); // L: 1106 + } + } + } + } - var23 += var24 - 1; // L: 1079 - int var25 = var23 & 63; // L: 1080 - int var26 = var23 >> 6 & 63; // L: 1081 - int var27 = var23 >> 12; // L: 1082 - int var28 = var49.readUnsignedByte(); // L: 1083 - int var29 = var28 >> 2; // L: 1084 - int var30 = var28 & 3; // L: 1085 - if (var7 == var27 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1086 - ObjectDefinition var31 = MidiPcmStream.getObjectDefinition(var21); // L: 1087 - int var34 = var26 & 7; // L: 1090 - int var35 = var25 & 7; // L: 1091 - int var37 = var31.sizeX; // L: 1093 - int var38 = var31.sizeY; // L: 1094 - int var39; - if ((var30 & 1) == 1) { // L: 1096 - var39 = var37; // L: 1097 - var37 = var38; // L: 1098 - var38 = var39; // L: 1099 + ++var48; // L: 1073 + } + } + + var47 = (class52.regions[var48] >> 8) * 64 - FloorDecoration.baseX; // L: 1036 + var5 = (class52.regions[var48] & 255) * 64 - WorldMapData_0.baseY; // L: 1037 + var49 = GrandExchangeOffer.regionLandArchives[var48]; // L: 1038 + if (var49 != null) { // L: 1039 + FriendSystem.playPcmPlayers(); // L: 1040 + var7 = GrandExchangeEvent.field78 * 8 - 48; // L: 1041 + var69 = AbstractWorldMapData.field198 * 8 - 48; // L: 1042 + CollisionMap[] var70 = collisionMaps; // L: 1043 + var10 = 0; + + label1306: + while (true) { + if (var10 >= 4) { + Buffer var50 = new Buffer(var49); // L: 1052 + var11 = 0; + + while (true) { + if (var11 >= 4) { + break label1306; + } + + for (var12 = 0; var12 < 64; ++var12) { // L: 1054 + for (var71 = 0; var71 < 64; ++var71) { // L: 1055 + HealthBarUpdate.loadTerrain(var50, var11, var47 + var12, var5 + var71, var7, var69, 0); // L: 1056 + } + } + + ++var11; // L: 1053 + } + } + + for (var11 = 0; var11 < 64; ++var11) { // L: 1046 + for (var12 = 0; var12 < 64; ++var12) { // L: 1047 + if (var11 + var47 > 0 && var47 + var11 < 103 && var12 + var5 > 0 && var5 + var12 < 103) { // L: 1048 + var10000 = var70[var10].flags[var11 + var47]; + var10000[var5 + var12] &= -16777217; + } + } + } + + ++var10; // L: 1045 + } + } + + ++var48; // L: 1035 + } + } + + int var24; + int var25; + int var26; + int var27; + int var28; + int var29; + int var30; + int var32; + int var33; + int var34; + int var54; + int var58; + if (isInInstance) { // L: 1114 + var48 = 0; + + label1242: + while (true) { + if (var48 >= 4) { + for (var48 = 0; var48 < 13; ++var48) { // L: 1141 + for (var47 = 0; var47 < 13; ++var47) { // L: 1142 + var5 = instanceChunkTemplates[0][var48][var47]; // L: 1143 + if (var5 == -1) { // L: 1144 + method1838(var48 * 8, var47 * 8, 8, 8); // L: 1145 + } + } + } + + GrandExchangeOfferAgeComparator.method243(true); // L: 1149 + var48 = 0; + + while (true) { + if (var48 >= 4) { + break label1242; + } + + FriendSystem.playPcmPlayers(); // L: 1151 + + for (var47 = 0; var47 < 13; ++var47) { // L: 1152 + label1199: + for (var5 = 0; var5 < 13; ++var5) { // L: 1153 + var6 = instanceChunkTemplates[var48][var47][var5]; // L: 1154 + if (var6 != -1) { // L: 1155 + var7 = var6 >> 24 & 3; // L: 1156 + var69 = var6 >> 1 & 3; // L: 1157 + var54 = var6 >> 14 & 1023; // L: 1158 + var10 = var6 >> 3 & 2047; // L: 1159 + var11 = (var54 / 8 << 8) + var10 / 8; // L: 1160 + + for (var12 = 0; var12 < class52.regions.length; ++var12) { // L: 1161 + if (class52.regions[var12] == var11 && GameShell.regionMapArchives[var12] != null) { // L: 1162 + byte[] var55 = GameShell.regionMapArchives[var12]; // L: 1163 + var14 = var47 * 8; // L: 1164 + var15 = var5 * 8; // L: 1165 + var16 = (var54 & 7) * 8; // L: 1166 + var17 = (var10 & 7) * 8; // L: 1167 + Scene var56 = ModeWhere.scene; // L: 1168 + CollisionMap[] var57 = collisionMaps; // L: 1169 + Buffer var72 = new Buffer(var55); // L: 1171 + var21 = -1; // L: 1172 + + while (true) { + var22 = var72.method5743(); // L: 1174 + if (var22 == 0) { // L: 1175 + continue label1199; } - int var36 = var8 & 3; // L: 1101 - int var33; - if (var36 == 0) { // L: 1102 - var33 = var34; // L: 1103 - } else if (var36 == 1) { // L: 1106 - var33 = var35; // L: 1107 - } else if (var36 == 2) { // L: 1110 - var33 = 7 - var34 - (var37 - 1); // L: 1111 - } else { - var33 = 7 - var35 - (var38 - 1); // L: 1114 - } + var21 += var22; // L: 1176 + var58 = 0; // L: 1177 - var39 = var51 + var33; // L: 1116 - int var40 = var15 + class58.method912(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); // L: 1117 - if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { // L: 1118 - int var41 = var44; // L: 1119 - if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { // L: 1120 - var41 = var44 - 1; + while (true) { + var24 = var72.readUShortSmart(); // L: 1179 + if (var24 == 0) { // L: 1180 + break; } - CollisionMap var42 = null; // L: 1121 - if (var41 >= 0) { // L: 1122 - var42 = var19[var41]; - } + var58 += var24 - 1; // L: 1181 + var25 = var58 & 63; // L: 1182 + var26 = var58 >> 6 & 63; // L: 1183 + var27 = var58 >> 12; // L: 1184 + var28 = var72.readUnsignedByte(); // L: 1185 + var29 = var28 >> 2; // L: 1186 + var30 = var28 & 3; // L: 1187 + if (var7 == var27 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1188 + ObjectDefinition var31 = ScriptEvent.getObjectDefinition(var21); // L: 1189 + var32 = var14 + TextureProvider.method2906(var26 & 7, var25 & 7, var69, var31.sizeX, var31.sizeY, var30); // L: 1190 + var33 = var15 + InterfaceParent.method1272(var26 & 7, var25 & 7, var69, var31.sizeX, var31.sizeY, var30); // L: 1191 + if (var32 > 0 && var33 > 0 && var32 < 103 && var33 < 103) { // L: 1192 + var34 = var48; // L: 1193 + if ((Tiles.Tiles_renderFlags[1][var32][var33] & 2) == 2) { // L: 1194 + var34 = var48 - 1; + } - GrandExchangeOfferWorldComparator.method137(var44, var39, var40, var21, var8 + var30 & 3, var29, var52, var42); // L: 1123 + CollisionMap var35 = null; // L: 1195 + if (var34 >= 0) { // L: 1196 + var35 = var57[var34]; + } + + NPC.method2160(var48, var32, var33, var21, var69 + var30 & 3, var29, var56, var35); // L: 1197 + } + } } } } @@ -1814,305 +2108,728 @@ public final class Client extends GameShell implements Usernamed { } } } + + ++var48; // L: 1150 } } - ++var44; // L: 1048 - } - } + FriendSystem.playPcmPlayers(); // L: 1116 - RouteStrategy.playPcmPlayers(); // L: 991 + for (var47 = 0; var47 < 13; ++var47) { // L: 1117 + for (var5 = 0; var5 < 13; ++var5) { // L: 1118 + boolean var68 = false; // L: 1119 + var7 = instanceChunkTemplates[var48][var47][var5]; // L: 1120 + if (var7 != -1) { // L: 1121 + var69 = var7 >> 24 & 3; // L: 1122 + var54 = var7 >> 1 & 3; // L: 1123 + var10 = var7 >> 14 & 1023; // L: 1124 + var11 = var7 >> 3 & 2047; // L: 1125 + var12 = (var10 / 8 << 8) + var11 / 8; // L: 1126 - for (var4 = 0; var4 < 13; ++var4) { // L: 992 - for (var5 = 0; var5 < 13; ++var5) { // L: 993 - boolean var57 = false; // L: 994 - var7 = instanceChunkTemplates[var44][var4][var5]; // L: 995 - if (var7 != -1) { // L: 996 - var8 = var7 >> 24 & 3; // L: 997 - var48 = var7 >> 1 & 3; // L: 998 - var10 = var7 >> 14 & 1023; // L: 999 - var11 = var7 >> 3 & 2047; // L: 1000 - var12 = (var10 / 8 << 8) + var11 / 8; // L: 1001 - - for (var13 = 0; var13 < class90.regions.length; ++var13) { // L: 1002 - if (class90.regions[var13] == var12 && AbstractUserComparator.regionLandArchives[var13] != null) { // L: 1003 - byte[] var14 = AbstractUserComparator.regionLandArchives[var13]; // L: 1004 - var15 = var4 * 8; // L: 1005 - var16 = var5 * 8; // L: 1006 - var17 = (var10 & 7) * 8; // L: 1007 - int var18 = (var11 & 7) * 8; // L: 1008 - var19 = collisionMaps; // L: 1009 - - for (int var20 = 0; var20 < 8; ++var20) { // L: 1011 - for (var21 = 0; var21 < 8; ++var21) { // L: 1012 - if (var15 + var20 > 0 && var15 + var20 < 103 && var21 + var16 > 0 && var16 + var21 < 103) { // L: 1013 - var10000 = var19[var44].flags[var15 + var20]; - var10000[var16 + var21] &= -16777217; - } + for (var71 = 0; var71 < class52.regions.length; ++var71) { // L: 1127 + if (class52.regions[var71] == var12 && GrandExchangeOffer.regionLandArchives[var71] != null) { // L: 1128 + MouseHandler.method1174(GrandExchangeOffer.regionLandArchives[var71], var48, var47 * 8, var5 * 8, var69, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps); // L: 1129 + var68 = true; // L: 1130 + break; // L: 1131 } } + } - var49 = new Buffer(var14); // L: 1016 - - for (var21 = 0; var21 < 4; ++var21) { // L: 1017 - for (var22 = 0; var22 < 64; ++var22) { // L: 1018 - for (var23 = 0; var23 < 64; ++var23) { // L: 1019 - if (var8 == var21 && var22 >= var17 && var22 < var17 + 8 && var23 >= var18 && var23 < var18 + 8) { // L: 1020 - DynamicObject.loadTerrain(var49, var44, var15 + TaskHandler.method3568(var22 & 7, var23 & 7, var48), var16 + Huffman.method4041(var22 & 7, var23 & 7, var48), 0, 0, var48); // L: 1021 - } else { - DynamicObject.loadTerrain(var49, 0, -1, -1, 0, 0, 0); // L: 1023 - } - } - } - } - - var57 = true; // L: 1028 - break; // L: 1029 + if (!var68) { // L: 1135 + NetFileRequest.method4293(var48, var47 * 8, var5 * 8); // L: 1136 } } } - if (!var57) { // L: 1033 - class58.method914(var44, var4 * 8, var5 * 8); // L: 1034 + ++var48; // L: 1115 + } + } + + GrandExchangeOfferAgeComparator.method243(true); // L: 1211 + FriendSystem.playPcmPlayers(); // L: 1212 + Scene var66 = ModeWhere.scene; // L: 1213 + CollisionMap[] var67 = collisionMaps; // L: 1214 + + for (var5 = 0; var5 < 4; ++var5) { // L: 1216 + for (var6 = 0; var6 < 104; ++var6) { // L: 1217 + for (var7 = 0; var7 < 104; ++var7) { // L: 1218 + if ((Tiles.Tiles_renderFlags[var5][var6][var7] & 1) == 1) { // L: 1219 + var69 = var5; // L: 1220 + if ((Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 1221 + var69 = var5 - 1; + } + + if (var69 >= 0) { // L: 1222 + var67[var69].setBlockedByFloor(var6, var7); + } + } } } } - ++var44; // L: 990 - } - } + Tiles.field539 += (int)(Math.random() * 5.0D) - 2; // L: 1227 + if (Tiles.field539 < -8) { // L: 1228 + Tiles.field539 = -8; + } - AttackOption.method2154(true); // L: 1137 - RouteStrategy.playPcmPlayers(); // L: 1138 - HealthBar.method2113(ScriptEvent.scene, collisionMaps); // L: 1139 - AttackOption.method2154(true); // L: 1140 - var44 = Tiles.Tiles_minPlane; // L: 1141 - if (var44 > Huffman.Client_plane) { // L: 1142 - var44 = Huffman.Client_plane; - } + if (Tiles.field539 > 8) { // L: 1229 + Tiles.field539 = 8; + } - if (var44 < Huffman.Client_plane - 1) { // L: 1143 - var44 = Huffman.Client_plane - 1; - } + Tiles.field540 += (int)(Math.random() * 5.0D) - 2; // L: 1230 + if (Tiles.field540 < -16) { // L: 1231 + Tiles.field540 = -16; + } - if (isLowDetail) { // L: 1144 - ScriptEvent.scene.init(Tiles.Tiles_minPlane); - } else { - ScriptEvent.scene.init(0); // L: 1145 - } + if (Tiles.field540 > 16) { // L: 1232 + Tiles.field540 = 16; + } - for (var4 = 0; var4 < 104; ++var4) { // L: 1146 - for (var5 = 0; var5 < 104; ++var5) { // L: 1147 - class13.updateItemPile(var4, var5); // L: 1148 - } - } + for (var5 = 0; var5 < 4; ++var5) { // L: 1233 + byte[][] var76 = class299.field3679[var5]; // L: 1234 + var12 = (int)Math.sqrt(5100.0D); // L: 1240 + var71 = var12 * 768 >> 8; // L: 1241 - RouteStrategy.playPcmPlayers(); // L: 1151 + for (var14 = 1; var14 < 103; ++var14) { // L: 1242 + for (var15 = 1; var15 < 103; ++var15) { // L: 1243 + var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14]; // L: 1244 + var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1]; // L: 1245 + var18 = (int)Math.sqrt((double)(var16 * var16 + var17 * var17 + 65536)); // L: 1246 + var19 = (var16 << 8) / var18; // L: 1247 + var53 = 65536 / var18; // L: 1248 + var21 = (var17 << 8) / var18; // L: 1249 + var22 = (var19 * -50 + var21 * -50 + var53 * -10) / var71 + 96; // L: 1250 + var58 = (var76[var15 - 1][var14] >> 2) + (var76[var15][var14 - 1] >> 2) + (var76[var15 + 1][var14] >> 3) + (var76[var15][var14 + 1] >> 3) + (var76[var15][var14] >> 1); // L: 1251 + UserComparator10.field1999[var15][var14] = var22 - var58; // L: 1252 + } + } - for (PendingSpawn var55 = (PendingSpawn)pendingSpawns.last(); var55 != null; var55 = (PendingSpawn)pendingSpawns.previous()) { // L: 1153 1154 1160 - if (var55.hitpoints == -1) { // L: 1155 - var55.delay = 0; // L: 1156 - WorldMapIcon_1.method375(var55); // L: 1157 - } else { - var55.remove(); // L: 1159 - } - } + for (var14 = 0; var14 < 104; ++var14) { // L: 1255 + GrandExchangeOfferOwnWorldComparator.Tiles_hue[var14] = 0; // L: 1256 + class238.Tiles_saturation[var14] = 0; // L: 1257 + TileItemPile.Tiles_lightness[var14] = 0; // L: 1258 + class248.Tiles_hueMultiplier[var14] = 0; // L: 1259 + class1.field1[var14] = 0; // L: 1260 + } - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 1163 - PacketBufferNode var56; - if (class2.client.hasFrame()) { // L: 1164 - var56 = getPacketBufferNode(ClientPacket.field2251, packetWriter.isaacCipher); // L: 1166 - var56.packetBuffer.writeInt(1057001181); // L: 1167 - packetWriter.addNode(var56); // L: 1168 - } + for (var14 = -5; var14 < 109; ++var14) { // L: 1262 + for (var15 = 0; var15 < 104; ++var15) { // L: 1263 + var16 = var14 + 5; // L: 1264 + int var10002; + if (var16 >= 0 && var16 < 104) { // L: 1265 + var17 = TileItem.field1273[var5][var16][var15] & 255; // L: 1266 + if (var17 > 0) { // L: 1267 + FloorUnderlayDefinition var79 = class234.method4260(var17 - 1); // L: 1268 + var10000 = GrandExchangeOfferOwnWorldComparator.Tiles_hue; // L: 1269 + var10000[var15] += var79.hue; + var10000 = class238.Tiles_saturation; // L: 1270 + var10000[var15] += var79.saturation; + var10000 = TileItemPile.Tiles_lightness; // L: 1271 + var10000[var15] += var79.lightness; + var10000 = class248.Tiles_hueMultiplier; // L: 1272 + var10000[var15] += var79.hueMultiplier; + var10002 = class1.field1[var15]++; // L: 1273 + } + } - if (!isInInstance) { // L: 1170 - var4 = (class52.field396 - 6) / 8; // L: 1171 - var5 = (class52.field396 + 6) / 8; // L: 1172 - var47 = (SpotAnimationDefinition.field3261 - 6) / 8; // L: 1173 - var7 = (SpotAnimationDefinition.field3261 + 6) / 8; // L: 1174 + var17 = var14 - 5; // L: 1276 + if (var17 >= 0 && var17 < 104) { // L: 1277 + var18 = TileItem.field1273[var5][var17][var15] & 255; // L: 1278 + if (var18 > 0) { // L: 1279 + FloorUnderlayDefinition var80 = class234.method4260(var18 - 1); // L: 1280 + var10000 = GrandExchangeOfferOwnWorldComparator.Tiles_hue; // L: 1281 + var10000[var15] -= var80.hue; + var10000 = class238.Tiles_saturation; // L: 1282 + var10000[var15] -= var80.saturation; + var10000 = TileItemPile.Tiles_lightness; // L: 1283 + var10000[var15] -= var80.lightness; + var10000 = class248.Tiles_hueMultiplier; // L: 1284 + var10000[var15] -= var80.hueMultiplier; + var10002 = class1.field1[var15]--; // L: 1285 + } + } + } - for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { // L: 1175 - for (var48 = var47 - 1; var48 <= var7 + 1; ++var48) { // L: 1176 - if (var8 < var4 || var8 > var5 || var48 < var47 || var48 > var7) { // L: 1177 - WorldMapLabel.archive5.loadRegionFromName("m" + var8 + "_" + var48); // L: 1178 - WorldMapLabel.archive5.loadRegionFromName("l" + var8 + "_" + var48); // L: 1179 + if (var14 >= 1 && var14 < 103) { // L: 1289 + var15 = 0; // L: 1290 + var16 = 0; // L: 1291 + var17 = 0; // L: 1292 + var18 = 0; // L: 1293 + var19 = 0; // L: 1294 + + for (var53 = -5; var53 < 109; ++var53) { // L: 1295 + var21 = var53 + 5; // L: 1296 + if (var21 >= 0 && var21 < 104) { // L: 1297 + var15 += GrandExchangeOfferOwnWorldComparator.Tiles_hue[var21]; // L: 1298 + var16 += class238.Tiles_saturation[var21]; // L: 1299 + var17 += TileItemPile.Tiles_lightness[var21]; // L: 1300 + var18 += class248.Tiles_hueMultiplier[var21]; // L: 1301 + var19 += class1.field1[var21]; // L: 1302 + } + + var22 = var53 - 5; // L: 1304 + if (var22 >= 0 && var22 < 104) { // L: 1305 + var15 -= GrandExchangeOfferOwnWorldComparator.Tiles_hue[var22]; // L: 1306 + var16 -= class238.Tiles_saturation[var22]; // L: 1307 + var17 -= TileItemPile.Tiles_lightness[var22]; // L: 1308 + var18 -= class248.Tiles_hueMultiplier[var22]; // L: 1309 + var19 -= class1.field1[var22]; // L: 1310 + } + + if (var53 >= 1 && var53 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var53] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var53] & 16) == 0)) { // L: 1312 1313 1314 1315 + if (var5 < Tiles.Tiles_minPlane) { // L: 1318 + Tiles.Tiles_minPlane = var5; + } + + var58 = TileItem.field1273[var5][var14][var53] & 255; // L: 1319 + var24 = NPC.field1161[var5][var14][var53] & 255; // L: 1320 + if (var58 > 0 || var24 > 0) { // L: 1321 + var25 = Tiles.Tiles_heights[var5][var14][var53]; // L: 1322 + var26 = Tiles.Tiles_heights[var5][var14 + 1][var53]; // L: 1323 + var27 = Tiles.Tiles_heights[var5][var14 + 1][var53 + 1]; // L: 1324 + var28 = Tiles.Tiles_heights[var5][var14][var53 + 1]; // L: 1325 + var29 = UserComparator10.field1999[var14][var53]; // L: 1326 + var30 = UserComparator10.field1999[var14 + 1][var53]; // L: 1327 + int var59 = UserComparator10.field1999[var14 + 1][var53 + 1]; // L: 1328 + var32 = UserComparator10.field1999[var14][var53 + 1]; // L: 1329 + var33 = -1; // L: 1330 + var34 = -1; // L: 1331 + int var36; + int var60; + if (var58 > 0) { // L: 1332 + var60 = var15 * 256 / var18; // L: 1333 + var36 = var16 / var19; // L: 1334 + int var37 = var17 / var19; // L: 1335 + var33 = WorldMapEvent.hslToRgb(var60, var36, var37); // L: 1336 + var60 = var60 + Tiles.field539 & 255; // L: 1337 + var37 += Tiles.field540; // L: 1338 + if (var37 < 0) { // L: 1339 + var37 = 0; + } else if (var37 > 255) { // L: 1340 + var37 = 255; + } + + var34 = WorldMapEvent.hslToRgb(var60, var36, var37); // L: 1341 + } + + if (var5 > 0) { // L: 1343 + boolean var81 = true; // L: 1344 + if (var58 == 0 && Tiles.field531[var5][var14][var53] != 0) { // L: 1345 + var81 = false; + } + + if (var24 > 0 && !PendingSpawn.method1839(var24 - 1).hideUnderlay) { // L: 1346 + var81 = false; + } + + if (var81 && var26 == var25 && var25 == var27 && var25 == var28) { // L: 1347 1348 + var10000 = UserComparator10.field2000[var5][var14]; + var10000[var53] |= 2340; + } + } + + var60 = 0; // L: 1351 + if (var34 != -1) { // L: 1352 + var60 = Rasterizer3D.Rasterizer3D_colorPalette[VarcInt.method4555(var34, 96)]; + } + + if (var24 == 0) { // L: 1353 + var66.addTile(var5, var14, var53, 0, 0, -1, var25, var26, var27, var28, VarcInt.method4555(var33, var29), VarcInt.method4555(var33, var30), VarcInt.method4555(var33, var59), VarcInt.method4555(var33, var32), 0, 0, 0, 0, var60, 0); // L: 1354 + } else { + var36 = Tiles.field531[var5][var14][var53] + 1; // L: 1357 + byte var74 = UserComparator2.field3859[var5][var14][var53]; // L: 1358 + FloorOverlayDefinition var38 = PendingSpawn.method1839(var24 - 1); // L: 1359 + int var39 = var38.texture; // L: 1360 + int var40; + int var41; + int var42; + int var43; + if (var39 >= 0) { // L: 1363 + var41 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var39); // L: 1364 + var40 = -1; // L: 1365 + } else if (var38.primaryRgb == 16711935) { // L: 1368 + var40 = -2; // L: 1369 + var39 = -1; // L: 1370 + var41 = -2; // L: 1371 + } else { + var40 = WorldMapEvent.hslToRgb(var38.hue, var38.saturation, var38.lightness); // L: 1374 + var42 = var38.hue + Tiles.field539 & 255; // L: 1375 + var43 = var38.lightness + Tiles.field540; // L: 1376 + if (var43 < 0) { // L: 1377 + var43 = 0; + } else if (var43 > 255) { // L: 1378 + var43 = 255; + } + + var41 = WorldMapEvent.hslToRgb(var42, var38.saturation, var43); // L: 1379 + } + + var42 = 0; // L: 1382 + if (var41 != -2) { // L: 1383 + var42 = Rasterizer3D.Rasterizer3D_colorPalette[class1.method20(var41, 96)]; + } + + if (var38.secondaryRgb != -1) { // L: 1384 + var43 = var38.secondaryHue + Tiles.field539 & 255; // L: 1385 + int var44 = var38.secondaryLightness + Tiles.field540; // L: 1386 + if (var44 < 0) { // L: 1387 + var44 = 0; + } else if (var44 > 255) { // L: 1388 + var44 = 255; + } + + var41 = WorldMapEvent.hslToRgb(var43, var38.secondarySaturation, var44); // L: 1389 + var42 = Rasterizer3D.Rasterizer3D_colorPalette[class1.method20(var41, 96)]; // L: 1390 + } + + var66.addTile(var5, var14, var53, var36, var74, var39, var25, var26, var27, var28, VarcInt.method4555(var33, var29), VarcInt.method4555(var33, var30), VarcInt.method4555(var33, var59), VarcInt.method4555(var33, var32), class1.method20(var40, var29), class1.method20(var40, var30), class1.method20(var40, var59), class1.method20(var40, var32), var60, var42); // L: 1392 + } + } + } + } + } + } + + for (var14 = 1; var14 < 103; ++var14) { // L: 1399 + for (var15 = 1; var15 < 103; ++var15) { // L: 1400 + if ((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) { // L: 1407 + var53 = 0; // L: 1408 + } else if (var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) { // L: 1411 + var53 = var5 - 1; // L: 1412 + } else { + var53 = var5; // L: 1415 + } + + var66.setTileMinPlane(var5, var15, var14, var53); // L: 1417 + } + } + + TileItem.field1273[var5] = null; // L: 1420 + NPC.field1161[var5] = null; // L: 1421 + Tiles.field531[var5] = null; // L: 1422 + UserComparator2.field3859[var5] = null; // L: 1423 + class299.field3679[var5] = null; // L: 1424 + } + + var66.method3248(-50, -10, -50); // L: 1426 + + for (var5 = 0; var5 < 104; ++var5) { // L: 1427 + for (var6 = 0; var6 < 104; ++var6) { // L: 1428 + if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { // L: 1429 + var66.setLinkBelow(var5, var6); + } } } + + var5 = 1; // L: 1432 + var6 = 2; // L: 1433 + var7 = 4; // L: 1434 + + for (var69 = 0; var69 < 4; ++var69) { // L: 1435 + if (var69 > 0) { // L: 1436 + var5 <<= 3; // L: 1437 + var6 <<= 3; // L: 1438 + var7 <<= 3; // L: 1439 + } + + for (var54 = 0; var54 <= var69; ++var54) { // L: 1441 + for (var10 = 0; var10 <= 104; ++var10) { // L: 1442 + for (var11 = 0; var11 <= 104; ++var11) { // L: 1443 + short var73; + if ((UserComparator10.field2000[var54][var11][var10] & var5) != 0) { // L: 1444 + var12 = var10; // L: 1445 + var71 = var10; // L: 1446 + var14 = var54; // L: 1447 + + for (var15 = var54; var12 > 0 && (UserComparator10.field2000[var54][var11][var12 - 1] & var5) != 0; --var12) { // L: 1448 1449 + } + + while (var71 < 104 && (UserComparator10.field2000[var54][var11][var71 + 1] & var5) != 0) { // L: 1450 + ++var71; + } + + label918: + while (var14 > 0) { // L: 1451 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1452 + if ((UserComparator10.field2000[var14 - 1][var11][var16] & var5) == 0) { + break label918; + } + } + + --var14; // L: 1453 + } + + label907: + while (var15 < var69) { // L: 1455 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1456 + if ((UserComparator10.field2000[var15 + 1][var11][var16] & var5) == 0) { + break label907; + } + } + + ++var15; // L: 1457 + } + + var16 = (var71 - var12 + 1) * (var15 + 1 - var14); // L: 1459 + if (var16 >= 8) { // L: 1460 + var73 = 240; // L: 1461 + var18 = Tiles.Tiles_heights[var15][var11][var12] - var73; // L: 1462 + var19 = Tiles.Tiles_heights[var14][var11][var12]; // L: 1463 + Scene.Scene_addOccluder(var69, 1, var11 * 128, var11 * 128, var12 * 128, var71 * 128 + 128, var18, var19); // L: 1464 + + for (var53 = var14; var53 <= var15; ++var53) { // L: 1465 + for (var21 = var12; var21 <= var71; ++var21) { // L: 1466 + var10000 = UserComparator10.field2000[var53][var11]; + var10000[var21] &= ~var5; + } + } + } + } + + if ((UserComparator10.field2000[var54][var11][var10] & var6) != 0) { // L: 1470 + var12 = var11; // L: 1471 + var71 = var11; // L: 1472 + var14 = var54; // L: 1473 + + for (var15 = var54; var12 > 0 && (UserComparator10.field2000[var54][var12 - 1][var10] & var6) != 0; --var12) { // L: 1474 1475 + } + + while (var71 < 104 && (UserComparator10.field2000[var54][var71 + 1][var10] & var6) != 0) { // L: 1476 + ++var71; + } + + label971: + while (var14 > 0) { // L: 1477 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1478 + if ((UserComparator10.field2000[var14 - 1][var16][var10] & var6) == 0) { + break label971; + } + } + + --var14; // L: 1479 + } + + label960: + while (var15 < var69) { // L: 1481 + for (var16 = var12; var16 <= var71; ++var16) { // L: 1482 + if ((UserComparator10.field2000[var15 + 1][var16][var10] & var6) == 0) { + break label960; + } + } + + ++var15; // L: 1483 + } + + var16 = (var71 - var12 + 1) * (var15 + 1 - var14); // L: 1485 + if (var16 >= 8) { // L: 1486 + var73 = 240; // L: 1487 + var18 = Tiles.Tiles_heights[var15][var12][var10] - var73; // L: 1488 + var19 = Tiles.Tiles_heights[var14][var12][var10]; // L: 1489 + Scene.Scene_addOccluder(var69, 2, var12 * 128, var71 * 128 + 128, var10 * 128, var10 * 128, var18, var19); // L: 1490 + + for (var53 = var14; var53 <= var15; ++var53) { // L: 1491 + for (var21 = var12; var21 <= var71; ++var21) { // L: 1492 + var10000 = UserComparator10.field2000[var53][var21]; + var10000[var10] &= ~var6; + } + } + } + } + + if ((UserComparator10.field2000[var54][var11][var10] & var7) != 0) { // L: 1496 + var12 = var11; // L: 1497 + var71 = var11; // L: 1498 + var14 = var10; // L: 1499 + + for (var15 = var10; var14 > 0 && (UserComparator10.field2000[var54][var11][var14 - 1] & var7) != 0; --var14) { // L: 1500 1501 + } + + while (var15 < 104 && (UserComparator10.field2000[var54][var11][var15 + 1] & var7) != 0) { // L: 1502 + ++var15; + } + + label1024: + while (var12 > 0) { // L: 1503 + for (var16 = var14; var16 <= var15; ++var16) { // L: 1504 + if ((UserComparator10.field2000[var54][var12 - 1][var16] & var7) == 0) { + break label1024; + } + } + + --var12; // L: 1505 + } + + label1013: + while (var71 < 104) { // L: 1507 + for (var16 = var14; var16 <= var15; ++var16) { // L: 1508 + if ((UserComparator10.field2000[var54][var71 + 1][var16] & var7) == 0) { + break label1013; + } + } + + ++var71; // L: 1509 + } + + if ((var71 - var12 + 1) * (var15 - var14 + 1) >= 4) { // L: 1511 + var16 = Tiles.Tiles_heights[var54][var12][var14]; // L: 1512 + Scene.Scene_addOccluder(var69, 4, var12 * 128, var71 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16); // L: 1513 + + for (var17 = var12; var17 <= var71; ++var17) { // L: 1514 + for (var18 = var14; var18 <= var15; ++var18) { // L: 1515 + var10000 = UserComparator10.field2000[var54][var17]; + var10000[var18] &= ~var7; + } + } + } + } + } + } + } + } + + GrandExchangeOfferAgeComparator.method243(true); // L: 1524 + var5 = Tiles.Tiles_minPlane; // L: 1525 + if (var5 > GrandExchangeOfferUnitPriceComparator.Client_plane) { // L: 1526 + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane; + } + + if (var5 < GrandExchangeOfferUnitPriceComparator.Client_plane - 1) { // L: 1527 + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane - 1; + } + + if (isLowDetail) { // L: 1528 + ModeWhere.scene.init(Tiles.Tiles_minPlane); + } else { + ModeWhere.scene.init(0); // L: 1529 + } + + for (var6 = 0; var6 < 104; ++var6) { // L: 1530 + for (var7 = 0; var7 < 104; ++var7) { // L: 1531 + class41.updateItemPile(var6, var7); // L: 1532 + } + } + + FriendSystem.playPcmPlayers(); // L: 1535 + + for (PendingSpawn var77 = (PendingSpawn)pendingSpawns.last(); var77 != null; var77 = (PendingSpawn)pendingSpawns.previous()) { // L: 1537 1538 1544 + if (var77.hitpoints == -1) { // L: 1539 + var77.delay = 0; // L: 1540 + JagexCache.method3619(var77); // L: 1541 + } else { + var77.remove(); // L: 1543 + } + } + + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 1547 + PacketBufferNode var78; + if (ByteArrayPool.client.hasFrame()) { // L: 1548 + var78 = class4.getPacketBufferNode(ClientPacket.field2330, packetWriter.isaacCipher); // L: 1550 + var78.packetBuffer.writeInt(1057001181); // L: 1551 + packetWriter.addNode(var78); // L: 1552 + } + + if (!isInInstance) { // L: 1554 + var6 = (GrandExchangeEvent.field78 - 6) / 8; // L: 1555 + var7 = (GrandExchangeEvent.field78 + 6) / 8; // L: 1556 + var69 = (AbstractWorldMapData.field198 - 6) / 8; // L: 1557 + var54 = (AbstractWorldMapData.field198 + 6) / 8; // L: 1558 + + for (var10 = var6 - 1; var10 <= var7 + 1; ++var10) { // L: 1559 + for (var11 = var69 - 1; var11 <= var54 + 1; ++var11) { // L: 1560 + if (var10 < var6 || var10 > var7 || var11 < var69 || var11 > var54) { // L: 1561 + Varcs.archive5.loadRegionFromName("m" + var10 + "_" + var11); // L: 1562 + Varcs.archive5.loadRegionFromName("l" + var10 + "_" + var11); // L: 1563 + } + } + } + } + + BuddyRankComparator.updateGameState(30); // L: 1567 + FriendSystem.playPcmPlayers(); // L: 1568 + TileItem.field1273 = null; // L: 1570 + NPC.field1161 = null; // L: 1571 + Tiles.field531 = null; // L: 1572 + UserComparator2.field3859 = null; // L: 1573 + UserComparator10.field2000 = null; // L: 1574 + class299.field3679 = null; // L: 1575 + UserComparator10.field1999 = null; // L: 1576 + GrandExchangeOfferOwnWorldComparator.Tiles_hue = null; // L: 1577 + class238.Tiles_saturation = null; // L: 1578 + TileItemPile.Tiles_lightness = null; // L: 1579 + class248.Tiles_hueMultiplier = null; // L: 1580 + class1.field1 = null; // L: 1581 + var78 = class4.getPacketBufferNode(ClientPacket.field2319, packetWriter.isaacCipher); // L: 1583 + packetWriter.addNode(var78); // L: 1584 + WorldMapLabel.method519(); // L: 1585 } } - - CollisionMap.updateGameState(30); // L: 1183 - RouteStrategy.playPcmPlayers(); // L: 1184 - Messages.method2288(); // L: 1185 - var56 = getPacketBufferNode(ClientPacket.field2318, packetWriter.isaacCipher); // L: 1186 - packetWriter.addNode(var56); // L: 1187 - WorldMapLabel.method498(); // L: 1188 } + } else { + Canvas.doCycleTitle(this); } + + if (gameState == 30) { // L: 1587 + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { // L: 1588 + this.doCycleLoggedOut(); + } + + return; // L: 1589 } - } else { - class3.doCycleTitle(this); + + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 856 } + } - if (gameState == 30) { // L: 1190 - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 1191 - this.doCycleLoggedOut(); - } - - } // L: 1192 - - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-63" + descriptor = "(ZI)V", + garbageValue = "-1812204618" ) + @Export("draw") protected final void draw(boolean var1) { - boolean var2 = Script.method2326(); // L: 1195 - if (var2 && field704 && WorldMapManager.pcmPlayer0 != null) { // L: 1196 1197 - WorldMapManager.pcmPlayer0.tryDiscard(); + boolean var2 = GrandExchangeOfferTotalQuantityComparator.method174(); // L: 1592 + if (var2 && field916 && class195.pcmPlayer0 != null) { // L: 1593 1594 + class195.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && field890 != 0L && PacketWriter.currentTimeMillis() > field890) { // L: 1199 1200 - FontName.setWindowedMode(class39.getWindowedMode()); // L: 1201 + if ((gameState == 10 || gameState == 20 || gameState == 30) && field879 != 0L && User.currentTimeMillis() > field879) { // L: 1596 1597 + class277.setWindowedMode(UrlRequester.getWindowedMode()); // L: 1598 } int var3; - if (var1) { // L: 1204 - for (var3 = 0; var3 < 100; ++var3) { // L: 1205 - field882[var3] = true; + if (var1) { // L: 1601 + for (var3 = 0; var3 < 100; ++var3) { // L: 1602 + field834[var3] = true; } } - if (gameState == 0) { // L: 1207 + if (gameState == 0) { // L: 1604 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 1208 - Player.drawTitle(class4.fontBold12, DynamicObject.fontPlain11, ItemDefinition.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 1209 - if (gameState == 20) { // L: 1210 - Player.drawTitle(class4.fontBold12, DynamicObject.fontPlain11, ItemDefinition.fontPlain12); - } else if (gameState == 25) { // L: 1211 - if (field732 == 1) { // L: 1212 - if (field728 > field711) { // L: 1213 - field711 = field728; + } else if (gameState == 5) { // L: 1605 + class60.drawTitle(ReflectionCheck.fontBold12, DevicePcmPlayerProvider.fontPlain11, WorldMapCacheName.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1606 + if (gameState == 20) { // L: 1607 + class60.drawTitle(ReflectionCheck.fontBold12, DevicePcmPlayerProvider.fontPlain11, WorldMapCacheName.fontPlain12); + } else if (gameState == 25) { // L: 1608 + if (field722 == 1) { // L: 1609 + if (field734 > field735) { // L: 1610 + field735 = field734; } - var3 = (field711 * 50 - field728 * 50) / field711; // L: 1214 - Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1215 - } else if (field732 == 2) { // L: 1217 - if (field895 > field791) { // L: 1218 - field791 = field895; + var3 = (field735 * 50 - field734 * 50) / field735; // L: 1611 + AbstractWorldMapData.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1612 + } else if (field722 == 2) { // L: 1614 + if (field848 > field737) { // L: 1615 + field737 = field848; } - var3 = (field791 * 50 - field895 * 50) / field791 + 50; // L: 1219 - Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1220 + var3 = (field737 * 50 - field848 * 50) / field737 + 50; // L: 1616 + AbstractWorldMapData.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1617 } else { - Actor.drawLoadingMessage("Loading - please wait.", false); // L: 1222 + AbstractWorldMapData.drawLoadingMessage("Loading - please wait.", false); // L: 1619 } - } else if (gameState == 30) { // L: 1224 + } else if (gameState == 30) { // L: 1621 this.drawLoggedIn(); - } else if (gameState == 40) { // L: 1225 - Actor.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 1226 - Actor.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { // L: 1622 + AbstractWorldMapData.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1623 + AbstractWorldMapData.drawLoadingMessage("Please wait...", false); } } else { - Player.drawTitle(class4.fontBold12, DynamicObject.fontPlain11, ItemDefinition.fontPlain12); // L: 1216 + class60.drawTitle(ReflectionCheck.fontBold12, DevicePcmPlayerProvider.fontPlain11, WorldMapCacheName.fontPlain12); // L: 1613 } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1227 - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1228 - if (field883[var3]) { // L: 1229 - WorldMapSprite.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1230 - field883[var3] = false; // L: 1231 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1624 + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1625 + if (field758[var3]) { // L: 1626 + class22.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1627 + field758[var3] = false; // L: 1628 } } - } else if (gameState > 0) { // L: 1235 - WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 1236 + } else if (gameState > 0) { // L: 1632 + class22.rasterProvider.drawFull(0, 0); // L: 1633 - for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1237 - field883[var3] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1634 + field758[var3] = false; } } - } // L: 1239 + } // L: 1636 - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-645621446" - ) - protected final void kill0() { - if (ClientPreferences.varcs.hasUnwrittenChanges()) { // L: 1242 - ClientPreferences.varcs.write(); - } - - if (ByteArrayPool.mouseRecorder != null) { // L: 1243 - ByteArrayPool.mouseRecorder.isRunning = false; - } - - ByteArrayPool.mouseRecorder = null; // L: 1244 - packetWriter.close(); // L: 1245 - class195.method3714(); // L: 1246 - PacketWriter.method2357(); // L: 1247 - Player.mouseWheel = null; // L: 1248 - if (WorldMapManager.pcmPlayer0 != null) { // L: 1249 - WorldMapManager.pcmPlayer0.shutdown(); - } - - if (IntHashTable.pcmPlayer1 != null) { // L: 1250 - IntHashTable.pcmPlayer1.shutdown(); - } - - GameObject.method3411(); // L: 1251 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1253 - if (ArchiveDiskActionHandler.field3179 != 0) { // L: 1254 - ArchiveDiskActionHandler.field3179 = 1; // L: 1255 - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1257 - } catch (InterruptedException var5) { // L: 1259 - } - } - } - - if (UserComparator4.urlRequester != null) { // L: 1263 - UserComparator4.urlRequester.close(); // L: 1264 - UserComparator4.urlRequester = null; // L: 1265 - } - - try { - JagexCache.JagexCache_dat2File.close(); // L: 1269 - - for (int var4 = 0; var4 < GZipDecompressor.idxCount; ++var4) { // L: 1270 - JagexCache.JagexCache_idxFiles[var4].close(); - } - - JagexCache.JagexCache_idx255File.close(); // L: 1271 - JagexCache.JagexCache_randomDat.close(); // L: 1272 - } catch (Exception var6) { // L: 1274 - } - - } // L: 1276 - - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "28" + garbageValue = "118" ) - protected final void vmethod1761() { - } // L: 669 + @Export("kill0") + protected final void kill0() { + if (FriendSystem.varcs.hasUnwrittenChanges()) { // L: 1639 + FriendSystem.varcs.write(); + } + + if (class204.mouseRecorder != null) { // L: 1640 + class204.mouseRecorder.isRunning = false; + } + + class204.mouseRecorder = null; // L: 1641 + packetWriter.close(); // L: 1642 + if (KeyHandler.KeyHandler_instance != null) { // L: 1644 + synchronized(KeyHandler.KeyHandler_instance) { // L: 1645 + KeyHandler.KeyHandler_instance = null; // L: 1646 + } // L: 1647 + } + + NPC.method2146(); // L: 1650 + class8.mouseWheel = null; // L: 1651 + if (class195.pcmPlayer0 != null) { // L: 1652 + class195.pcmPlayer0.shutdown(); + } + + if (class23.pcmPlayer1 != null) { // L: 1653 + class23.pcmPlayer1.shutdown(); + } + + if (NetCache.NetCache_socket != null) { // L: 1655 + NetCache.NetCache_socket.close(); + } + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1658 + if (ArchiveDiskActionHandler.field3176 != 0) { // L: 1659 + ArchiveDiskActionHandler.field3176 = 1; // L: 1660 + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1662 + } catch (InterruptedException var4) { // L: 1664 + } + } + } + + if (class52.urlRequester != null) { // L: 1668 + class52.urlRequester.close(); // L: 1669 + class52.urlRequester = null; // L: 1670 + } + + InterfaceParent.method1270(); // L: 1672 + } // L: 1673 + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-51" + ) + protected final void vmethod1384() { + } // L: 670 public final void init() { try { - if (this.checkHost()) { // L: 675 - for (int var1 = 0; var1 <= 19; ++var1) { // L: 676 - String var2 = this.getParameter(Integer.toString(var1)); // L: 677 - if (var2 != null) { // L: 678 - switch(var1) { // L: 679 + if (this.checkHost()) { // L: 676 + for (int var1 = 0; var1 <= 20; ++var1) { // L: 677 + String var2 = this.getParameter(Integer.toString(var1)); // L: 678 + if (var2 != null) { // L: 679 + switch(var1) { // L: 680 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 692 + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 765 case 2: case 11: case 13: @@ -2120,3562 +2837,3464 @@ public final class Client extends GameShell implements Usernamed { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 697 + if (var2.equalsIgnoreCase("true")) { // L: 688 isMembersWorld = true; } else { - isMembersWorld = false; // L: 698 + isMembersWorld = false; // L: 689 } break; case 4: - if (clientType == -1) { // L: 755 - clientType = Integer.parseInt(var2); // L: 756 + if (clientType == -1) { // L: 751 + clientType = Integer.parseInt(var2); // L: 752 } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 730 - break; // L: 731 + worldProperties = Integer.parseInt(var2); // L: 770 + break; case 6: - int var4 = Integer.parseInt(var2); // L: 736 - Language var3; - if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 738 - var3 = Language.Language_valuesOrdered[var4]; // L: 742 - } else { - var3 = null; // L: 739 + FontName.clientLanguage = Language.method3800(Integer.parseInt(var2)); // L: 694 + break; // L: 695 + case 7: + int var4 = Integer.parseInt(var2); // L: 726 + GameBuild[] var5 = new GameBuild[]{GameBuild.RC, GameBuild.BUILDLIVE, GameBuild.LIVE, GameBuild.WIP}; // L: 731 + GameBuild[] var6 = var5; // L: 733 + int var7 = 0; + + GameBuild var3; + while (true) { + if (var7 >= var6.length) { + var3 = null; // L: 744 + break; + } + + GameBuild var8 = var6[var7]; // L: 735 + if (var4 == var8.buildId) { // L: 737 + var3 = var8; // L: 738 + break; // L: 739 + } + + ++var7; // L: 734 } - class58.clientLanguage = var3; // L: 744 - break; // L: 745 - case 7: - DirectByteArrayCopier.field2525 = TextureProvider.method2863(Integer.parseInt(var2)); // L: 687 - break; // L: 688 + ChatChannel.field1334 = var3; // L: 746 + break; // L: 747 case 8: - if (var2.equalsIgnoreCase("true")) { // L: 749 + if (var2.equalsIgnoreCase("true")) { // L: 704 } break; case 9: - class200.field2403 = var2; // L: 715 + WorldMapRegion.field281 = var2; // L: 715 break; // L: 716 case 10: - Tiles.field532 = (StudioGame)TextureProvider.findEnumerated(class41.method624(), Integer.parseInt(var2)); // L: 703 - if (StudioGame.oldscape == Tiles.field532) { // L: 704 - WorldMapAreaData.loginType = LoginType.oldscape; + GrandExchangeOfferWorldComparator.field58 = (StudioGame)class195.findEnumerated(TileItem.method2237(), Integer.parseInt(var2)); // L: 758 + if (StudioGame.oldscape == GrandExchangeOfferWorldComparator.field58) { // L: 759 + UserComparator4.loginType = LoginType.oldscape; } else { - WorldMapAreaData.loginType = LoginType.field4062; // L: 705 + UserComparator4.loginType = LoginType.field4061; // L: 760 } break; case 12: worldId = Integer.parseInt(var2); // L: 710 break; // L: 711 case 14: - GrandExchangeOffer.field99 = Integer.parseInt(var2); // L: 725 - break; // L: 726 - case 15: - gameBuild = Integer.parseInt(var2); // L: 720 + TextureProvider.field1561 = Integer.parseInt(var2); // L: 720 break; // L: 721 + case 15: + gameBuild = Integer.parseInt(var2); // L: 699 + break; // L: 700 case 17: - BZip2State.worldListURL = var2; // L: 682 + PcmPlayer.worldListURL = var2; // L: 683 } } } - HealthBarUpdate.method1818(); // L: 763 - ItemContainer.worldHost = this.getCodeBase().getHost(); // L: 764 - String var5 = DirectByteArrayCopier.field2525.name; // L: 765 - byte var6 = 0; // L: 766 + Scene.Scene_isLowDetail = false; // L: 777 + isLowDetail = false; // L: 778 + UserComparator6.worldHost = this.getCodeBase().getHost(); // L: 780 + String var9 = ChatChannel.field1334.name; // L: 781 + byte var10 = 0; // L: 782 try { - class90.method2138("oldschool", var5, var6, 21); // L: 768 - } catch (Exception var7) { // L: 770 - Decimator.RunException_sendStackTrace((String)null, var7); // L: 771 + MusicPatchPcmStream.method4041("oldschool", var9, var10, 21); // L: 784 + } catch (Exception var11) { // L: 786 + PacketWriter.RunException_sendStackTrace((String)null, var11); // L: 787 } - class2.client = this; // L: 773 - WorldMapID.clientType = clientType; // L: 774 - this.startThread(765, 503, 191); // L: 775 - } - } catch (RuntimeException var8) { - throw class25.newRunException(var8, "client.init(" + ')'); - } - } // L: 776 - - @ObfuscatedName("eb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "858164113" - ) - void doCycleJs5() { - if (gameState != 1000) { // L: 1315 - boolean var1 = BoundaryObject.method3384(); // L: 1316 - if (!var1) { // L: 1317 - this.doCycleJs5Connect(); - } - - } - } // L: 1318 - - @ObfuscatedName("et") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-32277298" - ) - void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1321 - this.error("js5crc"); // L: 1322 - gameState = 1000; // L: 1323 - } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 1326 - if (gameState <= 5) { // L: 1327 - this.error("js5io"); // L: 1328 - gameState = 1000; // L: 1329 - return; // L: 1330 - } - - field712 = 3000; // L: 1333 - NetCache.NetCache_ioExceptions = 3; // L: 1334 - } - - if (--field712 + 1 <= 0) { // L: 1337 - try { - if (js5ConnectState == 0) { // L: 1339 - UserComparator7.js5SocketTask = GameShell.taskHandler.newSocketTask(ItemContainer.worldHost, WorldMapScaleHandler.port3); // L: 1340 - ++js5ConnectState; // L: 1341 - } - - if (js5ConnectState == 1) { // L: 1343 - if (UserComparator7.js5SocketTask.status == 2) { // L: 1344 - this.js5Error(-1); // L: 1345 - return; // L: 1346 - } - - if (UserComparator7.js5SocketTask.status == 1) { // L: 1348 - ++js5ConnectState; - } - } - - if (js5ConnectState == 2) { // L: 1350 - if (useBufferedSocket) { // L: 1351 - ItemContainer.js5Socket = ModelData0.method3375((Socket)UserComparator7.js5SocketTask.result, 40000, 5000); // L: 1352 - } else { - ItemContainer.js5Socket = new NetSocket((Socket)UserComparator7.js5SocketTask.result, GameShell.taskHandler, 5000); // L: 1355 - } - - Buffer var1 = new Buffer(5); // L: 1357 - var1.writeByte(15); // L: 1358 - var1.writeInt(191); // L: 1359 - ItemContainer.js5Socket.write(var1.array, 0, 5); // L: 1360 - ++js5ConnectState; // L: 1361 - KeyHandler.field428 = PacketWriter.currentTimeMillis(); // L: 1362 - } - - if (js5ConnectState == 3) { // L: 1364 - if (ItemContainer.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1365 - int var2 = ItemContainer.js5Socket.readUnsignedByte(); // L: 1366 - if (var2 != 0) { // L: 1367 - this.js5Error(var2); // L: 1368 - return; // L: 1369 - } - - ++js5ConnectState; // L: 1371 - } else if (PacketWriter.currentTimeMillis() - KeyHandler.field428 > 30000L) { // L: 1374 - this.js5Error(-2); // L: 1375 - return; // L: 1376 - } - } - - if (js5ConnectState == 4) { // L: 1380 - Widget.method4173(ItemContainer.js5Socket, gameState > 20); // L: 1381 - UserComparator7.js5SocketTask = null; // L: 1382 - ItemContainer.js5Socket = null; // L: 1383 - js5ConnectState = 0; // L: 1384 - js5Errors = 0; // L: 1385 - } - } catch (IOException var3) { // L: 1388 - this.js5Error(-3); // L: 1389 + ByteArrayPool.client = this; // L: 789 + NetFileRequest.clientType = clientType; // L: 790 + if (field686 == -1) { // L: 791 + field686 = 0; // L: 792 } + this.startThread(765, 503, 192); // L: 794 } + } catch (RuntimeException var12) { + throw Login.newRunException(var12, "client.init(" + ')'); } - } // L: 1324 1391 - - @ObfuscatedName("ef") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1255510114" - ) - void js5Error(int var1) { - UserComparator7.js5SocketTask = null; // L: 1394 - ItemContainer.js5Socket = null; // L: 1395 - js5ConnectState = 0; // L: 1396 - if (WorldMapScaleHandler.port3 == port1) { // L: 1397 - WorldMapScaleHandler.port3 = class23.port2; - } else { - WorldMapScaleHandler.port3 = port1; // L: 1398 - } - - ++js5Errors; // L: 1399 - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1400 - if (gameState <= 5) { // L: 1401 - this.error("js5connect_full"); // L: 1402 - gameState = 1000; // L: 1403 - } else { - field712 = 3000; // L: 1405 - } - } else if (js5Errors >= 2 && var1 == 6) { // L: 1407 - this.error("js5connect_outofdate"); // L: 1408 - gameState = 1000; // L: 1409 - } else if (js5Errors >= 4) { // L: 1411 - if (gameState <= 5) { // L: 1412 - this.error("js5connect"); // L: 1413 - gameState = 1000; // L: 1414 - } else { - field712 = 3000; // L: 1416 - } - } - - } // L: 1418 + } // L: 795 @ObfuscatedName("ei") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-407945770" + garbageValue = "627377805" ) - final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 1853 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 1854 + @Export("doCycleJs5") + void doCycleJs5() { + if (gameState != 1000) { // L: 1732 + boolean var1 = Occluder.method3411(); // L: 1733 + if (!var1) { // L: 1734 + this.doCycleJs5Connect(); + } - try { - if (loginState == 0) { // L: 1856 - if (WorldMapID.secureRandom == null && (secureRandomFuture.isDone() || field822 > 250)) { // L: 1857 - WorldMapID.secureRandom = secureRandomFuture.get(); // L: 1858 - secureRandomFuture.shutdown(); // L: 1859 - secureRandomFuture = null; // L: 1860 + } + } // L: 1735 + + @ObfuscatedName("ef") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-55" + ) + @Export("doCycleJs5Connect") + void doCycleJs5Connect() { + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1738 + this.error("js5crc"); // L: 1739 + gameState = 1000; // L: 1740 + } else { + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1743 + if (gameState <= 5) { // L: 1744 + this.error("js5io"); // L: 1745 + gameState = 1000; // L: 1746 + return; // L: 1747 } - if (WorldMapID.secureRandom != null) { // L: 1862 - if (var1 != null) { // L: 1863 - ((AbstractSocket)var1).close(); // L: 1864 - var1 = null; // L: 1865 + field794 = 3000; // L: 1750 + NetCache.NetCache_ioExceptions = 3; // L: 1751 + } + + if (--field794 + 1 <= 0) { // L: 1754 + try { + if (js5ConnectState == 0) { // L: 1756 + UserComparator10.js5SocketTask = GameShell.taskHandler.newSocketTask(UserComparator6.worldHost, class41.port3); // L: 1757 + ++js5ConnectState; // L: 1758 } - MouseRecorder.socketTask = null; // L: 1867 - field713 = false; // L: 1868 - field822 = 0; // L: 1869 - loginState = 1; // L: 1870 + if (js5ConnectState == 1) { // L: 1760 + if (UserComparator10.js5SocketTask.status == 2) { // L: 1761 + this.js5Error(-1); // L: 1762 + return; // L: 1763 + } + + if (UserComparator10.js5SocketTask.status == 1) { // L: 1765 + ++js5ConnectState; + } + } + + if (js5ConnectState == 2) { // L: 1767 + if (useBufferedSocket) { // L: 1768 + Socket var2 = (Socket)UserComparator10.js5SocketTask.result; // L: 1770 + BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1772 + KeyHandler.js5Socket = var1; // L: 1774 + } else { + KeyHandler.js5Socket = new NetSocket((Socket)UserComparator10.js5SocketTask.result, GameShell.taskHandler, 5000); // L: 1777 + } + + Buffer var11 = new Buffer(5); // L: 1779 + var11.writeByte(15); // L: 1780 + var11.writeInt(192); // L: 1781 + KeyHandler.js5Socket.write(var11.array, 0, 5); // L: 1782 + ++js5ConnectState; // L: 1783 + field696 = User.currentTimeMillis(); // L: 1784 + } + + if (js5ConnectState == 3) { // L: 1786 + if (KeyHandler.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1787 + int var5 = KeyHandler.js5Socket.readUnsignedByte(); // L: 1788 + if (var5 != 0) { // L: 1789 + this.js5Error(var5); // L: 1790 + return; // L: 1791 + } + + ++js5ConnectState; // L: 1793 + } else if (User.currentTimeMillis() - field696 > 30000L) { // L: 1796 + this.js5Error(-2); // L: 1797 + return; // L: 1798 + } + } + + if (js5ConnectState == 4) { // L: 1802 + AbstractSocket var12 = KeyHandler.js5Socket; // L: 1803 + boolean var6 = gameState > 20; // L: 1804 + if (NetCache.NetCache_socket != null) { // L: 1806 + try { + NetCache.NetCache_socket.close(); // L: 1808 + } catch (Exception var9) { // L: 1810 + } + + NetCache.NetCache_socket = null; // L: 1811 + } + + NetCache.NetCache_socket = var12; // L: 1813 + WorldMapSection0.method323(var6); // L: 1814 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1815 + NetCache.NetCache_currentResponse = null; // L: 1816 + NetCache.NetCache_responseArchiveBuffer = null; // L: 1817 + NetCache.field3190 = 0; // L: 1818 + + while (true) { + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1820 + if (var3 == null) { // L: 1821 + while (true) { + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1827 + if (var3 == null) { // L: 1828 + if (NetCache.field3207 != 0) { // L: 1834 + try { + Buffer var13 = new Buffer(4); // L: 1836 + var13.writeByte(4); // L: 1837 + var13.writeByte(NetCache.field3207); // L: 1838 + var13.writeShort(0); // L: 1839 + NetCache.NetCache_socket.write(var13.array, 0, 4); // L: 1840 + } catch (IOException var8) { + try { + NetCache.NetCache_socket.close(); // L: 1844 + } catch (Exception var7) { // L: 1846 + } + + ++NetCache.NetCache_ioExceptions; // L: 1847 + NetCache.NetCache_socket = null; // L: 1848 + } + } + + NetCache.NetCache_loadTime = 0; // L: 1851 + JagexCache.field2081 = User.currentTimeMillis(); // L: 1852 + UserComparator10.js5SocketTask = null; // L: 1854 + KeyHandler.js5Socket = null; // L: 1855 + js5ConnectState = 0; // L: 1856 + js5Errors = 0; // L: 1857 + return; // L: 1863 + } + + NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1829 + NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1830 + ++NetCache.NetCache_pendingWritesCount; // L: 1831 + --NetCache.NetCache_pendingResponsesCount; // L: 1832 + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1822 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1823 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1824 + } + } + } catch (IOException var10) { // L: 1860 + this.js5Error(-3); // L: 1861 + } + + } + } + } // L: 1741 + + @ObfuscatedName("ec") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1036771448" + ) + @Export("js5Error") + void js5Error(int var1) { + UserComparator10.js5SocketTask = null; // L: 1866 + KeyHandler.js5Socket = null; // L: 1867 + js5ConnectState = 0; // L: 1868 + if (Coord.port1 == class41.port3) { // L: 1869 + class41.port3 = Coord.port2; + } else { + class41.port3 = Coord.port1; // L: 1870 + } + + ++js5Errors; // L: 1871 + if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1872 + if (js5Errors >= 2 && var1 == 6) { // L: 1879 + this.error("js5connect_outofdate"); // L: 1880 + gameState = 1000; // L: 1881 + } else if (js5Errors >= 4) { // L: 1883 + if (gameState <= 5) { // L: 1884 + this.error("js5connect"); // L: 1885 + gameState = 1000; // L: 1886 + } else { + field794 = 3000; // L: 1888 + } + } + } else if (gameState <= 5) { // L: 1873 + this.error("js5connect_full"); // L: 1874 + gameState = 1000; // L: 1875 + } else { + field794 = 3000; // L: 1877 + } + + } // L: 1890 + + @ObfuscatedName("ey") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-89707600" + ) + @Export("doCycleLoggedOut") + final void doCycleLoggedOut() { + Object var1 = packetWriter.getSocket(); // L: 2303 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 2304 + + try { + if (loginState == 0) { // L: 2306 + if (class195.secureRandom == null && (secureRandomFuture.isDone() || field947 > 250)) { // L: 2307 + class195.secureRandom = secureRandomFuture.get(); // L: 2308 + secureRandomFuture.shutdown(); // L: 2309 + secureRandomFuture = null; // L: 2310 + } + + if (class195.secureRandom != null) { // L: 2312 + if (var1 != null) { // L: 2313 + ((AbstractSocket)var1).close(); // L: 2314 + var1 = null; // L: 2315 + } + + UserComparator5.socketTask = null; // L: 2317 + field730 = false; // L: 2318 + field947 = 0; // L: 2319 + loginState = 1; // L: 2320 } } - if (loginState == 1) { // L: 1873 - if (MouseRecorder.socketTask == null) { // L: 1874 - MouseRecorder.socketTask = GameShell.taskHandler.newSocketTask(ItemContainer.worldHost, WorldMapScaleHandler.port3); // L: 1875 + if (loginState == 1) { // L: 2323 + if (UserComparator5.socketTask == null) { // L: 2324 + UserComparator5.socketTask = GameShell.taskHandler.newSocketTask(UserComparator6.worldHost, class41.port3); // L: 2325 } - if (MouseRecorder.socketTask.status == 2) { // L: 1877 + if (UserComparator5.socketTask.status == 2) { // L: 2327 throw new IOException(); } - if (MouseRecorder.socketTask.status == 1) { // L: 1878 - if (useBufferedSocket) { // L: 1879 - var1 = ModelData0.method3375((Socket)MouseRecorder.socketTask.result, 40000, 5000); // L: 1880 + if (UserComparator5.socketTask.status == 1) { // L: 2328 + if (useBufferedSocket) { // L: 2329 + Socket var4 = (Socket)UserComparator5.socketTask.result; // L: 2331 + BufferedNetSocket var3 = new BufferedNetSocket(var4, 40000, 5000); // L: 2333 + var1 = var3; // L: 2335 } else { - var1 = new NetSocket((Socket)MouseRecorder.socketTask.result, GameShell.taskHandler, 5000); // L: 1883 + var1 = new NetSocket((Socket)UserComparator5.socketTask.result, GameShell.taskHandler, 5000); // L: 2338 } - packetWriter.setSocket((AbstractSocket)var1); // L: 1885 - MouseRecorder.socketTask = null; // L: 1886 - loginState = 2; // L: 1887 + packetWriter.setSocket((AbstractSocket)var1); // L: 2340 + UserComparator5.socketTask = null; // L: 2341 + loginState = 2; // L: 2342 } } - PacketBufferNode var3; - if (loginState == 2) { // L: 1890 - packetWriter.clearBuffer(); // L: 1891 - var3 = Archive.method4385(); // L: 1892 - var3.packetBuffer.writeByte(LoginPacket.field2360.id); // L: 1893 - packetWriter.addNode(var3); // L: 1894 - packetWriter.flush(); // L: 1895 - var2.offset = 0; // L: 1896 - loginState = 3; // L: 1897 + PacketBufferNode var22; + if (loginState == 2) { // L: 2345 + packetWriter.clearBuffer(); // L: 2346 + var22 = class206.method3853(); // L: 2347 + var22.packetBuffer.writeByte(LoginPacket.field2340.id); // L: 2348 + packetWriter.addNode(var22); // L: 2349 + packetWriter.flush(); // L: 2350 + var2.offset = 0; // L: 2351 + loginState = 3; // L: 2352 } - int var4; boolean var12; - if (loginState == 3) { // L: 1899 - if (WorldMapManager.pcmPlayer0 != null) { // L: 1900 - WorldMapManager.pcmPlayer0.method2517(); + int var13; + if (loginState == 3) { // L: 2354 + if (class195.pcmPlayer0 != null) { // L: 2355 + class195.pcmPlayer0.method2562(); } - if (IntHashTable.pcmPlayer1 != null) { // L: 1901 - IntHashTable.pcmPlayer1.method2517(); + if (class23.pcmPlayer1 != null) { // L: 2356 + class23.pcmPlayer1.method2562(); } - var12 = true; // L: 1902 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1903 1904 + var12 = true; // L: 2357 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2358 2359 var12 = false; } - if (var12) { // L: 1906 - var4 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1907 - if (WorldMapManager.pcmPlayer0 != null) { // L: 1908 - WorldMapManager.pcmPlayer0.method2517(); + if (var12) { // L: 2361 + var13 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2362 + if (class195.pcmPlayer0 != null) { // L: 2363 + class195.pcmPlayer0.method2562(); } - if (IntHashTable.pcmPlayer1 != null) { // L: 1909 - IntHashTable.pcmPlayer1.method2517(); + if (class23.pcmPlayer1 != null) { // L: 2364 + class23.pcmPlayer1.method2562(); } - if (var4 != 0) { // L: 1910 - class58.getLoginError(var4); // L: 1911 - return; // L: 1912 + if (var13 != 0) { // L: 2365 + WorldMapData_0.getLoginError(var13); // L: 2366 + return; // L: 2367 } - var2.offset = 0; // L: 1914 - loginState = 4; // L: 1915 + var2.offset = 0; // L: 2369 + loginState = 4; // L: 2370 } } - int var34; - if (loginState == 4) { // L: 1918 - if (var2.offset < 8) { // L: 1919 - var34 = ((AbstractSocket)var1).available(); // L: 1920 - if (var34 > 8 - var2.offset) { // L: 1921 - var34 = 8 - var2.offset; + int var37; + if (loginState == 4) { // L: 2373 + if (var2.offset < 8) { // L: 2374 + var37 = ((AbstractSocket)var1).available(); // L: 2375 + if (var37 > 8 - var2.offset) { // L: 2376 + var37 = 8 - var2.offset; } - if (var34 > 0) { // L: 1922 - ((AbstractSocket)var1).read(var2.array, var2.offset, var34); // L: 1923 - var2.offset += var34; // L: 1924 + if (var37 > 0) { // L: 2377 + ((AbstractSocket)var1).read(var2.array, var2.offset, var37); // L: 2378 + var2.offset += var37; // L: 2379 } } - if (var2.offset == 8) { // L: 1927 - var2.offset = 0; // L: 1928 - PcmPlayer.field1430 = var2.readLong(); // L: 1929 - loginState = 5; // L: 1930 + if (var2.offset == 8) { // L: 2382 + var2.offset = 0; // L: 2383 + VerticalAlignment.field3222 = var2.readLong(); // L: 2384 + loginState = 5; // L: 2385 } } int var7; int var9; int var14; - if (loginState == 5) { // L: 1933 - packetWriter.packetBuffer.offset = 0; // L: 1934 - packetWriter.clearBuffer(); // L: 1935 - PacketBuffer var22 = new PacketBuffer(500); // L: 1936 - int[] var13 = new int[]{WorldMapID.secureRandom.nextInt(), WorldMapID.secureRandom.nextInt(), WorldMapID.secureRandom.nextInt(), WorldMapID.secureRandom.nextInt()}; // L: 1937 1938 1939 1940 1941 - var22.offset = 0; // L: 1942 - var22.writeByte(1); // L: 1943 - var22.writeInt(var13[0]); // L: 1944 - var22.writeInt(var13[1]); // L: 1945 - var22.writeInt(var13[2]); // L: 1946 - var22.writeInt(var13[3]); // L: 1947 - var22.writeLong(PcmPlayer.field1430); // L: 1948 + if (loginState == 5) { // L: 2388 + packetWriter.packetBuffer.offset = 0; // L: 2389 + packetWriter.clearBuffer(); // L: 2390 + PacketBuffer var23 = new PacketBuffer(500); // L: 2391 + int[] var25 = new int[]{class195.secureRandom.nextInt(), class195.secureRandom.nextInt(), class195.secureRandom.nextInt(), class195.secureRandom.nextInt()}; // L: 2392 2393 2394 2395 2396 + var23.offset = 0; // L: 2397 + var23.writeByte(1); // L: 2398 + var23.writeInt(var25[0]); // L: 2399 + var23.writeInt(var25[1]); // L: 2400 + var23.writeInt(var25[2]); // L: 2401 + var23.writeInt(var25[3]); // L: 2402 + var23.writeLong(VerticalAlignment.field3222); // L: 2403 int var10; - if (gameState == 40) { // L: 1949 - var22.writeInt(UserComparator10.field2017[0]); // L: 1950 - var22.writeInt(UserComparator10.field2017[1]); // L: 1951 - var22.writeInt(UserComparator10.field2017[2]); // L: 1952 - var22.writeInt(UserComparator10.field2017[3]); // L: 1953 + if (gameState == 40) { // L: 2404 + var23.writeInt(GrandExchangeEvent.field77[0]); // L: 2405 + var23.writeInt(GrandExchangeEvent.field77[1]); // L: 2406 + var23.writeInt(GrandExchangeEvent.field77[2]); // L: 2407 + var23.writeInt(GrandExchangeEvent.field77[3]); // L: 2408 } else { - var22.writeByte(field710.rsOrdinal()); // L: 1956 - switch(field710.field2042) { // L: 1957 + var23.writeByte(field717.rsOrdinal()); // L: 2411 + switch(field717.field2032) { // L: 2412 case 0: - case 1: - var22.writeMedium(LoginScreenAnimation.field1070); // L: 1966 - ++var22.offset; // L: 1967 - break; // L: 1968 - case 2: - var22.offset += 4; // L: 1960 - break; // L: 1961 case 3: - LinkedHashMap var6 = Tile.clientPreferences.parameters; // L: 1973 - String var8 = Login.Login_username; // L: 1975 - var9 = var8.length(); // L: 1977 - var10 = 0; // L: 1978 + var23.writeMedium(class169.field2035); // L: 2421 + ++var23.offset; // L: 2422 + break; // L: 2423 + case 1: + var23.offset += 4; // L: 2415 + break; // L: 2416 + case 2: + LinkedHashMap var6 = GrandExchangeOfferAgeComparator.clientPreferences.parameters; // L: 2428 + String var8 = Login.Login_username; // L: 2430 + var9 = var8.length(); // L: 2432 + var10 = 0; // L: 2433 - for (int var11 = 0; var11 < var9; ++var11) { // L: 1979 + for (int var11 = 0; var11 < var9; ++var11) { // L: 2434 var10 = (var10 << 5) - var10 + var8.charAt(var11); } - var22.writeInt((Integer)var6.get(var10)); // L: 1982 + var23.writeInt((Integer)var6.get(var10)); // L: 2437 } - var22.writeByte(class322.field3841.rsOrdinal()); // L: 1986 - var22.writeStringCp1252NullTerminated(Login.Login_password); // L: 1987 + var23.writeByte(class323.field3849.rsOrdinal()); // L: 2441 + var23.writeStringCp1252NullTerminated(Login.Login_password); // L: 2442 } - var22.encryptRsa(class92.field1186, class92.field1187); // L: 1989 - UserComparator10.field2017 = var13; // L: 1990 - PacketBufferNode var5 = Archive.method4385(); // L: 1991 - var5.packetBuffer.offset = 0; // L: 1992 - if (gameState == 40) { // L: 1993 - var5.packetBuffer.writeByte(LoginPacket.field2352.id); // L: 1994 + var23.encryptRsa(class92.field1198, class92.field1197); // L: 2444 + GrandExchangeEvent.field77 = var25; // L: 2445 + PacketBufferNode var5 = class206.method3853(); // L: 2446 + var5.packetBuffer.offset = 0; // L: 2447 + if (gameState == 40) { // L: 2448 + var5.packetBuffer.writeByte(LoginPacket.field2341.id); // L: 2449 } else { - var5.packetBuffer.writeByte(LoginPacket.field2351.id); // L: 1997 + var5.packetBuffer.writeByte(LoginPacket.field2339.id); // L: 2452 } - var5.packetBuffer.writeShort(0); // L: 1999 - var14 = var5.packetBuffer.offset; // L: 2000 - var5.packetBuffer.writeInt(191); // L: 2001 - var5.packetBuffer.writeInt(1); // L: 2002 - var5.packetBuffer.writeByte(clientType); // L: 2003 - var5.packetBuffer.writeBytes(var22.array, 0, var22.offset); // L: 2004 - var7 = var5.packetBuffer.offset; // L: 2005 - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2006 - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2007 - var5.packetBuffer.writeShort(FloorDecoration.canvasWidth); // L: 2008 - var5.packetBuffer.writeShort(GameShell.canvasHeight); // L: 2009 - WorldMapData_1.method783(var5.packetBuffer); // L: 2010 - var5.packetBuffer.writeStringCp1252NullTerminated(class200.field2403); // L: 2011 - var5.packetBuffer.writeInt(GrandExchangeOffer.field99); // L: 2012 - Buffer var32 = new Buffer(WorldMapArea.platformInfo.size()); // L: 2013 - WorldMapArea.platformInfo.write(var32); // L: 2014 - var5.packetBuffer.writeBytes(var32.array, 0, var32.array.length); // L: 2015 - var5.packetBuffer.writeByte(clientType); // L: 2016 - var5.packetBuffer.writeInt(0); // L: 2017 - var5.packetBuffer.method5663(WorldMapData_1.archive19.hash); // L: 2018 - var5.packetBuffer.method5663(PlayerAppearance.archive14.hash); // L: 2019 - var5.packetBuffer.writeShortLE(Occluder.archive10.hash); // L: 2020 - var5.packetBuffer.method5662(Huffman.archive8.hash); // L: 2021 - var5.packetBuffer.writeInt(FontName.archive20.hash); // L: 2022 - var5.packetBuffer.method5663(MouseRecorder.archive18.hash); // L: 2023 - var5.packetBuffer.writeShortLE(GrandExchangeOfferUnitPriceComparator.archive4.hash); // L: 2024 - var5.packetBuffer.writeShortLE(PlayerAppearance.archive15.hash); // L: 2025 - var5.packetBuffer.method5662(GrandExchangeEvent.archive11.hash); // L: 2026 - var5.packetBuffer.method5663(WorldMapID.archive3.hash); // L: 2027 - var5.packetBuffer.method5663(TilePaint.archive13.hash); // L: 2028 - var5.packetBuffer.method5663(WorldMapSection1.archive7.hash); // L: 2029 - var5.packetBuffer.writeShortLE(class3.archive17.hash); // L: 2030 - var5.packetBuffer.writeInt(archive1.hash); // L: 2031 - var5.packetBuffer.method5663(0); // L: 2032 - var5.packetBuffer.writeInt(ApproximateRouteStrategy.archive12.hash); // L: 2033 - var5.packetBuffer.method5663(UrlRequester.archive9.hash); // L: 2034 - var5.packetBuffer.method5663(class182.archive0.hash); // L: 2035 - var5.packetBuffer.writeInt(NetFileRequest.archive2.hash); // L: 2036 - var5.packetBuffer.writeInt(CollisionMap.archive6.hash); // L: 2037 - var5.packetBuffer.method5663(WorldMapLabel.archive5.hash); // L: 2038 - var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); // L: 2039 - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 2040 - packetWriter.addNode(var5); // L: 2041 - packetWriter.flush(); // L: 2042 - packetWriter.isaacCipher = new IsaacCipher(var13); // L: 2043 - int[] var15 = new int[4]; // L: 2044 + var5.packetBuffer.writeShort(0); // L: 2454 + var14 = var5.packetBuffer.offset; // L: 2455 + var5.packetBuffer.writeInt(192); // L: 2456 + var5.packetBuffer.writeInt(1); // L: 2457 + var5.packetBuffer.writeByte(clientType); // L: 2458 + var5.packetBuffer.writeByte(field686); // L: 2459 + var5.packetBuffer.writeBytes(var23.array, 0, var23.offset); // L: 2460 + var7 = var5.packetBuffer.offset; // L: 2461 + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2462 + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2463 + var5.packetBuffer.writeShort(ItemContainer.canvasWidth); // L: 2464 + var5.packetBuffer.writeShort(HealthBar.canvasHeight); // L: 2465 + Language.method3801(var5.packetBuffer); // L: 2466 + var5.packetBuffer.writeStringCp1252NullTerminated(WorldMapRegion.field281); // L: 2467 + var5.packetBuffer.writeInt(TextureProvider.field1561); // L: 2468 + Buffer var35 = new Buffer(Skills.platformInfo.size()); // L: 2469 + Skills.platformInfo.write(var35); // L: 2470 + var5.packetBuffer.writeBytes(var35.array, 0, var35.array.length); // L: 2471 + var5.packetBuffer.writeByte(clientType); // L: 2472 + var5.packetBuffer.writeInt(0); // L: 2473 + var5.packetBuffer.writeInt(Username.archive4.hash); // L: 2474 + var5.packetBuffer.writeInt(class1.archive15.hash); // L: 2475 + var5.packetBuffer.writeInt(FaceNormal.archive3.hash); // L: 2476 + var5.packetBuffer.method5684(Tiles.archive20.hash); // L: 2477 + var5.packetBuffer.writeInt(class281.archive10.hash); // L: 2478 + var5.packetBuffer.method5684(MenuAction.archive0.hash); // L: 2479 + var5.packetBuffer.method5682(class236.archive7.hash); // L: 2480 + var5.packetBuffer.method5683(AbstractByteArrayCopier.archive11.hash); // L: 2481 + var5.packetBuffer.method5682(AbstractByteArrayCopier.archive14.hash); // L: 2482 + var5.packetBuffer.method5682(GrandExchangeOffer.archive8.hash); // L: 2483 + var5.packetBuffer.method5683(ViewportMouse.archive12.hash); // L: 2484 + var5.packetBuffer.method5683(ModelData0.archive18.hash); // L: 2485 + var5.packetBuffer.method5682(class8.archive13.hash); // L: 2486 + var5.packetBuffer.writeInt(ApproximateRouteStrategy.archive6.hash); // L: 2487 + var5.packetBuffer.writeInt(class60.archive19.hash); // L: 2488 + var5.packetBuffer.writeInt(class23.archive17.hash); // L: 2489 + var5.packetBuffer.method5683(WorldMapManager.archive1.hash); // L: 2490 + var5.packetBuffer.method5682(0); // L: 2491 + var5.packetBuffer.writeInt(WorldMapSection3.archive2.hash); // L: 2492 + var5.packetBuffer.method5682(WorldMapData_1.archive9.hash); // L: 2493 + var5.packetBuffer.method5684(Varcs.archive5.hash); // L: 2494 + var5.packetBuffer.xteaEncrypt(var25, var7, var5.packetBuffer.offset); // L: 2495 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 2496 + packetWriter.addNode(var5); // L: 2497 + packetWriter.flush(); // L: 2498 + packetWriter.isaacCipher = new IsaacCipher(var25); // L: 2499 + int[] var15 = new int[4]; // L: 2500 - for (var10 = 0; var10 < 4; ++var10) { // L: 2045 - var15[var10] = var13[var10] + 50; + for (var10 = 0; var10 < 4; ++var10) { // L: 2501 + var15[var10] = var25[var10] + 50; } - var2.newIsaacCipher(var15); // L: 2046 - loginState = 6; // L: 2047 + var2.newIsaacCipher(var15); // L: 2502 + loginState = 6; // L: 2503 } - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2049 2050 - var34 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2051 - if (var34 == 21 && gameState == 20) { // L: 2052 - loginState = 12; // L: 2053 - } else if (var34 == 2) { // L: 2055 - loginState = 14; // L: 2056 - } else if (var34 == 15 && gameState == 40) { // L: 2058 - packetWriter.serverPacketLength = -1; // L: 2059 - loginState = 19; // L: 2060 - } else if (var34 == 64) { // L: 2062 - loginState = 10; // L: 2063 - } else if (var34 == 23 && field708 < 1) { // L: 2065 - ++field708; // L: 2066 - loginState = 0; // L: 2067 - } else if (var34 == 29) { // L: 2069 - loginState = 17; // L: 2070 + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2505 2506 + var37 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2507 + if (var37 == 21 && gameState == 20) { // L: 2508 + loginState = 12; // L: 2509 + } else if (var37 == 2) { // L: 2511 + loginState = 14; // L: 2512 + } else if (var37 == 15 && gameState == 40) { // L: 2514 + packetWriter.serverPacketLength = -1; // L: 2515 + loginState = 19; // L: 2516 + } else if (var37 == 64) { // L: 2518 + loginState = 10; // L: 2519 + } else if (var37 == 23 && field715 < 1) { // L: 2521 + ++field715; // L: 2522 + loginState = 0; // L: 2523 + } else if (var37 == 29) { // L: 2525 + loginState = 17; // L: 2526 } else { - if (var34 != 69) { // L: 2072 - class58.getLoginError(var34); // L: 2076 - return; // L: 2077 + if (var37 != 69) { // L: 2528 + WorldMapData_0.getLoginError(var37); // L: 2532 + return; // L: 2533 } - loginState = 7; // L: 2073 + loginState = 7; // L: 2529 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2081 2082 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2083 - var2.offset = 0; // L: 2084 - WorldMapIcon_1.field212 = var2.readUnsignedShort(); // L: 2085 - loginState = 8; // L: 2086 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2537 2538 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2539 + var2.offset = 0; // L: 2540 + class58.field445 = var2.readUnsignedShort(); // L: 2541 + loginState = 8; // L: 2542 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapIcon_1.field212) { // L: 2089 2090 - var2.offset = 0; // L: 2091 - ((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapIcon_1.field212); // L: 2092 - class7[] var23 = new class7[]{class7.field37}; // L: 2095 - class7 var35 = var23[var2.readUnsignedByte()]; // L: 2097 + if (loginState == 8 && ((AbstractSocket)var1).available() >= class58.field445) { // L: 2545 2546 + var2.offset = 0; // L: 2547 + ((AbstractSocket)var1).read(var2.array, var2.offset, class58.field445); // L: 2548 + class7[] var24 = new class7[]{class7.field26}; // L: 2551 + class7 var26 = var24[var2.readUnsignedByte()]; // L: 2553 try { - class12 var27 = class7.method102(var35); // L: 2099 - this.field714 = new class9(var2, var27); // L: 2100 - loginState = 9; // L: 2101 - } catch (Exception var20) { // L: 2103 - class58.getLoginError(22); // L: 2104 - return; // L: 2105 + class12 var29 = ServerPacket.method3742(var26); // L: 2555 + this.field721 = new class9(var2, var29); // L: 2556 + loginState = 9; // L: 2557 + } catch (Exception var20) { // L: 2559 + WorldMapData_0.getLoginError(22); // L: 2560 + return; // L: 2561 } } - if (loginState == 9 && this.field714.method109()) { // L: 2109 2110 - this.field754 = this.field714.method122(); // L: 2111 - this.field714.method110(); // L: 2112 - this.field714 = null; // L: 2113 - if (this.field754 == null) { // L: 2114 - class58.getLoginError(22); // L: 2115 - return; // L: 2116 + if (loginState == 9 && this.field721.method120()) { // L: 2565 2566 + this.field720 = this.field721.method122(); // L: 2567 + this.field721.method121(); // L: 2568 + this.field721 = null; // L: 2569 + if (this.field720 == null) { // L: 2570 + WorldMapData_0.getLoginError(22); // L: 2571 + return; // L: 2572 } - packetWriter.clearBuffer(); // L: 2118 - var3 = Archive.method4385(); // L: 2119 - var3.packetBuffer.writeByte(LoginPacket.field2353.id); // L: 2120 - var3.packetBuffer.writeShort(this.field754.offset); // L: 2121 - var3.packetBuffer.method5611(this.field754); // L: 2122 - packetWriter.addNode(var3); // L: 2123 - packetWriter.flush(); // L: 2124 - this.field754 = null; // L: 2125 - loginState = 6; // L: 2126 + packetWriter.clearBuffer(); // L: 2574 + var22 = class206.method3853(); // L: 2575 + var22.packetBuffer.writeByte(LoginPacket.field2342.id); // L: 2576 + var22.packetBuffer.writeShort(this.field720.offset); // L: 2577 + var22.packetBuffer.method5713(this.field720); // L: 2578 + packetWriter.addNode(var22); // L: 2579 + packetWriter.flush(); // L: 2580 + this.field720 = null; // L: 2581 + loginState = 6; // L: 2582 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2129 2130 - class60.field456 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2131 - loginState = 11; // L: 2132 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2585 2586 + ScriptFrame.field552 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2587 + loginState = 11; // L: 2588 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class60.field456) { // L: 2135 2136 - ((AbstractSocket)var1).read(var2.array, 0, class60.field456); // L: 2137 - var2.offset = 0; // L: 2138 - loginState = 6; // L: 2139 + if (loginState == 11 && ((AbstractSocket)var1).available() >= ScriptFrame.field552) { // L: 2591 2592 + ((AbstractSocket)var1).read(var2.array, 0, ScriptFrame.field552); // L: 2593 + var2.offset = 0; // L: 2594 + loginState = 6; // L: 2595 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2142 2143 - field709 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2144 - loginState = 13; // L: 2145 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2598 2599 + field716 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2600 + loginState = 13; // L: 2601 } - if (loginState == 13) { // L: 2148 - field822 = 0; // L: 2149 - UrlRequester.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field709 / 60 + " seconds."); // L: 2150 - if (--field709 <= 0) { // L: 2151 + if (loginState == 13) { // L: 2604 + field947 = 0; // L: 2605 + GrandExchangeOfferNameComparator.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field716 / 60 + " seconds."); // L: 2606 + if (--field716 <= 0) { // L: 2607 loginState = 0; } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2154 2155 - LoginScreenAnimation.field1076 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2156 - loginState = 15; // L: 2157 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2610 2611 + SpotAnimationDefinition.field3282 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2612 + loginState = 15; // L: 2613 } - if (loginState == 15 && ((AbstractSocket)var1).available() >= LoginScreenAnimation.field1076) { // L: 2160 2161 - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2162 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2163 - var2.offset = 0; // L: 2164 - boolean var24 = false; // L: 2165 - if (var12) { // L: 2166 - var4 = var2.readByteIsaac() << 24; // L: 2167 - var4 |= var2.readByteIsaac() << 16; // L: 2168 - var4 |= var2.readByteIsaac() << 8; // L: 2169 - var4 |= var2.readByteIsaac(); // L: 2170 - String var30 = Login.Login_username; // L: 2172 - var7 = var30.length(); // L: 2174 - int var16 = 0; // L: 2175 - var9 = 0; // L: 2176 + if (loginState == 15 && ((AbstractSocket)var1).available() >= SpotAnimationDefinition.field3282) { // L: 2616 2617 + var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2618 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2619 + var2.offset = 0; // L: 2620 + boolean var38 = false; // L: 2621 + if (var12) { // L: 2622 + var13 = var2.readByteIsaac() << 24; // L: 2623 + var13 |= var2.readByteIsaac() << 16; // L: 2624 + var13 |= var2.readByteIsaac() << 8; // L: 2625 + var13 |= var2.readByteIsaac(); // L: 2626 + String var34 = Login.Login_username; // L: 2628 + var7 = var34.length(); // L: 2630 + int var16 = 0; // L: 2631 + var9 = 0; // L: 2632 while (true) { if (var9 >= var7) { - if (Tile.clientPreferences.parameters.size() >= 10 && !Tile.clientPreferences.parameters.containsKey(var16)) { // L: 2180 2181 - Iterator var33 = Tile.clientPreferences.parameters.entrySet().iterator(); // L: 2182 - var33.next(); // L: 2183 - var33.remove(); // L: 2184 + if (GrandExchangeOfferAgeComparator.clientPreferences.parameters.size() >= 10 && !GrandExchangeOfferAgeComparator.clientPreferences.parameters.containsKey(var16)) { // L: 2636 2637 + Iterator var36 = GrandExchangeOfferAgeComparator.clientPreferences.parameters.entrySet().iterator(); // L: 2638 + var36.next(); // L: 2639 + var36.remove(); // L: 2640 } - Tile.clientPreferences.parameters.put(var16, var4); // L: 2187 + GrandExchangeOfferAgeComparator.clientPreferences.parameters.put(var16, var13); // L: 2643 break; } - var16 = (var16 << 5) - var16 + var30.charAt(var9); + var16 = (var16 << 5) - var16 + var34.charAt(var9); ++var9; } } - if (Login_isUsernameRemembered) { // L: 2189 - Tile.clientPreferences.rememberedUsername = Login.Login_username; // L: 2190 + if (Login_isUsernameRemembered) { // L: 2645 + GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername = Login.Login_username; // L: 2646 } else { - Tile.clientPreferences.rememberedUsername = null; // L: 2193 + GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername = null; // L: 2649 } - WorldMapData_1.savePreferences(); // L: 2195 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2196 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2197 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2198 - localPlayerIndex <<= 8; // L: 2199 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2200 - field888 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2201 - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2202 - var2.offset = 0; // L: 2203 - ServerPacket[] var28 = class198.ServerPacket_values(); // L: 2204 - var14 = var2.readSmartByteShortIsaac(); // L: 2205 - if (var14 < 0 || var14 >= var28.length) { // L: 2206 + Tile.savePreferences(); // L: 2651 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2652 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2653 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2654 + localPlayerIndex <<= 8; // L: 2655 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2656 + field799 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2657 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2658 + var2.offset = 0; // L: 2659 + ServerPacket[] var32 = ArchiveDiskActionHandler.ServerPacket_values(); // L: 2660 + var14 = var2.readSmartByteShortIsaac(); // L: 2661 + if (var14 < 0 || var14 >= var32.length) { // L: 2662 throw new IOException(var14 + " " + var2.offset); } - packetWriter.serverPacket = var28[var14]; // L: 2207 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2208 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2209 - var2.offset = 0; // L: 2210 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2211 + packetWriter.serverPacket = var32[var14]; // L: 2663 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2664 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2665 + var2.offset = 0; // L: 2666 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2667 try { - Client var18 = class2.client; // L: 2213 - JSObject.getWindow(var18).call("zap", (Object[])null); // L: 2216 - } catch (Throwable var19) { // L: 2219 + Client var18 = ByteArrayPool.client; // L: 2669 + JSObject.getWindow(var18).call("zap", (Object[])null); // L: 2672 + } catch (Throwable var19) { // L: 2675 } - loginState = 16; // L: 2220 + loginState = 16; // L: 2676 } - if (loginState == 16) { // L: 2223 - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2224 - var2.offset = 0; // L: 2225 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2226 - timer.method5100(); // L: 2227 - mouseLastLastPressedTimeMillis = -1L; // L: 2230 - ByteArrayPool.mouseRecorder.index = 0; // L: 2231 - GameShell.hasFocus = true; // L: 2232 - hadFocus = true; // L: 2233 - field901 = -1L; // L: 2234 - class171.method3543(); // L: 2235 - packetWriter.clearBuffer(); // L: 2236 - packetWriter.packetBuffer.offset = 0; // L: 2237 - packetWriter.serverPacket = null; // L: 2238 - packetWriter.field1336 = null; // L: 2239 - packetWriter.field1348 = null; // L: 2240 - packetWriter.field1346 = null; // L: 2241 - packetWriter.serverPacketLength = 0; // L: 2242 - packetWriter.field1345 = 0; // L: 2243 - rebootTimer = 0; // L: 2244 - logoutTimer = 0; // L: 2245 - hintArrowType = 0; // L: 2246 - class279.method5091(); // L: 2247 - MouseHandler.MouseHandler_idleCycles = 0; // L: 2249 - Messages.Messages_channels.clear(); // L: 2252 - Messages.Messages_hashTable.clear(); // L: 2253 - Messages.Messages_queue.clear(); // L: 2254 - Messages.Messages_count = 0; // L: 2255 - isItemSelected = 0; // L: 2257 - isSpellSelected = false; // L: 2258 - soundEffectCount = 0; // L: 2259 - camAngleY = 0; // L: 2260 - oculusOrbState = 0; // L: 2261 - ModelData0.field1901 = null; // L: 2262 - minimapState = 0; // L: 2263 - field902 = -1; // L: 2264 - destinationX = 0; // L: 2265 - destinationY = 0; // L: 2266 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 2267 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 2268 - npcCount = 0; // L: 2269 - WorldMapRectangle.method361(); // L: 2270 - - for (var34 = 0; var34 < 2048; ++var34) { // L: 2271 - players[var34] = null; - } - - for (var34 = 0; var34 < 32768; ++var34) { // L: 2272 - npcs[var34] = null; - } - - combatTargetPlayerIndex = -1; // L: 2273 - projectiles.clear(); // L: 2274 - graphicsObjects.clear(); // L: 2275 - - for (var34 = 0; var34 < 4; ++var34) { // L: 2276 - for (var4 = 0; var4 < 104; ++var4) { // L: 2277 - for (int var17 = 0; var17 < 104; ++var17) { // L: 2278 - groundItems[var34][var4][var17] = null; // L: 2279 - } - } - } - - pendingSpawns = new NodeDeque(); // L: 2283 - class60.friendSystem.clear(); // L: 2284 - - for (var34 = 0; var34 < VarpDefinition.VarpDefinition_fileCount; ++var34) { // L: 2285 - VarpDefinition var37 = class195.VarpDefinition_get(var34); // L: 2286 - if (var37 != null) { // L: 2287 - Varps.Varps_temp[var34] = 0; // L: 2288 - Varps.Varps_main[var34] = 0; // L: 2289 - } - } - - ClientPreferences.varcs.clearTransient(); // L: 2292 - followerIndex = -1; // L: 2293 - if (rootInterface != -1) { // L: 2294 - SecureRandomFuture.method2225(rootInterface); - } - - for (InterfaceParent var26 = (InterfaceParent)interfaceParents.first(); var26 != null; var26 = (InterfaceParent)interfaceParents.next()) { // L: 2295 - class58.closeInterface(var26, true); // L: 2296 - } - - rootInterface = -1; // L: 2298 - interfaceParents = new NodeHashTable(8); // L: 2299 - meslayerContinueWidget = null; // L: 2300 - class279.method5091(); // L: 2301 - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2302 - - for (var34 = 0; var34 < 8; ++var34) { // L: 2303 - playerMenuActions[var34] = null; // L: 2304 - playerOptionsPriorities[var34] = false; // L: 2305 - } - - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2308 - isLoading = true; // L: 2310 - - for (var34 = 0; var34 < 100; ++var34) { // L: 2311 - field882[var34] = true; - } - - GrandExchangeEvent.method160(); // L: 2312 - Entity.clanChat = null; // L: 2313 - - for (var34 = 0; var34 < 8; ++var34) { // L: 2314 - grandExchangeOffers[var34] = new GrandExchangeOffer(); - } - - WorldMapSection1.grandExchangeEvents = null; // L: 2315 - HorizontalAlignment.updatePlayer(var2); // L: 2317 - class52.field396 = -1; // L: 2318 - WorldMapID.loadRegions(false, var2); // L: 2319 - packetWriter.serverPacket = null; // L: 2320 + if (loginState != 16) { // L: 2679 + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2773 2774 + var2.offset = 0; // L: 2775 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2776 + var2.offset = 0; // L: 2777 + KitDefinition.field3297 = var2.readUnsignedShort(); // L: 2778 + loginState = 18; // L: 2779 } - } else { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2324 2325 - var2.offset = 0; // L: 2326 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2327 - var2.offset = 0; // L: 2328 - WorldMapAreaData.field352 = var2.readUnsignedShort(); // L: 2329 - loginState = 18; // L: 2330 + if (loginState == 18 && ((AbstractSocket)var1).available() >= KitDefinition.field3297) { // L: 2782 2783 + var2.offset = 0; // L: 2784 + ((AbstractSocket)var1).read(var2.array, 0, KitDefinition.field3297); // L: 2785 + var2.offset = 0; // L: 2786 + String var30 = var2.readStringCp1252NullTerminated(); // L: 2787 + String var31 = var2.readStringCp1252NullTerminated(); // L: 2788 + String var33 = var2.readStringCp1252NullTerminated(); // L: 2789 + GrandExchangeOfferNameComparator.setLoginResponseString(var30, var31, var33); // L: 2790 + BuddyRankComparator.updateGameState(10); // L: 2791 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= WorldMapAreaData.field352) { // L: 2333 2334 - var2.offset = 0; // L: 2335 - ((AbstractSocket)var1).read(var2.array, 0, WorldMapAreaData.field352); // L: 2336 - var2.offset = 0; // L: 2337 - String var25 = var2.readStringCp1252NullTerminated(); // L: 2338 - String var36 = var2.readStringCp1252NullTerminated(); // L: 2339 - String var29 = var2.readStringCp1252NullTerminated(); // L: 2340 - UrlRequester.setLoginResponseString(var25, var36, var29); // L: 2341 - CollisionMap.updateGameState(10); // L: 2342 - } - - if (loginState != 19) { // L: 2345 - ++field822; // L: 2392 - if (field822 > 2000) { // L: 2393 - if (field708 < 1) { // L: 2394 - if (port1 == WorldMapScaleHandler.port3) { // L: 2395 - WorldMapScaleHandler.port3 = class23.port2; - } else { - WorldMapScaleHandler.port3 = port1; // L: 2396 - } - - ++field708; // L: 2397 - loginState = 0; // L: 2398 - } else { - class58.getLoginError(-3); // L: 2401 - } - } - } else { - if (packetWriter.serverPacketLength == -1) { // L: 2346 - if (((AbstractSocket)var1).available() < 2) { // L: 2347 + if (loginState == 19) { // L: 2794 + if (packetWriter.serverPacketLength == -1) { // L: 2795 + if (((AbstractSocket)var1).available() < 2) { // L: 2796 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2348 - var2.offset = 0; // L: 2349 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2350 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2797 + var2.offset = 0; // L: 2798 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2799 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2352 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2353 - var2.offset = 0; // L: 2354 - var34 = packetWriter.serverPacketLength; // L: 2355 - timer.method5099(); // L: 2356 - packetWriter.clearBuffer(); // L: 2358 - packetWriter.packetBuffer.offset = 0; // L: 2359 - packetWriter.serverPacket = null; // L: 2360 - packetWriter.field1336 = null; // L: 2361 - packetWriter.field1348 = null; // L: 2362 - packetWriter.field1346 = null; // L: 2363 - packetWriter.serverPacketLength = 0; // L: 2364 - packetWriter.field1345 = 0; // L: 2365 - rebootTimer = 0; // L: 2366 - class279.method5091(); // L: 2367 - minimapState = 0; // L: 2368 - destinationX = 0; // L: 2369 - - for (var4 = 0; var4 < 2048; ++var4) { // L: 2370 - players[var4] = null; - } - - WorldMapLabelSize.localPlayer = null; // L: 2371 - - for (var4 = 0; var4 < npcs.length; ++var4) { // L: 2372 - NPC var31 = npcs[var4]; // L: 2373 - if (var31 != null) { // L: 2374 - var31.targetIndex = -1; // L: 2375 - var31.false0 = false; // L: 2376 - } - } - - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2380 - CollisionMap.updateGameState(30); // L: 2382 - - for (var4 = 0; var4 < 100; ++var4) { // L: 2383 - field882[var4] = true; - } - - GrandExchangeEvent.method160(); // L: 2384 - HorizontalAlignment.updatePlayer(var2); // L: 2386 - if (var34 != var2.offset) { // L: 2387 - throw new RuntimeException(); // L: 2388 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2801 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2802 + var2.offset = 0; // L: 2803 + var37 = packetWriter.serverPacketLength; // L: 2804 + timer.method5139(); // L: 2805 + Language.method3791(); // L: 2806 + TileItem.updatePlayer(var2); // L: 2807 + if (var37 != var2.offset) { // L: 2808 + throw new RuntimeException(); // L: 2809 } } - } - } - } - } catch (IOException var21) { // L: 2405 - if (field708 < 1) { // L: 2406 - if (WorldMapScaleHandler.port3 == port1) { // L: 2407 - WorldMapScaleHandler.port3 = class23.port2; - } else { - WorldMapScaleHandler.port3 = port1; // L: 2408 - } - - ++field708; // L: 2409 - loginState = 0; // L: 2410 - } else { - class58.getLoginError(-2); // L: 2413 - } - } - } // L: 2152 2322 2390 2399 2402 2411 2414 2416 - - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-634429203" - ) - final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 2614 - --rebootTimer; - } - - if (logoutTimer > 0) { // L: 2615 - --logoutTimer; - } - - if (field713) { // L: 2616 - field713 = false; // L: 2617 - ArchiveLoader.method1208(); // L: 2618 - } else { - if (!isMenuOpen) { // L: 2621 - WorldMapAreaData.addCancelMenuEntry(); - } - - int var1; - for (var1 = 0; var1 < 100 && this.method1707(packetWriter); ++var1) { // L: 2622 2623 - } - - if (gameState == 30) { // L: 2625 - while (true) { - ReflectionCheck var2 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 2629 - boolean var29; - if (var2 == null) { // L: 2630 - var29 = false; // L: 2631 } else { - var29 = true; // L: 2634 - } - - int var3; - PacketBufferNode var30; - if (!var29) { // L: 2636 - PacketBufferNode var14; - int var15; - if (timer.field3598) { // L: 2644 - var14 = getPacketBufferNode(ClientPacket.field2271, packetWriter.isaacCipher); // L: 2646 - var14.packetBuffer.writeByte(0); // L: 2647 - var15 = var14.packetBuffer.offset; // L: 2648 - timer.write(var14.packetBuffer); // L: 2649 - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var15); // L: 2650 - packetWriter.addNode(var14); // L: 2651 - timer.method5101(); // L: 2652 - } - - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - PacketBuffer var10000; - synchronized(ByteArrayPool.mouseRecorder.lock) { // L: 2655 - if (!field841) { // L: 2656 - ByteArrayPool.mouseRecorder.index = 0; // L: 2742 - } else if (MouseHandler.MouseHandler_lastButton != 0 || ByteArrayPool.mouseRecorder.index >= 40) { // L: 2657 - var30 = null; // L: 2659 - var3 = 0; // L: 2660 - var4 = 0; // L: 2661 - var5 = 0; // L: 2662 - var6 = 0; // L: 2663 - - for (var7 = 0; var7 < ByteArrayPool.mouseRecorder.index && (var30 == null || var30.packetBuffer.offset - var3 < 246); ++var7) { // L: 2664 2665 - var4 = var7; // L: 2666 - var8 = ByteArrayPool.mouseRecorder.ys[var7]; // L: 2667 - if (var8 < -1) { // L: 2668 - var8 = -1; - } else if (var8 > 65534) { // L: 2669 - var8 = 65534; - } - - var9 = ByteArrayPool.mouseRecorder.xs[var7]; // L: 2670 - if (var9 < -1) { // L: 2671 - var9 = -1; - } else if (var9 > 65534) { // L: 2672 - var9 = 65534; - } - - if (var9 != field798 || var8 != field686) { // L: 2673 - if (var30 == null) { // L: 2676 - var30 = getPacketBufferNode(ClientPacket.field2269, packetWriter.isaacCipher); // L: 2677 - var30.packetBuffer.writeByte(0); // L: 2678 - var3 = var30.packetBuffer.offset; // L: 2679 - var10000 = var30.packetBuffer; // L: 2680 - var10000.offset += 2; - var5 = 0; // L: 2681 - var6 = 0; // L: 2682 - } - - if (field687 != -1L) { // L: 2687 - var10 = var9 - field798; // L: 2688 - var11 = var8 - field686; // L: 2689 - var12 = (int)((ByteArrayPool.mouseRecorder.millis[var7] - field687) / 20L); // L: 2690 - var5 = (int)((long)var5 + (ByteArrayPool.mouseRecorder.millis[var7] - field687) % 20L); // L: 2691 - } else { - var10 = var9; // L: 2694 - var11 = var8; // L: 2695 - var12 = Integer.MAX_VALUE; // L: 2696 - } - - field798 = var9; // L: 2698 - field686 = var8; // L: 2699 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2700 - var10 += 32; // L: 2701 - var11 += 32; // L: 2702 - var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2703 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2705 - var10 += 128; // L: 2706 - var11 += 128; // L: 2707 - var30.packetBuffer.writeByte(var12 + 128); // L: 2708 - var30.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2709 - } else if (var12 < 32) { // L: 2711 - var30.packetBuffer.writeByte(var12 + 192); // L: 2712 - if (var9 != -1 && var8 != -1) { // L: 2713 - var30.packetBuffer.writeInt(var9 | var8 << 16); // L: 2714 - } else { - var30.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var30.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2717 - if (var9 != -1 && var8 != -1) { // L: 2718 - var30.packetBuffer.writeInt(var9 | var8 << 16); // L: 2719 - } else { - var30.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } - - ++var6; // L: 2721 - field687 = ByteArrayPool.mouseRecorder.millis[var7]; // L: 2722 - } - } - - if (var30 != null) { // L: 2724 - var30.packetBuffer.writeLengthByte(var30.packetBuffer.offset - var3); // L: 2725 - var7 = var30.packetBuffer.offset; // L: 2726 - var30.packetBuffer.offset = var3; // L: 2727 - var30.packetBuffer.writeByte(var5 / var6); // L: 2728 - var30.packetBuffer.writeByte(var5 % var6); // L: 2729 - var30.packetBuffer.offset = var7; // L: 2730 - packetWriter.addNode(var30); // L: 2731 - } - - if (var4 >= ByteArrayPool.mouseRecorder.index) { // L: 2733 - ByteArrayPool.mouseRecorder.index = 0; + ++field947; // L: 2813 + if (field947 > 2000) { // L: 2814 + if (field715 < 1) { // L: 2815 + if (Coord.port1 == class41.port3) { // L: 2816 + class41.port3 = Coord.port2; } else { - MouseRecorder var49 = ByteArrayPool.mouseRecorder; // L: 2735 - var49.index -= var4; - System.arraycopy(ByteArrayPool.mouseRecorder.xs, var4, ByteArrayPool.mouseRecorder.xs, 0, ByteArrayPool.mouseRecorder.index); // L: 2736 - System.arraycopy(ByteArrayPool.mouseRecorder.ys, var4, ByteArrayPool.mouseRecorder.ys, 0, ByteArrayPool.mouseRecorder.index); // L: 2737 - System.arraycopy(ByteArrayPool.mouseRecorder.millis, var4, ByteArrayPool.mouseRecorder.millis, 0, ByteArrayPool.mouseRecorder.index); // L: 2738 - } - } - } - - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2744 - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2745 - if (var16 > 32767L) { // L: 2746 - var16 = 32767L; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2747 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2748 - if (var3 < 0) { // L: 2749 - var3 = 0; - } else if (var3 > GameShell.canvasHeight) { // L: 2750 - var3 = GameShell.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2751 - if (var4 < 0) { // L: 2752 - var4 = 0; - } else if (var4 > FloorDecoration.canvasWidth) { // L: 2753 - var4 = FloorDecoration.canvasWidth; - } - - var5 = (int)var16; // L: 2754 - var18 = getPacketBufferNode(ClientPacket.field2312, packetWriter.isaacCipher); // L: 2755 - var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2756 - var18.packetBuffer.writeShort(var4); // L: 2757 - var18.packetBuffer.writeShort(var3); // L: 2758 - packetWriter.addNode(var18); // L: 2759 - } - - if (KeyHandler.field422 > 0) { // L: 2761 - var14 = getPacketBufferNode(ClientPacket.field2308, packetWriter.isaacCipher); // L: 2762 - var14.packetBuffer.writeShort(0); // L: 2763 - var15 = var14.packetBuffer.offset; // L: 2764 - long var19 = PacketWriter.currentTimeMillis(); // L: 2765 - - for (var5 = 0; var5 < KeyHandler.field422; ++var5) { // L: 2766 - long var21 = var19 - field901; // L: 2767 - if (var21 > 16777215L) { // L: 2768 - var21 = 16777215L; + class41.port3 = Coord.port1; // L: 2817 } - field901 = var19; // L: 2769 - var14.packetBuffer.method5660((int)var21); // L: 2770 - var14.packetBuffer.writeIntME(KeyHandler.field421[var5]); // L: 2771 - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 2773 - packetWriter.addNode(var14); // L: 2774 - } - - if (field829 > 0) { // L: 2776 - --field829; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2777 - field761 = true; - } - - if (field761 && field829 <= 0) { // L: 2778 - field829 = 20; // L: 2779 - field761 = false; // L: 2780 - var14 = getPacketBufferNode(ClientPacket.field2289, packetWriter.isaacCipher); // L: 2782 - var14.packetBuffer.method5654(camAngleY); // L: 2783 - var14.packetBuffer.method5653(camAngleX); // L: 2784 - packetWriter.addNode(var14); // L: 2785 - } - - if (GameShell.hasFocus && !hadFocus) { // L: 2787 - hadFocus = true; // L: 2788 - var14 = getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); // L: 2790 - var14.packetBuffer.writeByte(1); // L: 2791 - packetWriter.addNode(var14); // L: 2792 - } - - if (!GameShell.hasFocus && hadFocus) { // L: 2794 - hadFocus = false; // L: 2795 - var14 = getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); // L: 2797 - var14.packetBuffer.writeByte(0); // L: 2798 - packetWriter.addNode(var14); // L: 2799 - } - - if (Message.worldMap != null) { // L: 2802 - Message.worldMap.method6428(); - } - - if (class8.ClanChat_inClanChat) { // L: 2804 - if (Entity.clanChat != null) { // L: 2805 - Entity.clanChat.sort(); // L: 2806 - } - - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 2809 - Player var31 = players[Players.Players_indices[var1]]; // L: 2810 - var31.clearIsInClanChat(); // L: 2811 - } - - class8.ClanChat_inClanChat = false; // L: 2814 - } - - AbstractWorldMapData.method354(); // L: 2817 - if (gameState != 30) { // L: 2818 - return; - } - - for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { // L: 2820 2821 2864 - if (var36.hitpoints > 0) { // L: 2822 - --var36.hitpoints; - } - - ObjectDefinition var23; - boolean var37; - if (var36.hitpoints == 0) { // L: 2823 - if (var36.objectId >= 0) { // L: 2825 - var3 = var36.objectId; // L: 2827 - var4 = var36.field961; // L: 2828 - var23 = MidiPcmStream.getObjectDefinition(var3); // L: 2830 - if (var4 == 11) { // L: 2831 - var4 = 10; - } - - if (var4 >= 5 && var4 <= 8) { // L: 2832 - var4 = 4; - } - - var37 = var23.method4703(var4); // L: 2833 - if (!var37) { // L: 2835 - continue; - } - } - - WorldMapLabelSize.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.objectId, var36.field960, var36.field961); // L: 2837 - var36.remove(); // L: 2838 + ++field715; // L: 2818 + loginState = 0; // L: 2819 } else { - if (var36.delay > 0) { // L: 2842 - --var36.delay; - } - - if (var36.delay == 0 && var36.x >= 1 && var36.y >= 1 && var36.x <= 102 && var36.y <= 102) { // L: 2843 - if (var36.id >= 0) { // L: 2845 - var3 = var36.id; // L: 2847 - var4 = var36.field964; // L: 2848 - var23 = MidiPcmStream.getObjectDefinition(var3); // L: 2850 - if (var4 == 11) { // L: 2851 - var4 = 10; - } - - if (var4 >= 5 && var4 <= 8) { // L: 2852 - var4 = 4; - } - - var37 = var23.method4703(var4); // L: 2853 - if (!var37) { // L: 2855 - continue; - } - } - - WorldMapLabelSize.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.id, var36.orientation, var36.field964); // L: 2857 - var36.delay = -1; // L: 2858 - if (var36.objectId == var36.id && var36.objectId == -1) { // L: 2859 - var36.remove(); - } else if (var36.id == var36.objectId && var36.field960 == var36.orientation && var36.field964 == var36.field961) { // L: 2860 - var36.remove(); - } - } + WorldMapData_0.getLoginError(-3); // L: 2822 } } - - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2868 - var10002 = queuedSoundEffectDelays[var1]--; // L: 2869 - if (queuedSoundEffectDelays[var1] >= -10) { // L: 2870 - SoundEffect var32 = soundEffects[var1]; // L: 2882 - if (var32 == null) { // L: 2883 - var10000 = null; // L: 2884 - var32 = SoundEffect.readSoundEffect(GrandExchangeOfferUnitPriceComparator.archive4, soundEffectIds[var1], 0); - if (var32 == null) { // L: 2885 - continue; - } - - int[] var50 = queuedSoundEffectDelays; // L: 2886 - var50[var1] += var32.calculateDelay(); - soundEffects[var1] = var32; // L: 2887 - } - - if (queuedSoundEffectDelays[var1] < 0) { // L: 2893 - if (soundLocations[var1] != 0) { // L: 2895 - var4 = (soundLocations[var1] & 255) * 128; // L: 2896 - var5 = soundLocations[var1] >> 16 & 255; // L: 2897 - var6 = var5 * 128 + 64 - WorldMapLabelSize.localPlayer.x; // L: 2898 - if (var6 < 0) { // L: 2899 - var6 = -var6; - } - - var7 = soundLocations[var1] >> 8 & 255; // L: 2900 - var8 = var7 * 128 + 64 - WorldMapLabelSize.localPlayer.y; // L: 2901 - if (var8 < 0) { // L: 2902 - var8 = -var8; - } - - var9 = var8 + var6 - 128; // L: 2903 - if (var9 > var4) { // L: 2904 - queuedSoundEffectDelays[var1] = -100; // L: 2905 - continue; // L: 2906 - } - - if (var9 < 0) { // L: 2908 - var9 = 0; - } - - var3 = (var4 - var9) * areaSoundEffectVolume / var4; // L: 2909 - } else { - var3 = soundEffectVolume; // L: 2911 - } - - if (var3 > 0) { // L: 2912 - RawSound var24 = var32.toRawSound().resample(class9.decimator); // L: 2913 - RawPcmStream var40 = RawPcmStream.createRawPcmStream(var24, 100, var3); // L: 2914 - var40.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 2915 - Players.pcmStreamMixer.addSubStream(var40); // L: 2916 - } - - queuedSoundEffectDelays[var1] = -100; // L: 2918 - } - } else { - --soundEffectCount; // L: 2871 - - for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 2872 - soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 2873 - soundEffects[var15] = soundEffects[var15 + 1]; // L: 2874 - queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 2875 - queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 2876 - soundLocations[var15] = soundLocations[var15 + 1]; // L: 2877 - } - - --var1; // L: 2879 - } - } - - if (field704 && !HealthBarUpdate.method1815()) { // L: 2921 - if (musicVolume != 0 && currentTrackGroupId != -1) { // L: 2922 - Script.method2322(CollisionMap.archive6, currentTrackGroupId, 0, musicVolume, false); - } - - field704 = false; // L: 2923 - } - - ++packetWriter.field1345; // L: 2926 - if (packetWriter.field1345 > 750) { // L: 2927 - ArchiveLoader.method1208(); // L: 2928 - return; // L: 2929 - } - - var1 = Players.Players_count; // L: 2932 - int[] var33 = Players.Players_indices; // L: 2933 - - for (var3 = 0; var3 < var1; ++var3) { // L: 2934 - Player var42 = players[var33[var3]]; // L: 2935 - if (var42 != null) { // L: 2936 - CollisionMap.updateActorSequence(var42, 1); // L: 2937 - } - } - - for (var1 = 0; var1 < npcCount; ++var1) { // L: 2942 - var15 = npcIndices[var1]; // L: 2943 - NPC var25 = npcs[var15]; // L: 2944 - if (var25 != null) { // L: 2945 - CollisionMap.updateActorSequence(var25, var25.definition.size); // L: 2946 - } - } - - ClientPacket.method3706(); // L: 2950 - ++field737; // L: 2951 - if (mouseCrossColor != 0) { // L: 2952 - mouseCrossState += 20; // L: 2953 - if (mouseCrossState >= 400) { // L: 2954 - mouseCrossColor = 0; - } - } - - if (GrandExchangeEvent.field79 != null) { // L: 2956 - ++field782; // L: 2957 - if (field782 >= 15) { // L: 2958 - class52.invalidateWidget(GrandExchangeEvent.field79); // L: 2959 - GrandExchangeEvent.field79 = null; // L: 2960 - } - } - - Widget var38 = TriBool.mousedOverWidgetIf1; // L: 2963 - Widget var34 = Occluder.field1950; // L: 2964 - TriBool.mousedOverWidgetIf1 = null; // L: 2965 - Occluder.field1950 = null; // L: 2966 - draggedOnWidget = null; // L: 2967 - field880 = false; // L: 2968 - field799 = false; // L: 2969 - field898 = 0; // L: 2970 - - while (class60.isKeyDown() && field898 < 128) { // L: 2971 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && PlayerAppearance.field2581 == 66) { // L: 2972 - String var44 = ""; // L: 2975 - - Message var39; - for (Iterator var41 = Messages.Messages_hashTable.iterator(); var41.hasNext(); var44 = var44 + var39.sender + ':' + var39.text + '\n') { // L: 2976 2979 - var39 = (Message)var41.next(); // L: 2977 - } - - class2.client.clipboardSetString(var44); // L: 2985 - } else if (oculusOrbState != 1 || PacketWriter.field1350 <= 0) { // L: 2988 - field900[field898] = PlayerAppearance.field2581; // L: 2991 - field899[field898] = PacketWriter.field1350; // L: 2992 - ++field898; // L: 2993 - } - } - - if (JagexCache.method3576() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 2995 - var3 = WorldMapLabelSize.localPlayer.plane - mouseWheelRotation; // L: 2996 - if (var3 < 0) { // L: 2997 - var3 = 0; - } else if (var3 > 3) { // L: 2998 - var3 = 3; - } - - if (var3 != WorldMapLabelSize.localPlayer.plane) { // L: 2999 - var4 = WorldMapLabelSize.localPlayer.pathX[0] + WorldMapManager.baseX; // L: 3000 - var5 = WorldMapLabelSize.localPlayer.pathY[0] + WorldMapLabel.baseY; // L: 3001 - var18 = getPacketBufferNode(ClientPacket.field2327, packetWriter.isaacCipher); // L: 3004 - var18.packetBuffer.writeShort(var5); // L: 3005 - var18.packetBuffer.method5662(0); // L: 3006 - var18.packetBuffer.writeShort(var4); // L: 3007 - var18.packetBuffer.method5644(var3); // L: 3008 - packetWriter.addNode(var18); // L: 3009 - } - - mouseWheelRotation = 0; // L: 3012 - } - - if (rootInterface != -1) { // L: 3014 - GameObject.updateRootInterface(rootInterface, 0, 0, FloorDecoration.canvasWidth, GameShell.canvasHeight, 0, 0); - } - - ++cycleCntr; // L: 3015 - - while (true) { - Widget var43; - ScriptEvent var45; - Widget var46; - do { - var45 = (ScriptEvent)field877.removeLast(); // L: 3017 - if (var45 == null) { // L: 3018 - while (true) { - do { - var45 = (ScriptEvent)field912.removeLast(); // L: 3029 - if (var45 == null) { // L: 3030 - while (true) { - do { - var45 = (ScriptEvent)scriptEvents.removeLast(); // L: 3041 - if (var45 == null) { // L: 3042 - this.menu(); // L: 3052 - if (Message.worldMap != null) { // L: 3054 - Message.worldMap.method6482(Huffman.Client_plane, (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX, (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY, false); // L: 3055 - Message.worldMap.loadCache(); // L: 3056 - } - - if (clickedWidget != null) { // L: 3059 - this.method1458(); - } - - PacketBufferNode var47; - if (BuddyRankComparator.dragInventoryWidget != null) { // L: 3060 - class52.invalidateWidget(BuddyRankComparator.dragInventoryWidget); // L: 3061 - ++itemDragDuration; // L: 3062 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3063 - if (field788) { // L: 3064 - if (BuddyRankComparator.dragInventoryWidget == VerticalAlignment.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3065 - Widget var48 = BuddyRankComparator.dragInventoryWidget; // L: 3066 - byte var35 = 0; // L: 3067 - if (field707 == 1 && var48.contentType == 206) { // L: 3068 - var35 = 1; - } - - if (var48.itemIds[dragItemSlotDestination] <= 0) { // L: 3069 - var35 = 0; - } - - if (Widget.method4172(WorldMapIcon_0.getWidgetFlags(var48))) { // L: 3070 - var5 = dragItemSlotSource; // L: 3071 - var6 = dragItemSlotDestination; // L: 3072 - var48.itemIds[var6] = var48.itemIds[var5]; // L: 3073 - var48.itemQuantities[var6] = var48.itemQuantities[var5]; // L: 3074 - var48.itemIds[var5] = -1; // L: 3075 - var48.itemQuantities[var5] = 0; // L: 3076 - } else if (var35 == 1) { // L: 3078 - var5 = dragItemSlotSource; // L: 3079 - var6 = dragItemSlotDestination; // L: 3080 - - while (var6 != var5) { // L: 3081 - if (var5 > var6) { // L: 3082 - var48.swapItems(var5 - 1, var5); // L: 3083 - --var5; // L: 3084 - } else if (var5 < var6) { // L: 3086 - var48.swapItems(var5 + 1, var5); // L: 3087 - ++var5; // L: 3088 - } - } - } else { - var48.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3093 - } - - var47 = getPacketBufferNode(ClientPacket.field2309, packetWriter.isaacCipher); // L: 3096 - var47.packetBuffer.method5662(BuddyRankComparator.dragInventoryWidget.id); // L: 3097 - var47.packetBuffer.writeShort(dragItemSlotDestination); // L: 3098 - var47.packetBuffer.writeByte(var35); // L: 3099 - var47.packetBuffer.method5654(dragItemSlotSource); // L: 3100 - packetWriter.addNode(var47); // L: 3101 - } - } else if (this.shouldLeftClickOpenMenu()) { // L: 3105 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3106 - } else if (menuOptionsCount > 0) { // L: 3108 - SecureRandomFuture.method2211(draggedWidgetX, draggedWidgetY); // L: 3109 - } - - field782 = 10; // L: 3112 - MouseHandler.MouseHandler_lastButton = 0; // L: 3113 - BuddyRankComparator.dragInventoryWidget = null; // L: 3114 - } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3117 3118 - field788 = true; // L: 3119 - } - } - - if (Scene.shouldSendWalk()) { // L: 3124 - var3 = Scene.Scene_selectedX; // L: 3125 - var4 = Scene.Scene_selectedY; // L: 3126 - var47 = getPacketBufferNode(ClientPacket.field2344, packetWriter.isaacCipher); // L: 3128 - var47.packetBuffer.writeByte(5); // L: 3129 - var47.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3130 - var47.packetBuffer.method5654(var3 + WorldMapManager.baseX); // L: 3131 - var47.packetBuffer.writeShort(var4 + WorldMapLabel.baseY); // L: 3132 - packetWriter.addNode(var47); // L: 3133 - Scene.method3360(); // L: 3134 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3135 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3136 - mouseCrossColor = 1; // L: 3137 - mouseCrossState = 0; // L: 3138 - destinationX = var3; // L: 3139 - destinationY = var4; // L: 3140 - } - - if (var38 != TriBool.mousedOverWidgetIf1) { // L: 3142 - if (var38 != null) { // L: 3143 - class52.invalidateWidget(var38); - } - - if (TriBool.mousedOverWidgetIf1 != null) { // L: 3144 - class52.invalidateWidget(TriBool.mousedOverWidgetIf1); - } - } - - if (var34 != Occluder.field1950 && field770 == field828) { // L: 3146 - if (var34 != null) { // L: 3147 - class52.invalidateWidget(var34); - } - - if (Occluder.field1950 != null) { // L: 3148 - class52.invalidateWidget(Occluder.field1950); - } - } - - if (Occluder.field1950 != null) { // L: 3150 - if (field828 < field770) { // L: 3151 - ++field828; // L: 3152 - if (field770 == field828) { // L: 3153 - class52.invalidateWidget(Occluder.field1950); - } - } - } else if (field828 > 0) { // L: 3156 - --field828; - } - - WorldMapAreaData.method752(); // L: 3157 - if (isCameraLocked) { // L: 3158 - var3 = HealthBarUpdate.field1038 * 128 + 64; // L: 3159 - var4 = class8.field43 * 128 + 64; // L: 3160 - var5 = ArchiveLoader.getTileHeight(var3, var4, Huffman.Client_plane) - FileSystem.field2099; // L: 3161 - if (VertexNormal.cameraX < var3) { // L: 3162 - VertexNormal.cameraX = (var3 - VertexNormal.cameraX) * FloorDecoration.field1640 / 1000 + VertexNormal.cameraX + MouseRecorder.field609; // L: 3163 - if (VertexNormal.cameraX > var3) { // L: 3164 - VertexNormal.cameraX = var3; - } - } - - if (VertexNormal.cameraX > var3) { // L: 3166 - VertexNormal.cameraX -= FloorDecoration.field1640 * (VertexNormal.cameraX - var3) / 1000 + MouseRecorder.field609; // L: 3167 - if (VertexNormal.cameraX < var3) { // L: 3168 - VertexNormal.cameraX = var3; - } - } - - if (FaceNormal.cameraY < var5) { // L: 3170 - FaceNormal.cameraY = (var5 - FaceNormal.cameraY) * FloorDecoration.field1640 / 1000 + FaceNormal.cameraY + MouseRecorder.field609; // L: 3171 - if (FaceNormal.cameraY > var5) { // L: 3172 - FaceNormal.cameraY = var5; - } - } - - if (FaceNormal.cameraY > var5) { // L: 3174 - FaceNormal.cameraY -= FloorDecoration.field1640 * (FaceNormal.cameraY - var5) / 1000 + MouseRecorder.field609; // L: 3175 - if (FaceNormal.cameraY < var5) { // L: 3176 - FaceNormal.cameraY = var5; - } - } - - if (AbstractWorldMapData.cameraZ < var4) { // L: 3178 - AbstractWorldMapData.cameraZ = (var4 - AbstractWorldMapData.cameraZ) * FloorDecoration.field1640 / 1000 + AbstractWorldMapData.cameraZ + MouseRecorder.field609; // L: 3179 - if (AbstractWorldMapData.cameraZ > var4) { // L: 3180 - AbstractWorldMapData.cameraZ = var4; - } - } - - if (AbstractWorldMapData.cameraZ > var4) { // L: 3182 - AbstractWorldMapData.cameraZ -= FloorDecoration.field1640 * (AbstractWorldMapData.cameraZ - var4) / 1000 + MouseRecorder.field609; // L: 3183 - if (AbstractWorldMapData.cameraZ < var4) { // L: 3184 - AbstractWorldMapData.cameraZ = var4; - } - } - - var3 = SoundCache.field1472 * 128 + 64; // L: 3186 - var4 = TextureProvider.field1561 * 128 + 64; // L: 3187 - var5 = ArchiveLoader.getTileHeight(var3, var4, Huffman.Client_plane) - IgnoreList.field3620; // L: 3188 - var6 = var3 - VertexNormal.cameraX; // L: 3189 - var7 = var5 - FaceNormal.cameraY; // L: 3190 - var8 = var4 - AbstractWorldMapData.cameraZ; // L: 3191 - var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6)); // L: 3192 - var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; // L: 3193 - var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; // L: 3194 - if (var10 < 128) { // L: 3195 - var10 = 128; - } - - if (var10 > 383) { // L: 3196 - var10 = 383; - } - - if (PacketBuffer.cameraPitch < var10) { // L: 3197 - PacketBuffer.cameraPitch = (var10 - PacketBuffer.cameraPitch) * class225.field2592 / 1000 + PacketBuffer.cameraPitch + UserComparator9.field2013; // L: 3198 - if (PacketBuffer.cameraPitch > var10) { // L: 3199 - PacketBuffer.cameraPitch = var10; - } - } - - if (PacketBuffer.cameraPitch > var10) { // L: 3201 - PacketBuffer.cameraPitch -= class225.field2592 * (PacketBuffer.cameraPitch - var10) / 1000 + UserComparator9.field2013; // L: 3202 - if (PacketBuffer.cameraPitch < var10) { // L: 3203 - PacketBuffer.cameraPitch = var10; - } - } - - var12 = var11 - ServerPacket.cameraYaw; // L: 3205 - if (var12 > 1024) { // L: 3206 - var12 -= 2048; - } - - if (var12 < -1024) { // L: 3207 - var12 += 2048; - } - - if (var12 > 0) { // L: 3208 - ServerPacket.cameraYaw = var12 * class225.field2592 / 1000 + ServerPacket.cameraYaw + UserComparator9.field2013; // L: 3209 - ServerPacket.cameraYaw &= 2047; // L: 3210 - } - - if (var12 < 0) { // L: 3212 - ServerPacket.cameraYaw -= UserComparator9.field2013 + -var12 * class225.field2592 / 1000; // L: 3213 - ServerPacket.cameraYaw &= 2047; // L: 3214 - } - - int var26 = var11 - ServerPacket.cameraYaw; // L: 3216 - if (var26 > 1024) { // L: 3217 - var26 -= 2048; - } - - if (var26 < -1024) { // L: 3218 - var26 += 2048; - } - - if (var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) { // L: 3219 - ServerPacket.cameraYaw = var11; - } - } - - for (var3 = 0; var3 < 5; ++var3) { // L: 3221 - var10002 = field926[var3]++; - } - - ClientPreferences.varcs.tryWrite(); // L: 3222 - var3 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3225 - var5 = class41.method622(); // L: 3228 - if (var3 > 15000 && var5 > 15000) { // L: 3229 - logoutTimer = 250; // L: 3230 - MouseHandler.MouseHandler_idleCycles = 14500; // L: 3232 - var18 = getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); // L: 3235 - packetWriter.addNode(var18); // L: 3236 - } - - class60.friendSystem.processFriendUpdates(); // L: 3238 - ++packetWriter.pendingWrites; // L: 3239 - if (packetWriter.pendingWrites > 50) { // L: 3240 - var18 = getPacketBufferNode(ClientPacket.field2267, packetWriter.isaacCipher); // L: 3242 - packetWriter.addNode(var18); // L: 3243 - } - - try { - packetWriter.flush(); // L: 3246 - } catch (IOException var27) { // L: 3248 - ArchiveLoader.method1208(); // L: 3249 - } - - return; // L: 3251 - } - - var46 = var45.widget; // L: 3043 - if (var46.childIndex < 0) { // L: 3044 - break; - } - - var43 = TileItem.getWidget(var46.parentId); // L: 3045 - } while(var43 == null || var43.children == null || var46.childIndex >= var43.children.length || var46 != var43.children[var46.childIndex]); // L: 3046 - - Script.runScriptEvent(var45); // L: 3050 - } - } - - var46 = var45.widget; // L: 3031 - if (var46.childIndex < 0) { // L: 3032 - break; - } - - var43 = TileItem.getWidget(var46.parentId); // L: 3033 - } while(var43 == null || var43.children == null || var46.childIndex >= var43.children.length || var46 != var43.children[var46.childIndex]); // L: 3034 - - Script.runScriptEvent(var45); // L: 3038 - } - } - - var46 = var45.widget; // L: 3019 - if (var46.childIndex < 0) { // L: 3020 - break; - } - - var43 = TileItem.getWidget(var46.parentId); // L: 3021 - } while(var43 == null || var43.children == null || var46.childIndex >= var43.children.length || var46 != var43.children[var46.childIndex]); // L: 3022 - - Script.runScriptEvent(var45); // L: 3026 - } + } + } else { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2680 + var2.offset = 0; // L: 2681 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2682 + timer.method5137(); // L: 2683 + mouseLastLastPressedTimeMillis = -1L; // L: 2686 + class204.mouseRecorder.index = 0; // L: 2687 + class8.hasFocus = true; // L: 2688 + hadFocus = true; // L: 2689 + field905 = -1L; // L: 2690 + class105.reflectionChecks = new IterableNodeDeque(); // L: 2692 + packetWriter.clearBuffer(); // L: 2694 + packetWriter.packetBuffer.offset = 0; // L: 2695 + packetWriter.serverPacket = null; // L: 2696 + packetWriter.field1348 = null; // L: 2697 + packetWriter.field1339 = null; // L: 2698 + packetWriter.field1350 = null; // L: 2699 + packetWriter.serverPacketLength = 0; // L: 2700 + packetWriter.field1337 = 0; // L: 2701 + rebootTimer = 0; // L: 2702 + logoutTimer = 0; // L: 2703 + hintArrowType = 0; // L: 2704 + AbstractWorldMapData.method375(); // L: 2705 + class228.method4246(0); // L: 2706 + UrlRequest.method3436(); // L: 2707 + isItemSelected = 0; // L: 2708 + isSpellSelected = false; // L: 2709 + soundEffectCount = 0; // L: 2710 + camAngleY = 0; // L: 2711 + oculusOrbState = 0; // L: 2712 + ModelData0.field1895 = null; // L: 2713 + minimapState = 0; // L: 2714 + field906 = -1; // L: 2715 + destinationX = 0; // L: 2716 + destinationY = 0; // L: 2717 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 2718 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 2719 + npcCount = 0; // L: 2720 + class89.method2163(); // L: 2721 + + for (var37 = 0; var37 < 2048; ++var37) { // L: 2722 + players[var37] = null; + } + + for (var37 = 0; var37 < 32768; ++var37) { // L: 2723 + npcs[var37] = null; + } + + combatTargetPlayerIndex = -1; // L: 2724 + projectiles.clear(); // L: 2725 + graphicsObjects.clear(); // L: 2726 + + for (var37 = 0; var37 < 4; ++var37) { // L: 2727 + for (var13 = 0; var13 < 104; ++var13) { // L: 2728 + for (int var17 = 0; var17 < 104; ++var17) { // L: 2729 + groundItems[var37][var13][var17] = null; // L: 2730 + } + } + } + + pendingSpawns = new NodeDeque(); // L: 2734 + WorldMapLabelSize.friendSystem.clear(); // L: 2735 + + for (var37 = 0; var37 < VarpDefinition.VarpDefinition_fileCount; ++var37) { // L: 2736 + VarpDefinition var28 = PendingSpawn.VarpDefinition_get(var37); // L: 2737 + if (var28 != null) { // L: 2738 + Varps.Varps_temp[var37] = 0; // L: 2739 + Varps.Varps_main[var37] = 0; // L: 2740 + } + } + + FriendSystem.varcs.clearTransient(); // L: 2743 + followerIndex = -1; // L: 2744 + if (rootInterface != -1) { // L: 2745 + class206.method3852(rootInterface); + } + + for (InterfaceParent var27 = (InterfaceParent)interfaceParents.first(); var27 != null; var27 = (InterfaceParent)interfaceParents.next()) { // L: 2746 + Player.closeInterface(var27, true); // L: 2747 + } + + rootInterface = -1; // L: 2749 + interfaceParents = new NodeHashTable(8); // L: 2750 + meslayerContinueWidget = null; // L: 2751 + AbstractWorldMapData.method375(); // L: 2752 + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2753 + + for (var37 = 0; var37 < 8; ++var37) { // L: 2754 + playerMenuActions[var37] = null; // L: 2755 + playerOptionsPriorities[var37] = false; // L: 2756 + } + + class4.method78(); // L: 2758 + isLoading = true; // L: 2759 + + for (var37 = 0; var37 < 100; ++var37) { // L: 2760 + field834[var37] = true; + } + + Actor.method1855(); // L: 2761 + DevicePcmPlayerProvider.clanChat = null; // L: 2762 + + for (var37 = 0; var37 < 8; ++var37) { // L: 2763 + grandExchangeOffers[var37] = new GrandExchangeOffer(); + } + + WorldMapDecoration.grandExchangeEvents = null; // L: 2764 + TileItem.updatePlayer(var2); // L: 2766 + GrandExchangeEvent.field78 = -1; // L: 2767 + PacketWriter.loadRegions(false, var2); // L: 2768 + packetWriter.serverPacket = null; // L: 2769 } - var30 = getPacketBufferNode(ClientPacket.field2329, packetWriter.isaacCipher); // L: 2637 - var30.packetBuffer.writeByte(0); // L: 2638 - var3 = var30.packetBuffer.offset; // L: 2639 - class195.performReflectionCheck(var30.packetBuffer); // L: 2640 - var30.packetBuffer.writeLengthByte(var30.packetBuffer.offset - var3); // L: 2641 - packetWriter.addNode(var30); // L: 2642 } } - } - } // L: 2619 + } catch (IOException var21) { // L: 2826 + if (field715 < 1) { // L: 2827 + if (class41.port3 == Coord.port1) { // L: 2828 + class41.port3 = Coord.port2; + } else { + class41.port3 = Coord.port1; // L: 2829 + } - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-415953705" - ) - void resizeJS() { - int var1 = FloorDecoration.canvasWidth; // L: 3894 - int var2 = GameShell.canvasHeight; // L: 3895 - if (super.contentWidth < var1) { // L: 3896 - var1 = super.contentWidth; - } - - if (super.contentHeight < var2) { - var2 = super.contentHeight; // L: 3897 - } - - if (Tile.clientPreferences != null) { // L: 3898 - try { - class56.method899(class2.client, "resize", new Object[]{class39.getWindowedMode()}); // L: 3900 - } catch (Throwable var4) { // L: 3902 + ++field715; // L: 2830 + loginState = 0; // L: 2831 + } else { + WorldMapData_0.getLoginError(-2); // L: 2834 } } - - } // L: 3904 + } // L: 2608 2771 2811 2820 2823 2832 2835 2837 @ObfuscatedName("fw") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1826762039" + garbageValue = "-769999345" ) - final void drawLoggedIn() { - if (rootInterface != -1) { // L: 3907 - class58.method913(rootInterface); + @Export("doCycleLoggedIn") + final void doCycleLoggedIn() { + if (rebootTimer > 1) { // L: 3055 + --rebootTimer; } - int var1; - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3908 - if (field882[var1]) { // L: 3909 - field883[var1] = true; + if (logoutTimer > 0) { // L: 3056 + --logoutTimer; + } + + if (field730) { // L: 3057 + field730 = false; // L: 3058 + FloorDecoration.method2986(); // L: 3059 + } else { + if (!isMenuOpen) { // L: 3062 + WorldMapSection2.addCancelMenuEntry(); } - field884[var1] = field882[var1]; // L: 3910 - field882[var1] = false; // L: 3911 - } - - field881 = cycle; // L: 3913 - viewportX = -1; // L: 3914 - viewportY = -1; // L: 3915 - VerticalAlignment.hoveredItemContainer = null; // L: 3916 - if (rootInterface != -1) { // L: 3917 - rootWidgetCount = 0; // L: 3918 - PlayerAppearance.drawWidgets(rootInterface, 0, 0, FloorDecoration.canvasWidth, GameShell.canvasHeight, 0, 0, -1); // L: 3919 - } - - Rasterizer2D.Rasterizer2D_resetClip(); // L: 3921 - if (showMouseCross) { // L: 3922 - if (mouseCrossColor == 1) { // L: 3923 - ArchiveLoader.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3924 + int var1; + for (var1 = 0; var1 < 100 && this.method1616(packetWriter); ++var1) { // L: 3063 3064 } - if (mouseCrossColor == 2) { // L: 3926 - ArchiveLoader.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3927 - } - } + if (gameState == 30) { // L: 3066 + int var2; + PacketBufferNode var14; + while (class206.method3851()) { // L: 3067 + var14 = class4.getPacketBufferNode(ClientPacket.field2303, packetWriter.isaacCipher); // L: 3068 + var14.packetBuffer.writeByte(0); // L: 3069 + var2 = var14.packetBuffer.offset; // L: 3070 + TileItemPile.performReflectionCheck(var14.packetBuffer); // L: 3071 + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 3072 + packetWriter.addNode(var14); // L: 3073 + } - if (!isMenuOpen) { // L: 3930 - if (viewportX != -1) { // L: 3931 - var1 = viewportX; // L: 3932 - int var2 = viewportY; // L: 3933 - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 3935 3936 - int var3 = GrandExchangeOffer.method209(); // L: 3937 - String var4; - if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 3939 - var4 = "Use" + " " + selectedItemName + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { // L: 3940 - var4 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + if (timer.field3606) { // L: 3075 + var14 = class4.getPacketBufferNode(ClientPacket.field2287, packetWriter.isaacCipher); // L: 3077 + var14.packetBuffer.writeByte(0); // L: 3078 + var2 = var14.packetBuffer.offset; // L: 3079 + timer.write(var14.packetBuffer); // L: 3080 + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 3081 + packetWriter.addNode(var14); // L: 3082 + timer.method5142(); // L: 3083 + } + + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + synchronized(class204.mouseRecorder.lock) { // L: 3086 + if (!field772) { // L: 3087 + class204.mouseRecorder.index = 0; // L: 3173 + } else if (MouseHandler.MouseHandler_lastButton != 0 || class204.mouseRecorder.index >= 40) { // L: 3088 + PacketBufferNode var15 = null; // L: 3090 + var3 = 0; // L: 3091 + var4 = 0; // L: 3092 + var5 = 0; // L: 3093 + var6 = 0; // L: 3094 + + for (var7 = 0; var7 < class204.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 3095 3096 + var4 = var7; // L: 3097 + var8 = class204.mouseRecorder.ys[var7]; // L: 3098 + if (var8 < -1) { // L: 3099 + var8 = -1; + } else if (var8 > 65534) { // L: 3100 + var8 = 65534; + } + + int var9 = class204.mouseRecorder.xs[var7]; // L: 3101 + if (var9 < -1) { // L: 3102 + var9 = -1; + } else if (var9 > 65534) { // L: 3103 + var9 = 65534; + } + + if (var9 != field719 || var8 != field693) { // L: 3104 + if (var15 == null) { // L: 3107 + var15 = class4.getPacketBufferNode(ClientPacket.field2314, packetWriter.isaacCipher); // L: 3108 + var15.packetBuffer.writeByte(0); // L: 3109 + var3 = var15.packetBuffer.offset; // L: 3110 + PacketBuffer var10000 = var15.packetBuffer; // L: 3111 + var10000.offset += 2; + var5 = 0; // L: 3112 + var6 = 0; // L: 3113 + } + + int var10; + int var11; + int var12; + if (-1L != field694) { // L: 3118 + var10 = var9 - field719; // L: 3119 + var11 = var8 - field693; // L: 3120 + var12 = (int)((class204.mouseRecorder.millis[var7] - field694) / 20L); // L: 3121 + var5 = (int)((long)var5 + (class204.mouseRecorder.millis[var7] - field694) % 20L); // L: 3122 + } else { + var10 = var9; // L: 3125 + var11 = var8; // L: 3126 + var12 = Integer.MAX_VALUE; // L: 3127 + } + + field719 = var9; // L: 3129 + field693 = var8; // L: 3130 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3131 + var10 += 32; // L: 3132 + var11 += 32; // L: 3133 + var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3134 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3136 + var10 += 128; // L: 3137 + var11 += 128; // L: 3138 + var15.packetBuffer.writeByte(var12 + 128); // L: 3139 + var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3140 + } else if (var12 < 32) { // L: 3142 + var15.packetBuffer.writeByte(var12 + 192); // L: 3143 + if (var9 != -1 && var8 != -1) { // L: 3144 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3145 + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3148 + if (var9 != -1 && var8 != -1) { // L: 3149 + var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3150 + } else { + var15.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; // L: 3152 + field694 = class204.mouseRecorder.millis[var7]; // L: 3153 + } + } + + if (var15 != null) { // L: 3155 + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); // L: 3156 + var7 = var15.packetBuffer.offset; // L: 3157 + var15.packetBuffer.offset = var3; // L: 3158 + var15.packetBuffer.writeByte(var5 / var6); // L: 3159 + var15.packetBuffer.writeByte(var5 % var6); // L: 3160 + var15.packetBuffer.offset = var7; // L: 3161 + packetWriter.addNode(var15); // L: 3162 + } + + if (var4 >= class204.mouseRecorder.index) { // L: 3164 + class204.mouseRecorder.index = 0; + } else { + MouseRecorder var38 = class204.mouseRecorder; // L: 3166 + var38.index -= var4; + System.arraycopy(class204.mouseRecorder.xs, var4, class204.mouseRecorder.xs, 0, class204.mouseRecorder.index); // L: 3167 + System.arraycopy(class204.mouseRecorder.ys, var4, class204.mouseRecorder.ys, 0, class204.mouseRecorder.index); // L: 3168 + System.arraycopy(class204.mouseRecorder.millis, var4, class204.mouseRecorder.millis, 0, class204.mouseRecorder.index); // L: 3169 + } + } + } + + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !MusicPatchNode.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3175 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3176 + if (var16 > 32767L) { // L: 3177 + var16 = 32767L; + } + + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3178 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3179 + if (var3 < 0) { // L: 3180 + var3 = 0; + } else if (var3 > HealthBar.canvasHeight) { // L: 3181 + var3 = HealthBar.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3182 + if (var4 < 0) { // L: 3183 + var4 = 0; + } else if (var4 > ItemContainer.canvasWidth) { // L: 3184 + var4 = ItemContainer.canvasWidth; + } + + var5 = (int)var16; // L: 3185 + var18 = class4.getPacketBufferNode(ClientPacket.field2322, packetWriter.isaacCipher); // L: 3186 + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 3187 + var18.packetBuffer.writeShort(var4); // L: 3188 + var18.packetBuffer.writeShort(var3); // L: 3189 + packetWriter.addNode(var18); // L: 3190 + } + + if (KeyHandler.field427 > 0) { // L: 3192 + var14 = class4.getPacketBufferNode(ClientPacket.field2255, packetWriter.isaacCipher); // L: 3193 + var14.packetBuffer.writeShort(0); // L: 3194 + var2 = var14.packetBuffer.offset; // L: 3195 + long var19 = User.currentTimeMillis(); // L: 3196 + + for (var5 = 0; var5 < KeyHandler.field427; ++var5) { // L: 3197 + long var21 = var19 - field905; // L: 3198 + if (var21 > 16777215L) { // L: 3199 + var21 = 16777215L; + } + + field905 = var19; // L: 3200 + var14.packetBuffer.method5680((int)var21); // L: 3201 + var14.packetBuffer.method5664(KeyHandler.field430[var5]); // L: 3202 + } + + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3204 + packetWriter.addNode(var14); // L: 3205 + } + + if (field882 > 0) { // L: 3207 + --field882; + } + + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3208 + field750 = true; + } + + if (field750 && field882 <= 0) { // L: 3209 + field882 = 20; // L: 3210 + field750 = false; // L: 3211 + var14 = class4.getPacketBufferNode(ClientPacket.field2321, packetWriter.isaacCipher); // L: 3213 + var14.packetBuffer.method5674(camAngleX); // L: 3214 + var14.packetBuffer.method5673(camAngleY); // L: 3215 + packetWriter.addNode(var14); // L: 3216 + } + + if (class8.hasFocus && !hadFocus) { // L: 3218 + hadFocus = true; // L: 3219 + var14 = class4.getPacketBufferNode(ClientPacket.field2312, packetWriter.isaacCipher); // L: 3221 + var14.packetBuffer.writeByte(1); // L: 3222 + packetWriter.addNode(var14); // L: 3223 + } + + if (!class8.hasFocus && hadFocus) { // L: 3225 + hadFocus = false; // L: 3226 + var14 = class4.getPacketBufferNode(ClientPacket.field2312, packetWriter.isaacCipher); // L: 3228 + var14.packetBuffer.writeByte(0); // L: 3229 + packetWriter.addNode(var14); // L: 3230 + } + + if (KeyHandler.worldMap != null) { // L: 3233 + KeyHandler.worldMap.method6454(); + } + + class2.method30(); // L: 3234 + if (field906 != GrandExchangeOfferUnitPriceComparator.Client_plane) { // L: 3236 + field906 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 3237 + SoundCache.method2646(GrandExchangeOfferUnitPriceComparator.Client_plane); // L: 3238 + } + + if (gameState == 30) { // L: 3241 + FloorDecoration.method2988(); // L: 3242 + ChatChannel.method2381(); // L: 3243 + ++packetWriter.field1337; // L: 3244 + if (packetWriter.field1337 > 750) { // L: 3245 + FloorDecoration.method2986(); // L: 3246 } else { - var4 = ApproximateRouteStrategy.method1273(var3); // L: 3941 + class2.method41(); // L: 3249 + + for (var1 = 0; var1 < npcCount; ++var1) { // L: 3251 + var2 = npcIndices[var1]; // L: 3252 + NPC var23 = npcs[var2]; // L: 3253 + if (var23 != null) { // L: 3254 + class13.updateActorSequence(var23, var23.definition.size); // L: 3255 + } + } + + ApproximateRouteStrategy.method1317(); // L: 3259 + ++field743; // L: 3260 + if (mouseCrossColor != 0) { // L: 3261 + mouseCrossState += 20; // L: 3262 + if (mouseCrossState >= 400) { // L: 3263 + mouseCrossColor = 0; + } + } + + if (MouseHandler.field525 != null) { // L: 3265 + ++field828; // L: 3266 + if (field828 >= 15) { // L: 3267 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(MouseHandler.field525); // L: 3268 + MouseHandler.field525 = null; // L: 3269 + } + } + + Widget var31 = GrandExchangeEvent.mousedOverWidgetIf1; // L: 3272 + Widget var32 = GrandExchangeOfferOwnWorldComparator.field677; // L: 3273 + GrandExchangeEvent.mousedOverWidgetIf1 = null; // L: 3274 + GrandExchangeOfferOwnWorldComparator.field677 = null; // L: 3275 + draggedOnWidget = null; // L: 3276 + field705 = false; // L: 3277 + field859 = false; // L: 3278 + field902 = 0; // L: 3279 + + while (Clock.isKeyDown() && field902 < 128) { // L: 3280 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && SecureRandomCallable.field555 == 66) { // L: 3281 + String var33 = class234.method4262(); // L: 3282 + ByteArrayPool.client.clipboardSetString(var33); // L: 3283 + } else if (oculusOrbState != 1 || WorldMapManager.field335 <= 0) { // L: 3286 + field904[field902] = SecureRandomCallable.field555; // L: 3289 + field903[field902] = WorldMapManager.field335; // L: 3290 + ++field902; // L: 3291 + } + } + + if (MilliClock.method3590() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3293 + var3 = PlayerType.localPlayer.plane - mouseWheelRotation; // L: 3294 + if (var3 < 0) { // L: 3295 + var3 = 0; + } else if (var3 > 3) { // L: 3296 + var3 = 3; + } + + if (var3 != PlayerType.localPlayer.plane) { // L: 3297 + class2.method42(PlayerType.localPlayer.pathX[0] + FloorDecoration.baseX, PlayerType.localPlayer.pathY[0] + WorldMapData_0.baseY, var3, false); // L: 3298 + } + + mouseWheelRotation = 0; // L: 3300 + } + + if (rootInterface != -1) { // L: 3302 + DynamicObject.updateRootInterface(rootInterface, 0, 0, ItemContainer.canvasWidth, HealthBar.canvasHeight, 0, 0); + } + + ++cycleCntr; // L: 3303 + + while (true) { + Widget var24; + Widget var25; + ScriptEvent var34; + do { + var34 = (ScriptEvent)field881.removeLast(); // L: 3305 + if (var34 == null) { // L: 3306 + while (true) { + do { + var34 = (ScriptEvent)field939.removeLast(); // L: 3317 + if (var34 == null) { // L: 3318 + while (true) { + do { + var34 = (ScriptEvent)scriptEvents.removeLast(); // L: 3329 + if (var34 == null) { // L: 3330 + this.menu(); // L: 3340 + if (KeyHandler.worldMap != null) { // L: 3342 + KeyHandler.worldMap.method6464(GrandExchangeOfferUnitPriceComparator.Client_plane, (PlayerType.localPlayer.x >> 7) + FloorDecoration.baseX, (PlayerType.localPlayer.y >> 7) + WorldMapData_0.baseY, false); // L: 3343 + KeyHandler.worldMap.loadCache(); // L: 3344 + } + + if (clickedWidget != null) { // L: 3347 + this.method1405(); + } + + if (GameBuild.dragInventoryWidget != null) { // L: 3348 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(GameBuild.dragInventoryWidget); // L: 3349 + ++itemDragDuration; // L: 3350 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3351 + if (field830) { // L: 3352 + if (GameBuild.dragInventoryWidget == class217.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3353 + Widget var35 = GameBuild.dragInventoryWidget; // L: 3354 + byte var29 = 0; // L: 3355 + if (field846 == 1 && var35.contentType == 206) { // L: 3356 + var29 = 1; + } + + if (var35.itemIds[dragItemSlotDestination] <= 0) { // L: 3357 + var29 = 0; + } + + var6 = WorldMapData_0.getWidgetFlags(var35); // L: 3359 + boolean var30 = (var6 >> 29 & 1) != 0; // L: 3361 + if (var30) { // L: 3363 + var7 = dragItemSlotSource; // L: 3364 + var8 = dragItemSlotDestination; // L: 3365 + var35.itemIds[var8] = var35.itemIds[var7]; // L: 3366 + var35.itemQuantities[var8] = var35.itemQuantities[var7]; // L: 3367 + var35.itemIds[var7] = -1; // L: 3368 + var35.itemQuantities[var7] = 0; // L: 3369 + } else if (var29 == 1) { // L: 3371 + var7 = dragItemSlotSource; // L: 3372 + var8 = dragItemSlotDestination; // L: 3373 + + while (var8 != var7) { // L: 3374 + if (var7 > var8) { // L: 3375 + var35.swapItems(var7 - 1, var7); // L: 3376 + --var7; // L: 3377 + } else if (var7 < var8) { // L: 3379 + var35.swapItems(var7 + 1, var7); // L: 3380 + ++var7; // L: 3381 + } + } + } else { + var35.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3386 + } + + PacketBufferNode var26 = class4.getPacketBufferNode(ClientPacket.field2267, packetWriter.isaacCipher); // L: 3389 + var26.packetBuffer.writeShort(dragItemSlotDestination); // L: 3390 + var26.packetBuffer.method5674(dragItemSlotSource); // L: 3391 + var26.packetBuffer.writeByte(var29); // L: 3392 + var26.packetBuffer.method5683(GameBuild.dragInventoryWidget.id); // L: 3393 + packetWriter.addNode(var26); // L: 3394 + } + } else if (this.shouldLeftClickOpenMenu()) { // L: 3398 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3399 + } else if (menuOptionsCount > 0) { // L: 3401 + var3 = draggedWidgetX; // L: 3402 + var4 = draggedWidgetY; // L: 3403 + MenuAction var36 = GrandExchangeOffer.tempMenuAction; // L: 3405 + Calendar.menuAction(var36.param0, var36.param1, var36.opcode, var36.identifier, var36.action, var36.action, var3, var4); // L: 3407 + GrandExchangeOffer.tempMenuAction = null; // L: 3409 + } + + field828 = 10; // L: 3413 + MouseHandler.MouseHandler_lastButton = 0; // L: 3414 + GameBuild.dragInventoryWidget = null; // L: 3415 + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3418 3419 + field830 = true; // L: 3420 + } + } + + if (Scene.shouldSendWalk()) { // L: 3425 + var3 = Scene.Scene_selectedX; // L: 3426 + var4 = Scene.Scene_selectedY; // L: 3427 + PacketBufferNode var37 = class4.getPacketBufferNode(ClientPacket.field2260, packetWriter.isaacCipher); // L: 3429 + var37.packetBuffer.writeByte(5); // L: 3430 + var37.packetBuffer.method5674(var3 + FloorDecoration.baseX); // L: 3431 + var37.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3432 + var37.packetBuffer.writeShortLE(var4 + WorldMapData_0.baseY); // L: 3433 + packetWriter.addNode(var37); // L: 3434 + Scene.method3253(); // L: 3435 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3436 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3437 + mouseCrossColor = 1; // L: 3438 + mouseCrossState = 0; // L: 3439 + destinationX = var3; // L: 3440 + destinationY = var4; // L: 3441 + } + + if (var31 != GrandExchangeEvent.mousedOverWidgetIf1) { // L: 3443 + if (var31 != null) { // L: 3444 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var31); + } + + if (GrandExchangeEvent.mousedOverWidgetIf1 != null) { // L: 3445 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(GrandExchangeEvent.mousedOverWidgetIf1); + } + } + + if (var32 != GrandExchangeOfferOwnWorldComparator.field677 && field833 == field832) { // L: 3447 + if (var32 != null) { // L: 3448 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var32); + } + + if (GrandExchangeOfferOwnWorldComparator.field677 != null) { // L: 3449 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(GrandExchangeOfferOwnWorldComparator.field677); + } + } + + if (GrandExchangeOfferOwnWorldComparator.field677 != null) { // L: 3451 + if (field832 < field833) { // L: 3452 + ++field832; // L: 3453 + if (field833 == field832) { // L: 3454 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(GrandExchangeOfferOwnWorldComparator.field677); + } + } + } else if (field832 > 0) { // L: 3457 + --field832; + } + + InterfaceParent.method1269(); // L: 3458 + if (isCameraLocked) { // L: 3459 + WorldMapIcon_1.method392(); + } + + for (var3 = 0; var3 < 5; ++var3) { // L: 3460 + int var10002 = field918[var3]++; + } + + FriendSystem.varcs.tryWrite(); // L: 3461 + var3 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3464 + var5 = class236.method4264(); // L: 3467 + if (var3 > 15000 && var5 > 15000) { // L: 3468 + logoutTimer = 250; // L: 3469 + class228.method4246(14500); // L: 3470 + var18 = class4.getPacketBufferNode(ClientPacket.field2271, packetWriter.isaacCipher); // L: 3472 + packetWriter.addNode(var18); // L: 3473 + } + + WorldMapLabelSize.friendSystem.processFriendUpdates(); // L: 3475 + ++packetWriter.pendingWrites; // L: 3476 + if (packetWriter.pendingWrites > 50) { // L: 3477 + var18 = class4.getPacketBufferNode(ClientPacket.field2247, packetWriter.isaacCipher); // L: 3479 + packetWriter.addNode(var18); // L: 3480 + } + + try { + packetWriter.flush(); // L: 3483 + } catch (IOException var27) { // L: 3485 + FloorDecoration.method2986(); // L: 3486 + } + + return; // L: 3488 + } + + var24 = var34.widget; // L: 3331 + if (var24.childIndex < 0) { // L: 3332 + break; + } + + var25 = UserComparator4.getWidget(var24.parentId); // L: 3333 + } while(var25 == null || var25.children == null || var24.childIndex >= var25.children.length || var24 != var25.children[var24.childIndex]); // L: 3334 + + Entity.runScriptEvent(var34); // L: 3338 + } + } + + var24 = var34.widget; // L: 3319 + if (var24.childIndex < 0) { // L: 3320 + break; + } + + var25 = UserComparator4.getWidget(var24.parentId); // L: 3321 + } while(var25 == null || var25.children == null || var24.childIndex >= var25.children.length || var24 != var25.children[var24.childIndex]); // L: 3322 + + Entity.runScriptEvent(var34); // L: 3326 + } + } + + var24 = var34.widget; // L: 3307 + if (var24.childIndex < 0) { // L: 3308 + break; + } + + var25 = UserComparator4.getWidget(var24.parentId); // L: 3309 + } while(var25 == null || var25.children == null || var24.childIndex >= var25.children.length || var24 != var25.children[var24.childIndex]); // L: 3310 + + Entity.runScriptEvent(var34); // L: 3314 + } + } + } + } + } + } // L: 3060 3247 + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-68" + ) + @Export("resizeJS") + void resizeJS() { + int var1 = ItemContainer.canvasWidth; // L: 4232 + int var2 = HealthBar.canvasHeight; // L: 4233 + if (super.contentWidth < var1) { // L: 4234 + var1 = super.contentWidth; + } + + if (super.contentHeight < var2) { + var2 = super.contentHeight; // L: 4235 + } + + if (GrandExchangeOfferAgeComparator.clientPreferences != null) { // L: 4236 + try { + class56.method944(ByteArrayPool.client, "resize", new Object[]{UrlRequester.getWindowedMode()}); // L: 4238 + } catch (Throwable var4) { // L: 4240 + } + } + + } // L: 4242 + + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1208840742" + ) + @Export("drawLoggedIn") + final void drawLoggedIn() { + int var1; + if (rootInterface != -1) { // L: 4245 + var1 = rootInterface; // L: 4246 + if (ScriptFrame.loadInterface(var1)) { // L: 4248 + Frames.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); // L: 4249 + } + } + + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4252 + if (field834[var1]) { // L: 4253 + field758[var1] = true; + } + + field745[var1] = field834[var1]; // L: 4254 + field834[var1] = false; // L: 4255 + } + + field748 = cycle; // L: 4257 + viewportX = -1; // L: 4258 + viewportY = -1; // L: 4259 + class217.hoveredItemContainer = null; // L: 4260 + if (rootInterface != -1) { // L: 4261 + rootWidgetCount = 0; // L: 4262 + ClanChat.drawWidgets(rootInterface, 0, 0, ItemContainer.canvasWidth, HealthBar.canvasHeight, 0, 0, -1); // L: 4263 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4265 + if (showMouseCross) { // L: 4266 + if (mouseCrossColor == 1) { // L: 4267 + class60.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4268 + } + + if (mouseCrossColor == 2) { // L: 4270 + class60.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4271 + } + } + + int var2; + int var3; + int var4; + int var6; + int var7; + int var8; + if (!isMenuOpen) { // L: 4274 + if (viewportX != -1) { // L: 4275 + var1 = viewportX; // L: 4276 + var2 = viewportY; // L: 4277 + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 4279 4280 + var3 = FileSystem.method3638(); // L: 4281 + String var15; + if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 4283 + var15 = "Use" + " " + selectedItemName + " " + "->"; + } else if (isSpellSelected && menuOptionsCount < 2) { // L: 4284 + var15 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; + } else { + String var16; + if (var3 < 0) { // L: 4288 + var16 = ""; // L: 4289 + } else if (menuTargets[var3].length() > 0) { // L: 4292 + var16 = menuActions[var3] + " " + menuTargets[var3]; + } else { + var16 = menuActions[var3]; // L: 4293 + } + + var15 = var16; // L: 4295 } - if (menuOptionsCount > 2) { // L: 3942 - var4 = var4 + WorldMapAreaData.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + if (menuOptionsCount > 2) { // L: 4297 + var15 = var15 + colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; } - class4.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 3943 + ReflectionCheck.fontBold12.drawRandomAlphaAndSpacing(var15, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 4298 } } } else { - UserComparator1.method6040(); // L: 3947 - } + var1 = Coord.menuX; // L: 4303 + var2 = WorldMapArea.menuY; // L: 4304 + var3 = KeyHandler.menuWidth; // L: 4305 + var4 = ServerPacket.menuHeight; // L: 4306 + int var5 = 6116423; // L: 4307 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4308 + Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4309 + Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4310 + ReflectionCheck.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4311 + var6 = MouseHandler.MouseHandler_x; // L: 4312 + var7 = MouseHandler.MouseHandler_y; // L: 4313 - if (gameDrawingMode == 3) { // L: 3948 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3949 - if (field884[var1]) { // L: 3950 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 3951 - } else if (field883[var1]) { // L: 3953 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 3954 + int var9; + int var10; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4314 + var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; // L: 4315 + var10 = 16777215; // L: 4316 + if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4317 + var10 = 16776960; + } + + Font var13 = ReflectionCheck.fontBold12; // L: 4318 + String var14; + if (var8 < 0) { // L: 4321 + var14 = ""; // L: 4322 + } else if (menuTargets[var8].length() > 0) { // L: 4325 + var14 = menuActions[var8] + " " + menuTargets[var8]; + } else { + var14 = menuActions[var8]; // L: 4326 + } + + var13.draw(var14, var1 + 3, var9, var10, 0); // L: 4328 + } + + var8 = Coord.menuX; // L: 4330 + var9 = WorldMapArea.menuY; // L: 4331 + var10 = KeyHandler.menuWidth; // L: 4332 + int var11 = ServerPacket.menuHeight; // L: 4333 + + for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 4335 + if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var10 + var8 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { // L: 4336 + field758[var12] = true; } } } - class197.method3743(Huffman.Client_plane, WorldMapLabelSize.localPlayer.x, WorldMapLabelSize.localPlayer.y, field737); // L: 3958 - field737 = 0; // L: 3959 - } // L: 3960 + if (gameDrawingMode == 3) { // L: 4340 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4341 + if (field745[var1]) { // L: 4342 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4343 + } else if (field758[var1]) { // L: 4345 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4346 + } + } + } - @ObfuscatedName("gu") + var1 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 4350 + var2 = PlayerType.localPlayer.x; // L: 4351 + var3 = PlayerType.localPlayer.y; // L: 4352 + var4 = field743; // L: 4353 + + for (ObjectSound var21 = (ObjectSound)ObjectSound.objectSounds.last(); var21 != null; var21 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 4355 + if (var21.soundEffectId != -1 || var21.soundEffectIds != null) { // L: 4356 + var6 = 0; // L: 4357 + if (var2 > var21.field1103) { // L: 4358 + var6 += var2 - var21.field1103; + } else if (var2 < var21.x) { // L: 4359 + var6 += var21.x - var2; + } + + if (var3 > var21.field1112) { // L: 4360 + var6 += var3 - var21.field1112; + } else if (var3 < var21.y) { // L: 4361 + var6 += var21.y - var3; + } + + if (var6 - 64 <= var21.field1104 && areaSoundEffectVolume != 0 && var1 == var21.plane) { // L: 4362 + var6 -= 64; // L: 4373 + if (var6 < 0) { // L: 4374 + var6 = 0; + } + + var7 = (var21.field1104 - var6) * areaSoundEffectVolume / var21.field1104; // L: 4375 + Object var10000; + if (var21.stream1 == null) { // L: 4376 + if (var21.soundEffectId >= 0) { // L: 4377 + var10000 = null; // L: 4378 + SoundEffect var17 = SoundEffect.readSoundEffect(Username.archive4, var21.soundEffectId, 0); + if (var17 != null) { // L: 4379 + RawSound var18 = var17.toRawSound().resample(NetSocket.decimator); // L: 4380 + RawPcmStream var19 = RawPcmStream.createRawPcmStream(var18, 100, var7); // L: 4381 + var19.setNumLoops(-1); // L: 4382 + GrandExchangeEvents.pcmStreamMixer.addSubStream(var19); // L: 4383 + var21.stream1 = var19; // L: 4384 + } + } + } else { + var21.stream1.method2677(var7); // L: 4388 + } + + if (var21.stream2 == null) { // L: 4389 + if (var21.soundEffectIds != null && (var21.field1108 -= var4) <= 0) { // L: 4390 + var8 = (int)(Math.random() * (double)var21.soundEffectIds.length); // L: 4391 + var10000 = null; // L: 4392 + SoundEffect var22 = SoundEffect.readSoundEffect(Username.archive4, var21.soundEffectIds[var8], 0); + if (var22 != null) { // L: 4393 + RawSound var23 = var22.toRawSound().resample(NetSocket.decimator); // L: 4394 + RawPcmStream var20 = RawPcmStream.createRawPcmStream(var23, 100, var7); // L: 4395 + var20.setNumLoops(0); // L: 4396 + GrandExchangeEvents.pcmStreamMixer.addSubStream(var20); // L: 4397 + var21.stream2 = var20; // L: 4398 + var21.field1108 = var21.field1107 + (int)(Math.random() * (double)(var21.field1109 - var21.field1107)); // L: 4399 + } + } + } else { + var21.stream2.method2677(var7); // L: 4404 + if (!var21.stream2.hasNext()) { // L: 4405 + var21.stream2 = null; // L: 4406 + } + } + } else { + if (var21.stream1 != null) { // L: 4363 + GrandExchangeEvents.pcmStreamMixer.removeSubStream(var21.stream1); // L: 4364 + var21.stream1 = null; // L: 4365 + } + + if (var21.stream2 != null) { // L: 4367 + GrandExchangeEvents.pcmStreamMixer.removeSubStream(var21.stream2); // L: 4368 + var21.stream2 = null; // L: 4369 + } + } + } + } + + field743 = 0; // L: 4411 + } // L: 4412 + + @ObfuscatedName("gv") @ObfuscatedSignature( - descriptor = "(Ldx;B)Z", - garbageValue = "13" + descriptor = "(Ldg;I)Z", + garbageValue = "-1472094898" ) - final boolean method1707(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5313 - PacketBuffer var3 = var1.packetBuffer; // L: 5314 - if (var2 == null) { // L: 5315 + final boolean method1616(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5848 + PacketBuffer var3 = var1.packetBuffer; // L: 5849 + if (var2 == null) { // L: 5850 return false; } else { + int var6; String var17; - int var18; try { int var5; - if (var1.serverPacket == null) { // L: 5317 - if (var1.field1344) { // L: 5318 - if (!var2.isAvailable(1)) { // L: 5319 + if (var1.serverPacket == null) { // L: 5852 + if (var1.field1340) { // L: 5853 + if (!var2.isAvailable(1)) { // L: 5854 return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 5320 - var1.field1345 = 0; // L: 5321 - var1.field1344 = false; // L: 5322 + var2.read(var1.packetBuffer.array, 0, 1); // L: 5855 + var1.field1337 = 0; // L: 5856 + var1.field1340 = false; // L: 5857 } - var3.offset = 0; // L: 5324 - if (var3.method5564()) { // L: 5325 - if (!var2.isAvailable(1)) { // L: 5326 + var3.offset = 0; // L: 5859 + if (var3.method5582()) { // L: 5860 + if (!var2.isAvailable(1)) { // L: 5861 return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 5327 - var1.field1345 = 0; // L: 5328 + var2.read(var1.packetBuffer.array, 1, 1); // L: 5862 + var1.field1337 = 0; // L: 5863 } - var1.field1344 = true; // L: 5330 - ServerPacket[] var4 = class198.ServerPacket_values(); // L: 5331 - var5 = var3.readSmartByteShortIsaac(); // L: 5332 - if (var5 < 0 || var5 >= var4.length) { // L: 5333 + var1.field1340 = true; // L: 5865 + ServerPacket[] var4 = ArchiveDiskActionHandler.ServerPacket_values(); // L: 5866 + var5 = var3.readSmartByteShortIsaac(); // L: 5867 + if (var5 < 0 || var5 >= var4.length) { // L: 5868 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 5334 - var1.serverPacketLength = var1.serverPacket.length; // L: 5335 + var1.serverPacket = var4[var5]; // L: 5869 + var1.serverPacketLength = var1.serverPacket.length; // L: 5870 } - if (var1.serverPacketLength == -1) { // L: 5337 - if (!var2.isAvailable(1)) { // L: 5338 + if (var1.serverPacketLength == -1) { // L: 5872 + if (!var2.isAvailable(1)) { // L: 5873 return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 5339 - var1.serverPacketLength = var3.array[0] & 255; // L: 5340 + var1.getSocket().read(var3.array, 0, 1); // L: 5874 + var1.serverPacketLength = var3.array[0] & 255; // L: 5875 } - if (var1.serverPacketLength == -2) { // L: 5342 - if (!var2.isAvailable(2)) { // L: 5343 + if (var1.serverPacketLength == -2) { // L: 5877 + if (!var2.isAvailable(2)) { // L: 5878 return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 5344 - var3.offset = 0; // L: 5345 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 5346 + var1.getSocket().read(var3.array, 0, 2); // L: 5879 + var3.offset = 0; // L: 5880 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 5881 } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5348 + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5883 return false; } - var3.offset = 0; // L: 5349 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 5350 - var1.field1345 = 0; // L: 5351 - timer.method5106(); // L: 5352 - var1.field1346 = var1.field1348; // L: 5353 - var1.field1348 = var1.field1336; // L: 5354 - var1.field1336 = var1.serverPacket; // L: 5355 + var3.offset = 0; // L: 5884 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 5885 + var1.field1337 = 0; // L: 5886 + timer.method5135(); // L: 5887 + var1.field1350 = var1.field1339; // L: 5888 + var1.field1339 = var1.field1348; // L: 5889 + var1.field1348 = var1.serverPacket; // L: 5890 int var16; - if (ServerPacket.field2161 == var1.serverPacket) { // L: 5356 - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { // L: 5357 - VarpDefinition var55 = class195.VarpDefinition_get(var16); // L: 5358 - if (var55 != null) { // L: 5359 - Varps.Varps_temp[var16] = 0; // L: 5360 - Varps.Varps_main[var16] = 0; // L: 5361 + InterfaceParent var41; + if (ServerPacket.field2207 == var1.serverPacket) { // L: 5891 + var16 = var3.method5687(); // L: 5892 + var5 = var3.readUnsignedShort(); // L: 5893 + var6 = var3.method5650(); // L: 5894 + var41 = (InterfaceParent)interfaceParents.get((long)var16); // L: 5895 + if (var41 != null) { // L: 5896 + Player.closeInterface(var41, var5 != var41.group); + } + + ModelData0.method3381(var16, var5, var6); // L: 5897 + var1.serverPacket = null; // L: 5898 + return true; // L: 5899 + } + + if (ServerPacket.field2202 == var1.serverPacket) { // L: 5901 + for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { // L: 5902 + VarpDefinition var51 = PendingSpawn.VarpDefinition_get(var16); // L: 5903 + if (var51 != null) { // L: 5904 + Varps.Varps_temp[var16] = 0; // L: 5905 + Varps.Varps_main[var16] = 0; // L: 5906 } } - DevicePcmPlayerProvider.method897(); // L: 5364 - field864 += 32; // L: 5365 - var1.serverPacket = null; // L: 5366 - return true; // L: 5367 + ItemDefinition.method4874(); // L: 5909 + field868 += 32; // L: 5910 + var1.serverPacket = null; // L: 5911 + return true; // L: 5912 } - if (ServerPacket.field2219 == var1.serverPacket) { // L: 5369 - byte var59 = var3.method5730(); // L: 5370 - var5 = var3.readUnsignedShort(); // L: 5371 - Varps.Varps_temp[var5] = var59; // L: 5372 - if (Varps.Varps_main[var5] != var59) { // L: 5373 - Varps.Varps_main[var5] = var59; // L: 5374 + String var38; + if (ServerPacket.field2157 == var1.serverPacket) { // L: 5914 + var38 = var3.readStringCp1252NullTerminated(); // L: 5915 + var5 = var3.method5650(); // L: 5916 + var6 = var3.method5650(); // L: 5917 + if (var5 >= 1 && var5 <= 8) { // L: 5918 + if (var38.equalsIgnoreCase("null")) { // L: 5919 + var38 = null; + } + + playerMenuActions[var5 - 1] = var38; // L: 5920 + playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 5921 } - Clock.changeGameOptions(var5); // L: 5376 - field863[++field864 - 1 & 31] = var5; // L: 5377 - var1.serverPacket = null; // L: 5378 - return true; // L: 5379 + var1.serverPacket = null; // L: 5923 + return true; // L: 5924 } - if (ServerPacket.field2160 == var1.serverPacket) { // L: 5381 - MouseHandler.method1134(class194.field2363); // L: 5382 - var1.serverPacket = null; // L: 5383 - return true; // L: 5384 - } + long var18; + long var20; + if (ServerPacket.field2224 == var1.serverPacket) { // L: 5926 + var38 = var3.readStringCp1252NullTerminated(); // L: 5927 + var18 = (long)var3.readUnsignedShort(); // L: 5928 + var20 = (long)var3.readMedium(); // L: 5929 + PlayerType var9 = (PlayerType)class195.findEnumerated(WorldMapLabelSize.PlayerType_values(), var3.readUnsignedByte()); // L: 5930 + long var10 = var20 + (var18 << 32); // L: 5931 + boolean var12 = false; // L: 5932 - if (ServerPacket.field2208 == var1.serverPacket) { // L: 5386 - rebootTimer = var3.readUnsignedShort() * 30; // L: 5387 - field775 = cycleCntr; // L: 5388 - var1.serverPacket = null; // L: 5389 - return true; // L: 5390 - } - - if (ServerPacket.field2186 == var1.serverPacket) { // L: 5392 - World var39 = new World(); // L: 5393 - var39.host = var3.readStringCp1252NullTerminated(); // L: 5394 - var39.id = var3.readUnsignedShort(); // L: 5395 - var5 = var3.readInt(); // L: 5396 - var39.properties = var5; // L: 5397 - CollisionMap.updateGameState(45); // L: 5398 - var2.close(); // L: 5399 - var2 = null; // L: 5400 - Canvas.changeWorld(var39); // L: 5401 - var1.serverPacket = null; // L: 5402 - return false; // L: 5403 - } - - if (ServerPacket.field2196 == var1.serverPacket) { // L: 5405 - var16 = var3.readInt(); // L: 5406 - if (var16 != field758) { // L: 5407 - field758 = var16; // L: 5408 - ItemContainer.method1225(); // L: 5409 - } - - var1.serverPacket = null; // L: 5411 - return true; // L: 5412 - } - - String var42; - boolean var48; - if (ServerPacket.field2222 == var1.serverPacket) { // L: 5414 - var16 = var3.readUShortSmart(); // L: 5415 - var48 = var3.readUnsignedByte() == 1; // L: 5416 - var42 = ""; // L: 5417 - boolean var47 = false; // L: 5418 - if (var48) { // L: 5419 - var42 = var3.readStringCp1252NullTerminated(); // L: 5420 - if (class60.friendSystem.isIgnored(new Username(var42, WorldMapAreaData.loginType))) { // L: 5421 - var47 = true; + for (int var13 = 0; var13 < 100; ++var13) { // L: 5933 + if (var10 == field900[var13]) { // L: 5934 + var12 = true; // L: 5935 + break; // L: 5936 } } - String var44 = var3.readStringCp1252NullTerminated(); // L: 5423 - if (!var47) { // L: 5424 - WorldMapRectangle.addGameMessage(var16, var42, var44); + if (WorldMapLabelSize.friendSystem.isIgnored(new Username(var38, UserComparator4.loginType))) { // L: 5939 + var12 = true; } - var1.serverPacket = null; // L: 5425 - return true; // L: 5426 - } + if (!var12 && field795 == 0) { // L: 5940 + field900[field901] = var10; // L: 5941 + field901 = (field901 + 1) % 100; // L: 5942 + String var22 = AbstractFont.escapeBrackets(WorldMapSection0.method328(Tile.method3004(var3))); // L: 5943 + byte var44; + if (var9.isPrivileged) { // L: 5945 + var44 = 7; + } else { + var44 = 3; // L: 5946 + } - if (ServerPacket.field2234 == var1.serverPacket) { // L: 5428 - if (rootInterface != -1) { // L: 5429 - ClientPacket.runIntfCloseListeners(rootInterface, 0); + if (var9.modIcon != -1) { // L: 5947 + DevicePcmPlayerProvider.addGameMessage(var44, PrivateChatMode.method6034(var9.modIcon) + var38, var22); + } else { + DevicePcmPlayerProvider.addGameMessage(var44, var38, var22); // L: 5948 + } } - var1.serverPacket = null; // L: 5430 - return true; // L: 5431 + var1.serverPacket = null; // L: 5950 + return true; // L: 5951 } - int var7; - long var9; - int var19; - if (ServerPacket.field2223 == var1.serverPacket) { // L: 5433 - var16 = var3.method5667(); // L: 5434 - var5 = var3.method5656(); // L: 5435 - if (var5 == 65535) { // L: 5436 + int var8; + int var24; + int var25; + int var52; + if (ServerPacket.field2165 == var1.serverPacket) { // L: 5953 + isCameraLocked = true; // L: 5954 + MilliClock.field2048 = var3.readUnsignedByte(); // L: 5955 + PcmPlayer.field1449 = var3.readUnsignedByte(); // L: 5956 + AbstractRasterProvider.field3890 = var3.readUnsignedShort(); // L: 5957 + WorldMapCacheName.field326 = var3.readUnsignedByte(); // L: 5958 + class60.field452 = var3.readUnsignedByte(); // L: 5959 + if (class60.field452 >= 100) { // L: 5960 + var16 = MilliClock.field2048 * 128 + 64; // L: 5961 + var5 = PcmPlayer.field1449 * 128 + 64; // L: 5962 + var6 = GrandExchangeOfferWorldComparator.getTileHeight(var16, var5, GrandExchangeOfferUnitPriceComparator.Client_plane) - AbstractRasterProvider.field3890; // L: 5963 + var52 = var16 - ItemContainer.cameraX; // L: 5964 + var8 = var6 - ChatChannel.cameraY; // L: 5965 + var24 = var5 - WorldMapManager.cameraZ; // L: 5966 + var25 = (int)Math.sqrt((double)(var52 * var52 + var24 * var24)); // L: 5967 + World.cameraPitch = (int)(Math.atan2((double)var8, (double)var25) * 325.949D) & 2047; // L: 5968 + ViewportMouse.cameraYaw = (int)(Math.atan2((double)var52, (double)var24) * -325.949D) & 2047; // L: 5969 + if (World.cameraPitch < 128) { // L: 5970 + World.cameraPitch = 128; + } + + if (World.cameraPitch > 383) { // L: 5971 + World.cameraPitch = 383; + } + } + + var1.serverPacket = null; // L: 5973 + return true; // L: 5974 + } + + if (ServerPacket.field2194 == var1.serverPacket) { // L: 5976 + publicChatMode = var3.method5619(); // L: 5977 + tradeChatMode = var3.readUnsignedByte(); // L: 5978 + var1.serverPacket = null; // L: 5979 + return true; // L: 5980 + } + + if (ServerPacket.field2153 == var1.serverPacket) { // L: 5982 + WorldMapAreaData.method790(var3.readStringCp1252NullTerminated()); // L: 5983 + var1.serverPacket = null; // L: 5984 + return true; // L: 5985 + } + + if (ServerPacket.field2145 == var1.serverPacket) { // L: 5987 + class39.privateChatMode = MouseRecorder.method1287(var3.readUnsignedByte()); // L: 5988 + var1.serverPacket = null; // L: 5989 + return true; // L: 5990 + } + + if (ServerPacket.field2220 == var1.serverPacket) { // L: 5992 + var16 = var3.readInt(); // L: 5993 + InterfaceParent var50 = (InterfaceParent)interfaceParents.get((long)var16); // L: 5994 + if (var50 != null) { // L: 5995 + Player.closeInterface(var50, true); + } + + if (meslayerContinueWidget != null) { // L: 5996 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(meslayerContinueWidget); // L: 5997 + meslayerContinueWidget = null; // L: 5998 + } + + var1.serverPacket = null; // L: 6000 + return true; // L: 6001 + } + + Widget var47; + if (ServerPacket.field2172 == var1.serverPacket) { // L: 6003 + var16 = var3.method5686(); // L: 6004 + var47 = UserComparator4.getWidget(var16); // L: 6005 + + for (var6 = 0; var6 < var47.itemIds.length; ++var6) { // L: 6006 + var47.itemIds[var6] = -1; // L: 6007 + var47.itemIds[var6] = 0; // L: 6008 + } + + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var47); // L: 6010 + var1.serverPacket = null; // L: 6011 + return true; // L: 6012 + } + + Widget var7; + if (ServerPacket.field2188 == var1.serverPacket) { // L: 6014 + var16 = var3.method5797(); // L: 6015 + if (var16 == 65535) { // L: 6016 + var16 = -1; + } + + var5 = var3.method5685(); // L: 6017 + var6 = var3.readInt(); // L: 6018 + var7 = UserComparator4.getWidget(var6); // L: 6019 + ItemDefinition var54; + if (!var7.isIf3) { // L: 6020 + if (var16 == -1) { // L: 6021 + var7.modelType = 0; // L: 6022 + var1.serverPacket = null; // L: 6023 + return true; // L: 6024 + } + + var54 = AbstractWorldMapData.ItemDefinition_get(var16); // L: 6026 + var7.modelType = 4; // L: 6027 + var7.modelId = var16; // L: 6028 + var7.modelAngleX = var54.xan2d; // L: 6029 + var7.modelAngleY = var54.yan2d; // L: 6030 + var7.modelZoom = var54.zoom2d * 100 / var5; // L: 6031 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var7); // L: 6032 + } else { + var7.itemId = var16; // L: 6035 + var7.itemQuantity = var5; // L: 6036 + var54 = AbstractWorldMapData.ItemDefinition_get(var16); // L: 6037 + var7.modelAngleX = var54.xan2d; // L: 6038 + var7.modelAngleY = var54.yan2d; // L: 6039 + var7.modelAngleZ = var54.zan2d; // L: 6040 + var7.modelOffsetX = var54.offsetX2d; // L: 6041 + var7.modelOffsetY = var54.offsetY2d; // L: 6042 + var7.modelZoom = var54.zoom2d; // L: 6043 + if (var54.isStackable == 1) { // L: 6044 + var7.itemQuantityMode = 1; + } else { + var7.itemQuantityMode = 2; // L: 6045 + } + + if (var7.field2678 > 0) { // L: 6046 + var7.modelZoom = var7.modelZoom * 32 / var7.field2678; + } else if (var7.rawWidth > 0) { // L: 6047 + var7.modelZoom = var7.modelZoom * 32 / var7.rawWidth; + } + + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var7); // L: 6048 + } + + var1.serverPacket = null; // L: 6050 + return true; // L: 6051 + } + + if (ServerPacket.field2166 == var1.serverPacket) { // L: 6053 + if (rootInterface != -1) { // L: 6054 + WorldMapAreaData.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; // L: 6055 + return true; // L: 6056 + } + + if (ServerPacket.field2218 == var1.serverPacket) { // L: 6058 + var16 = var3.readUnsignedByte(); // L: 6059 + var5 = var3.readUnsignedByte(); // L: 6060 + var6 = var3.readUnsignedByte(); // L: 6061 + var52 = var3.readUnsignedByte(); // L: 6062 + field926[var16] = true; // L: 6063 + field927[var16] = var5; // L: 6064 + field928[var16] = var6; // L: 6065 + field898[var16] = var52; // L: 6066 + field918[var16] = 0; // L: 6067 + var1.serverPacket = null; // L: 6068 + return true; // L: 6069 + } + + if (ServerPacket.field2162 == var1.serverPacket) { // L: 6071 + var16 = var3.readInt(); // L: 6072 + var5 = var3.readInt(); // L: 6073 + var6 = class238.getGcDuration(); // L: 6074 + PacketBufferNode var43 = class4.getPacketBufferNode(ClientPacket.field2296, packetWriter.isaacCipher); // L: 6076 + var43.packetBuffer.writeByte(var6); // L: 6077 + var43.packetBuffer.method5665(GameShell.fps); // L: 6078 + var43.packetBuffer.method5684(var16); // L: 6079 + var43.packetBuffer.writeInt(var5); // L: 6080 + packetWriter.addNode(var43); // L: 6081 + var1.serverPacket = null; // L: 6082 + return true; // L: 6083 + } + + Widget var27; + if (ServerPacket.field2185 == var1.serverPacket) { // L: 6085 + var16 = var3.method5685(); // L: 6086 + var17 = var3.readStringCp1252NullTerminated(); // L: 6087 + var27 = UserComparator4.getWidget(var16); // L: 6088 + if (!var17.equals(var27.text)) { // L: 6089 + var27.text = var17; // L: 6090 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); // L: 6091 + } + + var1.serverPacket = null; // L: 6093 + return true; // L: 6094 + } + + if (ServerPacket.field2204 == var1.serverPacket) { // L: 6096 + WorldMapLabelSize.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6097 + class52.FriendSystem_invalidateIgnoreds(); // L: 6098 + field874 = cycleCntr; // L: 6099 + var1.serverPacket = null; // L: 6100 + return true; // L: 6101 + } + + if (ServerPacket.field2184 == var1.serverPacket) { // L: 6103 + WorldMapEvent.method865(class194.field2351); // L: 6104 + var1.serverPacket = null; // L: 6105 + return true; // L: 6106 + } + + if (ServerPacket.field2216 == var1.serverPacket) { // L: 6108 + minimapState = var3.readUnsignedByte(); // L: 6109 + var1.serverPacket = null; // L: 6110 + return true; // L: 6111 + } + + long var29; + if (ServerPacket.field2195 == var1.serverPacket) { // L: 6113 + var16 = var3.offset + var1.serverPacketLength; // L: 6114 + var5 = var3.readUnsignedShort(); // L: 6115 + var6 = var3.readUnsignedShort(); // L: 6116 + if (var5 != rootInterface) { // L: 6117 + rootInterface = var5; // L: 6118 + this.resizeRoot(false); // L: 6119 + FontName.Widget_resetModelFrames(rootInterface); // L: 6120 + ScriptFrame.runWidgetOnLoadListener(rootInterface); // L: 6121 + + for (var52 = 0; var52 < 100; ++var52) { // L: 6122 + field834[var52] = true; + } + } + + InterfaceParent var57; + for (; var6-- > 0; var57.field596 = true) { // L: 6124 6134 + var52 = var3.readInt(); // L: 6125 + var8 = var3.readUnsignedShort(); // L: 6126 + var24 = var3.readUnsignedByte(); // L: 6127 + var57 = (InterfaceParent)interfaceParents.get((long)var52); // L: 6128 + if (var57 != null && var8 != var57.group) { // L: 6129 + Player.closeInterface(var57, true); // L: 6130 + var57 = null; // L: 6131 + } + + if (var57 == null) { // L: 6133 + var57 = ModelData0.method3381(var52, var8, var24); + } + } + + for (var41 = (InterfaceParent)interfaceParents.first(); var41 != null; var41 = (InterfaceParent)interfaceParents.next()) { // L: 6136 + if (var41.field596) { // L: 6137 + var41.field596 = false; + } else { + Player.closeInterface(var41, true); // L: 6139 + } + } + + widgetFlags = new NodeHashTable(512); // L: 6142 + + while (var3.offset < var16) { // L: 6143 + var52 = var3.readInt(); // L: 6144 + var8 = var3.readUnsignedShort(); // L: 6145 + var24 = var3.readUnsignedShort(); // L: 6146 + var25 = var3.readInt(); // L: 6147 + + for (int var11 = var8; var11 <= var24; ++var11) { // L: 6148 + var29 = (long)var11 + ((long)var52 << 32); // L: 6149 + widgetFlags.put(new IntegerNode(var25), var29); // L: 6150 + } + } + + var1.serverPacket = null; // L: 6153 + return true; // L: 6154 + } + + if (ServerPacket.field2144 == var1.serverPacket) { // L: 6156 + var16 = var3.readUnsignedByte(); // L: 6157 + if (var3.readUnsignedByte() == 0) { // L: 6158 + grandExchangeOffers[var16] = new GrandExchangeOffer(); // L: 6159 + var3.offset += 18; // L: 6160 + } else { + --var3.offset; // L: 6163 + grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); // L: 6164 + } + + field885 = cycleCntr; // L: 6166 + var1.serverPacket = null; // L: 6167 + return true; // L: 6168 + } + + if (ServerPacket.field2221 == var1.serverPacket) { // L: 6170 + var16 = var3.readUnsignedShort(); // L: 6171 + byte var45 = var3.method5669(); // L: 6172 + Varps.Varps_temp[var16] = var45; // L: 6173 + if (Varps.Varps_main[var16] != var45) { // L: 6174 + Varps.Varps_main[var16] = var45; // L: 6175 + } + + class23.changeGameOptions(var16); // L: 6177 + field867[++field868 - 1 & 31] = var16; // L: 6178 + var1.serverPacket = null; // L: 6179 + return true; // L: 6180 + } + + if (ServerPacket.field2182 == var1.serverPacket) { // L: 6182 + class39.updatePlayers(var3, var1.serverPacketLength); // L: 6183 + class197.method3783(); // L: 6184 + var1.serverPacket = null; // L: 6185 + return true; // L: 6186 + } + + if (ServerPacket.field2179 == var1.serverPacket) { // L: 6188 + ItemDefinition.method4874(); // L: 6189 + var16 = var3.readUnsignedByte(); // L: 6190 + var5 = var3.method5650(); // L: 6191 + var6 = var3.readInt(); // L: 6192 + experience[var5] = var6; // L: 6193 + currentLevels[var5] = var16; // L: 6194 + levels[var5] = 1; // L: 6195 + + for (var52 = 0; var52 < 98; ++var52) { // L: 6196 + if (var6 >= Skills.Skills_experienceTable[var52]) { + levels[var5] = var52 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6197 + var1.serverPacket = null; // L: 6198 + return true; // L: 6199 + } + + long var31; + if (ServerPacket.field2196 == var1.serverPacket) { // L: 6201 + var16 = var3.readInt(); // L: 6202 + var5 = var3.readUnsignedShort(); // L: 6203 + if (var5 == 65535) { // L: 6204 var5 = -1; } - var18 = var3.readInt(); // L: 5437 - var7 = var3.method5656(); // L: 5438 - if (var7 == 65535) { // L: 5439 - var7 = -1; + var6 = var3.method5675(); // L: 6205 + if (var6 == 65535) { // L: 6206 + var6 = -1; } - for (var19 = var5; var19 <= var7; ++var19) { // L: 5440 - var9 = ((long)var16 << 32) + (long)var19; // L: 5441 - Node var46 = widgetFlags.get(var9); // L: 5442 - if (var46 != null) { // L: 5443 - var46.remove(); + var52 = var3.readInt(); // L: 6207 + + for (var8 = var6; var8 <= var5; ++var8) { // L: 6208 + var31 = ((long)var52 << 32) + (long)var8; // L: 6209 + Node var60 = widgetFlags.get(var31); // L: 6210 + if (var60 != null) { // L: 6211 + var60.remove(); } - widgetFlags.put(new IntegerNode(var18), var9); // L: 5444 - } - - var1.serverPacket = null; // L: 5446 - return true; // L: 5447 - } - - long var12; - int var20; - int var22; - InterfaceParent var56; - if (ServerPacket.field2180 == var1.serverPacket) { // L: 5449 - var16 = var3.offset + var1.serverPacketLength; // L: 5450 - var5 = var3.readUnsignedShort(); // L: 5451 - var18 = var3.readUnsignedShort(); // L: 5452 - if (var5 != rootInterface) { // L: 5453 - rootInterface = var5; // L: 5454 - this.resizeRoot(false); // L: 5455 - PacketWriter.Widget_resetModelFrames(rootInterface); // L: 5456 - class235.runWidgetOnLoadListener(rootInterface); // L: 5457 - - for (var7 = 0; var7 < 100; ++var7) { // L: 5458 - field882[var7] = true; - } - } - - InterfaceParent var45; - for (; var18-- > 0; var45.field580 = true) { // L: 5460 5470 - var7 = var3.readInt(); // L: 5461 - var19 = var3.readUnsignedShort(); // L: 5462 - var20 = var3.readUnsignedByte(); // L: 5463 - var45 = (InterfaceParent)interfaceParents.get((long)var7); // L: 5464 - if (var45 != null && var19 != var45.group) { // L: 5465 - class58.closeInterface(var45, true); // L: 5466 - var45 = null; // L: 5467 - } - - if (var45 == null) { // L: 5469 - var45 = WorldMapSprite.method494(var7, var19, var20); - } - } - - for (var56 = (InterfaceParent)interfaceParents.first(); var56 != null; var56 = (InterfaceParent)interfaceParents.next()) { // L: 5472 - if (var56.field580) { // L: 5473 - var56.field580 = false; - } else { - class58.closeInterface(var56, true); // L: 5475 - } - } - - widgetFlags = new NodeHashTable(512); // L: 5478 - - while (var3.offset < var16) { // L: 5479 - var7 = var3.readInt(); // L: 5480 - var19 = var3.readUnsignedShort(); // L: 5481 - var20 = var3.readUnsignedShort(); // L: 5482 - var22 = var3.readInt(); // L: 5483 - - for (int var23 = var19; var23 <= var20; ++var23) { // L: 5484 - var12 = ((long)var7 << 32) + (long)var23; // L: 5485 - widgetFlags.put(new IntegerNode(var22), var12); // L: 5486 - } - } - - var1.serverPacket = null; // L: 5489 - return true; // L: 5490 - } - - if (ServerPacket.field2179 == var1.serverPacket) { // L: 5492 - class60.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 5493 - KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 5494 - field870 = cycleCntr; // L: 5495 - var1.serverPacket = null; // L: 5496 - return true; // L: 5497 - } - - if (ServerPacket.field2172 == var1.serverPacket) { // L: 5499 - WorldMapID.loadRegions(true, var1.packetBuffer); // L: 5500 - var1.serverPacket = null; // L: 5501 - return true; // L: 5502 - } - - if (ServerPacket.field2206 == var1.serverPacket) { // L: 5504 - MouseHandler.method1134(class194.field2367); // L: 5505 - var1.serverPacket = null; // L: 5506 - return true; // L: 5507 - } - - if (ServerPacket.field2221 == var1.serverPacket) { // L: 5509 - var16 = var3.readUnsignedByte(); // L: 5510 - Frames.method3393(var16); // L: 5511 - var1.serverPacket = null; // L: 5512 - return true; // L: 5513 - } - - if (ServerPacket.field2184 == var1.serverPacket) { // L: 5515 - WorldMapLabelSize.readReflectionCheck(var3, var1.serverPacketLength); // L: 5516 - var1.serverPacket = null; // L: 5517 - return true; // L: 5518 - } - - if (ServerPacket.field2174 == var1.serverPacket) { // L: 5520 - isCameraLocked = true; // L: 5521 - SoundCache.field1472 = var3.readUnsignedByte(); // L: 5522 - TextureProvider.field1561 = var3.readUnsignedByte(); // L: 5523 - IgnoreList.field3620 = var3.readUnsignedShort(); // L: 5524 - UserComparator9.field2013 = var3.readUnsignedByte(); // L: 5525 - class225.field2592 = var3.readUnsignedByte(); // L: 5526 - if (class225.field2592 >= 100) { // L: 5527 - var16 = SoundCache.field1472 * 128 + 64; // L: 5528 - var5 = TextureProvider.field1561 * 128 + 64; // L: 5529 - var18 = ArchiveLoader.getTileHeight(var16, var5, Huffman.Client_plane) - IgnoreList.field3620; // L: 5530 - var7 = var16 - VertexNormal.cameraX; // L: 5531 - var19 = var18 - FaceNormal.cameraY; // L: 5532 - var20 = var5 - AbstractWorldMapData.cameraZ; // L: 5533 - var22 = (int)Math.sqrt((double)(var7 * var7 + var20 * var20)); // L: 5534 - PacketBuffer.cameraPitch = (int)(Math.atan2((double)var19, (double)var22) * 325.949D) & 2047; // L: 5535 - ServerPacket.cameraYaw = (int)(Math.atan2((double)var7, (double)var20) * -325.949D) & 2047; // L: 5536 - if (PacketBuffer.cameraPitch < 128) { // L: 5537 - PacketBuffer.cameraPitch = 128; - } - - if (PacketBuffer.cameraPitch > 383) { // L: 5538 - PacketBuffer.cameraPitch = 383; - } - } - - var1.serverPacket = null; // L: 5540 - return true; // L: 5541 - } - - if (ServerPacket.field2195 == var1.serverPacket) { // L: 5543 - isCameraLocked = false; // L: 5544 - - for (var16 = 0; var16 < 5; ++var16) { // L: 5545 - field922[var16] = false; - } - - var1.serverPacket = null; // L: 5546 - return true; // L: 5547 - } - - if (ServerPacket.field2164 == var1.serverPacket) { // L: 5549 - var16 = var3.readInt(); // L: 5550 - InterfaceParent var54 = (InterfaceParent)interfaceParents.get((long)var16); // L: 5551 - if (var54 != null) { // L: 5552 - class58.closeInterface(var54, true); - } - - if (meslayerContinueWidget != null) { // L: 5553 - class52.invalidateWidget(meslayerContinueWidget); // L: 5554 - meslayerContinueWidget = null; // L: 5555 - } - - var1.serverPacket = null; // L: 5557 - return true; // L: 5558 - } - - if (ServerPacket.field2191 == var1.serverPacket) { // L: 5560 - byte[] var38 = new byte[var1.serverPacketLength]; // L: 5561 - var3.method5566(var38, 0, var38.length); // L: 5562 - Buffer var53 = new Buffer(var38); // L: 5563 - var42 = var53.readStringCp1252NullTerminated(); // L: 5564 - class280.openURL(var42, true, false); // L: 5565 - var1.serverPacket = null; // L: 5566 - return true; // L: 5567 - } - - if (ServerPacket.field2205 == var1.serverPacket) { // L: 5569 - var16 = var3.method5655(); // L: 5570 - rootInterface = var16; // L: 5571 - this.resizeRoot(false); // L: 5572 - PacketWriter.Widget_resetModelFrames(var16); // L: 5573 - class235.runWidgetOnLoadListener(rootInterface); // L: 5574 - - for (var5 = 0; var5 < 100; ++var5) { // L: 5575 - field882[var5] = true; - } - - var1.serverPacket = null; // L: 5576 - return true; // L: 5577 - } - - if (ServerPacket.field2244 == var1.serverPacket) { // L: 5579 - isCameraLocked = true; // L: 5580 - HealthBarUpdate.field1038 = var3.readUnsignedByte(); // L: 5581 - class8.field43 = var3.readUnsignedByte(); // L: 5582 - FileSystem.field2099 = var3.readUnsignedShort(); // L: 5583 - MouseRecorder.field609 = var3.readUnsignedByte(); // L: 5584 - FloorDecoration.field1640 = var3.readUnsignedByte(); // L: 5585 - if (FloorDecoration.field1640 >= 100) { // L: 5586 - VertexNormal.cameraX = HealthBarUpdate.field1038 * 128 + 64; // L: 5587 - AbstractWorldMapData.cameraZ = class8.field43 * 128 + 64; // L: 5588 - FaceNormal.cameraY = ArchiveLoader.getTileHeight(VertexNormal.cameraX, AbstractWorldMapData.cameraZ, Huffman.Client_plane) - FileSystem.field2099; // L: 5589 - } - - var1.serverPacket = null; // L: 5591 - return true; // L: 5592 - } - - if (ServerPacket.field2239 == var1.serverPacket) { // L: 5594 - FloorOverlayDefinition.updateNpcs(true, var3); // L: 5595 - var1.serverPacket = null; // L: 5596 - return true; // L: 5597 - } - - if (ServerPacket.field2211 == var1.serverPacket) { // L: 5599 - var16 = var3.readInt(); // L: 5600 - var5 = var3.method5657(); // L: 5601 - Varps.Varps_temp[var5] = var16; // L: 5602 - if (Varps.Varps_main[var5] != var16) { // L: 5603 - Varps.Varps_main[var5] = var16; // L: 5604 - } - - Clock.changeGameOptions(var5); // L: 5606 - field863[++field864 - 1 & 31] = var5; // L: 5607 - var1.serverPacket = null; // L: 5608 - return true; // L: 5609 - } - - Widget var6; - if (ServerPacket.field2189 == var1.serverPacket) { // L: 5611 - var16 = var3.method5655(); // L: 5612 - var5 = var3.method5667(); // L: 5613 - var6 = TileItem.getWidget(var5); // L: 5614 - if (var6.modelType != 1 || var16 != var6.modelId) { // L: 5615 - var6.modelType = 1; // L: 5616 - var6.modelId = var16; // L: 5617 - class52.invalidateWidget(var6); // L: 5618 - } - - var1.serverPacket = null; // L: 5620 - return true; // L: 5621 - } - - if (ServerPacket.field2242 == var1.serverPacket) { // L: 5623 - destinationX = var3.readUnsignedByte(); // L: 5624 - if (destinationX == 255) { // L: 5625 - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); // L: 5626 - if (destinationY == 255) { // L: 5627 - destinationY = 0; - } - - var1.serverPacket = null; // L: 5628 - return true; // L: 5629 - } - - if (ServerPacket.field2220 == var1.serverPacket) { // L: 5631 - Player.privateChatMode = TileItem.method2202(var3.readUnsignedByte()); // L: 5632 - var1.serverPacket = null; // L: 5633 - return true; // L: 5634 - } - - if (ServerPacket.field2227 == var1.serverPacket) { // L: 5636 - var16 = var3.method5708(); // L: 5637 - var48 = var3.method5612() == 1; // L: 5638 - var6 = TileItem.getWidget(var16); // L: 5639 - if (var48 != var6.isHidden) { // L: 5640 - var6.isHidden = var48; // L: 5641 - class52.invalidateWidget(var6); // L: 5642 - } - - var1.serverPacket = null; // L: 5644 - return true; // L: 5645 - } - - if (ServerPacket.field2202 == var1.serverPacket) { // L: 5647 - MouseHandler.method1134(class194.field2371); // L: 5648 - var1.serverPacket = null; // L: 5649 - return true; // L: 5650 - } - - if (ServerPacket.field2238 == var1.serverPacket) { // L: 5652 - var16 = var3.readUnsignedShort(); // L: 5653 - var5 = var3.readUnsignedByte(); // L: 5654 - var18 = var3.readUnsignedShort(); // L: 5655 - class7.queueSoundEffect(var16, var5, var18); // L: 5656 - var1.serverPacket = null; // L: 5657 - return true; // L: 5658 - } - - if (ServerPacket.field2171 == var1.serverPacket) { // L: 5660 - ViewportMouse.method3098(var3.readStringCp1252NullTerminated()); // L: 5661 - var1.serverPacket = null; // L: 5662 - return true; // L: 5663 - } - - Widget var51; - if (ServerPacket.field2182 == var1.serverPacket) { // L: 5665 - var16 = var3.method5708(); // L: 5666 - var51 = TileItem.getWidget(var16); // L: 5667 - - for (var18 = 0; var18 < var51.itemIds.length; ++var18) { // L: 5668 - var51.itemIds[var18] = -1; // L: 5669 - var51.itemIds[var18] = 0; // L: 5670 - } - - class52.invalidateWidget(var51); // L: 5672 - var1.serverPacket = null; // L: 5673 - return true; // L: 5674 - } - - if (ServerPacket.field2214 == var1.serverPacket) { // L: 5676 - class60.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5677 - field870 = cycleCntr; // L: 5678 - var1.serverPacket = null; // L: 5679 - return true; // L: 5680 - } - - if (ServerPacket.field2165 == var1.serverPacket) { // L: 5682 - var16 = var3.readInt(); // L: 5683 - var5 = var3.readUnsignedShort(); // L: 5684 - if (var16 < -70000) { // L: 5685 - var5 += 32768; - } - - if (var16 >= 0) { // L: 5687 - var6 = TileItem.getWidget(var16); - } else { - var6 = null; // L: 5688 - } - - if (var6 != null) { // L: 5689 - for (var7 = 0; var7 < var6.itemIds.length; ++var7) { // L: 5690 - var6.itemIds[var7] = 0; // L: 5691 - var6.itemQuantities[var7] = 0; // L: 5692 - } - } - - SequenceDefinition.clearItemContainer(var5); // L: 5695 - var7 = var3.readUnsignedShort(); // L: 5696 - - for (var19 = 0; var19 < var7; ++var19) { // L: 5697 - var20 = var3.method5655(); // L: 5698 - var22 = var3.method5612(); // L: 5699 - if (var22 == 255) { // L: 5700 - var22 = var3.method5708(); - } - - if (var6 != null && var19 < var6.itemIds.length) { // L: 5701 5702 - var6.itemIds[var19] = var20; // L: 5703 - var6.itemQuantities[var19] = var22; // L: 5704 - } - - MidiPcmStream.itemContainerSetItem(var5, var19, var20 - 1, var22); // L: 5707 - } - - if (var6 != null) { // L: 5709 - class52.invalidateWidget(var6); - } - - DevicePcmPlayerProvider.method897(); // L: 5710 - changedItemContainers[++field903 - 1 & 31] = var5 & 32767; // L: 5711 - var1.serverPacket = null; // L: 5712 - return true; // L: 5713 - } - - if (ServerPacket.field2209 == var1.serverPacket) { // L: 5715 - var16 = var3.readInt(); // L: 5716 - var5 = var3.readInt(); // L: 5717 - var18 = WorldMapData_1.getGcDuration(); // L: 5718 - PacketBufferNode var57 = getPacketBufferNode(ClientPacket.field2262, packetWriter.isaacCipher); // L: 5720 - var57.packetBuffer.writeIntME(var18); // L: 5721 - var57.packetBuffer.method5645(GameShell.fps); // L: 5722 - var57.packetBuffer.method5662(var16); // L: 5723 - var57.packetBuffer.writeShortLE(var5); // L: 5724 - packetWriter.addNode(var57); // L: 5725 - var1.serverPacket = null; // L: 5726 - return true; // L: 5727 - } - - if (ServerPacket.field2163 == var1.serverPacket) { // L: 5729 - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { // L: 5730 - if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { // L: 5731 - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; // L: 5732 - Clock.changeGameOptions(var16); // L: 5733 - field863[++field864 - 1 & 31] = var16; // L: 5734 - } - } - - var1.serverPacket = null; // L: 5737 - return true; // L: 5738 - } - - if (ServerPacket.field2216 == var1.serverPacket) { // L: 5740 - DevicePcmPlayerProvider.method897(); // L: 5741 - weight = var3.readShort(); // L: 5742 - field775 = cycleCntr; // L: 5743 - var1.serverPacket = null; // L: 5744 - return true; // L: 5745 - } - - if (ServerPacket.field2240 == var1.serverPacket) { // L: 5747 - MouseHandler.method1134(class194.field2362); // L: 5748 - var1.serverPacket = null; // L: 5749 - return true; // L: 5750 - } - - if (ServerPacket.field2203 == var1.serverPacket) { // L: 5752 - var16 = var3.readUnsignedShort(); // L: 5753 - if (var16 == 65535) { // L: 5754 - var16 = -1; - } - - WorldMapCacheName.playSong(var16); // L: 5755 - var1.serverPacket = null; // L: 5756 - return true; // L: 5757 - } - - if (ServerPacket.field2215 == var1.serverPacket) { // L: 5759 - var16 = var3.method5657(); // L: 5760 - if (var16 == 65535) { // L: 5761 - var16 = -1; - } - - var5 = var3.method5740(); // L: 5762 - class298.playSoundJingle(var16, var5); // L: 5763 - var1.serverPacket = null; // L: 5764 - return true; // L: 5765 - } - - if (ServerPacket.field2241 == var1.serverPacket) { // L: 5767 - var16 = var3.readUnsignedShort(); // L: 5768 - var5 = var3.method5667(); // L: 5769 - var6 = TileItem.getWidget(var5); // L: 5770 - if (var6 != null && var6.type == 0) { // L: 5771 - if (var16 > var6.scrollHeight - var6.height) { // L: 5772 - var16 = var6.scrollHeight - var6.height; - } - - if (var16 < 0) { // L: 5773 - var16 = 0; - } - - if (var16 != var6.scrollY) { // L: 5774 - var6.scrollY = var16; // L: 5775 - class52.invalidateWidget(var6); // L: 5776 - } - } - - var1.serverPacket = null; // L: 5779 - return true; // L: 5780 - } - - if (ServerPacket.field2197 == var1.serverPacket) { // L: 5782 - if (var1.serverPacketLength == 0) { // L: 5783 - Entity.clanChat = null; // L: 5784 - } else { - if (Entity.clanChat == null) { // L: 5787 - Entity.clanChat = new ClanChat(WorldMapAreaData.loginType, class2.client); // L: 5788 - } - - Entity.clanChat.readUpdate(var3); // L: 5790 - } - - ReflectionCheck.method2380(); // L: 5792 - var1.serverPacket = null; // L: 5793 - return true; // L: 5794 - } - - if (ServerPacket.field2168 == var1.serverPacket) { // L: 5796 - FloorOverlayDefinition.updateNpcs(false, var3); // L: 5797 - var1.serverPacket = null; // L: 5798 - return true; // L: 5799 - } - - if (ServerPacket.field2162 == var1.serverPacket) { // L: 5801 - var16 = var3.readUnsignedByte(); // L: 5802 - class89.forceDisconnect(var16); // L: 5803 - var1.serverPacket = null; // L: 5804 - return false; // L: 5805 - } - - if (ServerPacket.field2226 == var1.serverPacket) { // L: 5807 - if (Entity.clanChat != null) { // L: 5808 - Entity.clanChat.method5350(var3); // L: 5809 - } - - ReflectionCheck.method2380(); // L: 5811 - var1.serverPacket = null; // L: 5812 - return true; // L: 5813 - } - - if (ServerPacket.field2228 == var1.serverPacket) { // L: 5815 - MouseHandler.method1134(class194.field2364); // L: 5816 - var1.serverPacket = null; // L: 5817 - return true; // L: 5818 - } - - if (ServerPacket.field2178 == var1.serverPacket) { // L: 5820 - var16 = var3.method5639(); // L: 5821 - var5 = var3.method5639(); // L: 5822 - var42 = var3.readStringCp1252NullTerminated(); // L: 5823 - if (var16 >= 1 && var16 <= 8) { // L: 5824 - if (var42.equalsIgnoreCase("null")) { // L: 5825 - var42 = null; - } - - playerMenuActions[var16 - 1] = var42; // L: 5826 - playerOptionsPriorities[var16 - 1] = var5 == 0; // L: 5827 - } - - var1.serverPacket = null; // L: 5829 - return true; // L: 5830 - } - - boolean var58; - if (ServerPacket.field2200 == var1.serverPacket) { // L: 5832 - var58 = var3.readUnsignedByte() == 1; // L: 5833 - if (var58) { // L: 5834 - ItemContainer.field553 = PacketWriter.currentTimeMillis() - var3.readLong(); // L: 5835 - WorldMapSection1.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 5836 - } else { - WorldMapSection1.grandExchangeEvents = null; // L: 5838 - } - - field873 = cycleCntr; // L: 5839 - var1.serverPacket = null; // L: 5840 - return true; // L: 5841 - } - - if (ServerPacket.field2173 == var1.serverPacket) { // L: 5843 - var16 = var3.method5639(); // L: 5844 - var5 = var3.method5708(); // L: 5845 - var18 = var3.method5655(); // L: 5846 - var56 = (InterfaceParent)interfaceParents.get((long)var5); // L: 5847 - if (var56 != null) { // L: 5848 - class58.closeInterface(var56, var18 != var56.group); - } - - WorldMapSprite.method494(var5, var18, var16); // L: 5849 - var1.serverPacket = null; // L: 5850 - return true; // L: 5851 - } - - if (ServerPacket.field2183 == var1.serverPacket) { // L: 5853 - tradeChatMode = var3.method5612(); // L: 5854 - publicChatMode = var3.method5612(); // L: 5855 - var1.serverPacket = null; // L: 5856 - return true; // L: 5857 - } - - if (ServerPacket.field2169 == var1.serverPacket) { // L: 5859 - WorldMapIcon_0.field154 = var3.method5646(); // L: 5860 - ScriptEvent.field597 = var3.method5612(); // L: 5861 - - while (var3.offset < var1.serverPacketLength) { // L: 5862 - var16 = var3.readUnsignedByte(); // L: 5863 - class194 var52 = UserComparator5.method3518()[var16]; // L: 5864 - MouseHandler.method1134(var52); // L: 5865 - } - - var1.serverPacket = null; // L: 5867 - return true; // L: 5868 - } - - if (ServerPacket.field2188 == var1.serverPacket) { // L: 5870 - class2.updatePlayers(var3, var1.serverPacketLength); // L: 5871 - GameShell.method1109(); // L: 5872 - var1.serverPacket = null; // L: 5873 - return true; // L: 5874 - } - - if (ServerPacket.field2187 == var1.serverPacket) { // L: 5876 - var58 = var3.readBoolean(); // L: 5877 - if (var58) { // L: 5878 - if (ModelData0.field1901 == null) { // L: 5879 - ModelData0.field1901 = new class247(); - } - } else { - ModelData0.field1901 = null; // L: 5881 - } - - var1.serverPacket = null; // L: 5882 - return true; // L: 5883 - } - - if (ServerPacket.field2204 == var1.serverPacket) { // L: 5885 - MouseHandler.method1134(class194.field2368); // L: 5886 - var1.serverPacket = null; // L: 5887 - return true; // L: 5888 - } - - if (ServerPacket.field2231 == var1.serverPacket) { // L: 5890 - var16 = var3.readInt(); // L: 5891 - var5 = var3.method5657(); // L: 5892 - var6 = TileItem.getWidget(var16); // L: 5893 - if (var6.modelType != 2 || var5 != var6.modelId) { // L: 5894 - var6.modelType = 2; // L: 5895 - var6.modelId = var5; // L: 5896 - class52.invalidateWidget(var6); // L: 5897 - } - - var1.serverPacket = null; // L: 5899 - return true; // L: 5900 - } - - if (ServerPacket.field2225 == var1.serverPacket) { // L: 5902 - WorldMapIcon_0.field154 = var3.readUnsignedByte(); // L: 5903 - ScriptEvent.field597 = var3.method5646(); // L: 5904 - var1.serverPacket = null; // L: 5905 - return true; // L: 5906 - } - - if (ServerPacket.field2159 == var1.serverPacket) { // L: 5908 - MouseHandler.method1134(class194.field2366); // L: 5909 - var1.serverPacket = null; // L: 5910 - return true; // L: 5911 - } - - if (ServerPacket.field2217 == var1.serverPacket) { // L: 5913 - var16 = var3.readUnsignedByte(); // L: 5914 - if (var3.readUnsignedByte() == 0) { // L: 5915 - grandExchangeOffers[var16] = new GrandExchangeOffer(); // L: 5916 - var3.offset += 18; // L: 5917 - } else { - --var3.offset; // L: 5920 - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); // L: 5921 - } - - field872 = cycleCntr; // L: 5923 - var1.serverPacket = null; // L: 5924 - return true; // L: 5925 - } - - Widget var21; - if (ServerPacket.field2207 == var1.serverPacket) { // L: 5927 - var16 = var3.method5656(); // L: 5928 - var5 = var3.method5667(); // L: 5929 - var18 = var3.method5657(); // L: 5930 - var21 = TileItem.getWidget(var5); // L: 5931 - var21.field2633 = var16 + (var18 << 16); // L: 5932 - var1.serverPacket = null; // L: 5933 - return true; // L: 5934 - } - - if (ServerPacket.field2158 == var1.serverPacket) { // L: 5936 - var16 = var3.method5708(); // L: 5937 - var5 = var3.method5656(); // L: 5938 - var18 = var5 >> 10 & 31; // L: 5939 - var7 = var5 >> 5 & 31; // L: 5940 - var19 = var5 & 31; // L: 5941 - var20 = (var7 << 11) + (var18 << 19) + (var19 << 3); // L: 5942 - Widget var10 = TileItem.getWidget(var16); // L: 5943 - if (var20 != var10.color) { // L: 5944 - var10.color = var20; // L: 5945 - class52.invalidateWidget(var10); // L: 5946 - } - - var1.serverPacket = null; // L: 5948 - return true; // L: 5949 - } - - if (ServerPacket.field2167 == var1.serverPacket) { // L: 5951 - for (var16 = 0; var16 < players.length; ++var16) { // L: 5952 - if (players[var16] != null) { // L: 5953 - players[var16].sequence = -1; - } - } - - for (var16 = 0; var16 < npcs.length; ++var16) { // L: 5955 - if (npcs[var16] != null) { // L: 5956 - npcs[var16].sequence = -1; - } - } - - var1.serverPacket = null; // L: 5958 - return true; // L: 5959 - } - - if (ServerPacket.field2194 == var1.serverPacket) { // L: 5961 - var16 = var3.readUnsignedShort(); // L: 5962 - if (var16 == 65535) { // L: 5963 - var16 = -1; - } - - var5 = var3.method5678(); // L: 5964 - var18 = var3.method5678(); // L: 5965 - var21 = TileItem.getWidget(var18); // L: 5966 - ItemDefinition var43; - if (!var21.isIf3) { // L: 5967 - if (var16 == -1) { // L: 5968 - var21.modelType = 0; // L: 5969 - var1.serverPacket = null; // L: 5970 - return true; // L: 5971 - } - - var43 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var16); // L: 5973 - var21.modelType = 4; // L: 5974 - var21.modelId = var16; // L: 5975 - var21.modelAngleX = var43.xan2d; // L: 5976 - var21.modelAngleY = var43.yan2d; // L: 5977 - var21.modelZoom = var43.zoom2d * 100 / var5; // L: 5978 - class52.invalidateWidget(var21); // L: 5979 - } else { - var21.itemId = var16; // L: 5982 - var21.itemQuantity = var5; // L: 5983 - var43 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var16); // L: 5984 - var21.modelAngleX = var43.xan2d; // L: 5985 - var21.modelAngleY = var43.yan2d; // L: 5986 - var21.modelAngleZ = var43.zan2d; // L: 5987 - var21.modelOffsetX = var43.offsetX2d; // L: 5988 - var21.modelOffsetY = var43.offsetY2d; // L: 5989 - var21.modelZoom = var43.zoom2d; // L: 5990 - if (var43.isStackable == 1) { // L: 5991 - var21.itemQuantityMode = 1; - } else { - var21.itemQuantityMode = 2; // L: 5992 - } - - if (var21.field2728 > 0) { // L: 5993 - var21.modelZoom = var21.modelZoom * 32 / var21.field2728; - } else if (var21.rawWidth > 0) { // L: 5994 - var21.modelZoom = var21.modelZoom * 32 / var21.rawWidth; - } - - class52.invalidateWidget(var21); // L: 5995 - } - - var1.serverPacket = null; // L: 5997 - return true; // L: 5998 - } - - Widget var8; - if (ServerPacket.field2212 == var1.serverPacket) { // L: 6000 - var16 = var3.readInt(); // L: 6001 - var5 = var3.readUnsignedShort(); // L: 6002 - var18 = var3.method5655(); // L: 6003 - var7 = var3.method5656(); // L: 6004 - var8 = TileItem.getWidget(var16); // L: 6005 - if (var18 != var8.modelAngleX || var5 != var8.modelAngleY || var7 != var8.modelZoom) { // L: 6006 - var8.modelAngleX = var18; // L: 6007 - var8.modelAngleY = var5; // L: 6008 - var8.modelZoom = var7; // L: 6009 - class52.invalidateWidget(var8); // L: 6010 - } - - var1.serverPacket = null; // L: 6012 - return true; // L: 6013 - } - - if (ServerPacket.field2181 == var1.serverPacket) { // L: 6015 - WorldMapIcon_0.field154 = var3.method5612(); // L: 6016 - ScriptEvent.field597 = var3.method5639(); // L: 6017 - - for (var16 = WorldMapIcon_0.field154; var16 < WorldMapIcon_0.field154 + 8; ++var16) { // L: 6018 - for (var5 = ScriptEvent.field597; var5 < ScriptEvent.field597 + 8; ++var5) { // L: 6019 - if (groundItems[Huffman.Client_plane][var16][var5] != null) { // L: 6020 - groundItems[Huffman.Client_plane][var16][var5] = null; // L: 6021 - class13.updateItemPile(var16, var5); // L: 6022 - } - } - } - - for (PendingSpawn var37 = (PendingSpawn)pendingSpawns.last(); var37 != null; var37 = (PendingSpawn)pendingSpawns.previous()) { // L: 6026 6027 6029 - if (var37.x >= WorldMapIcon_0.field154 && var37.x < WorldMapIcon_0.field154 + 8 && var37.y >= ScriptEvent.field597 && var37.y < ScriptEvent.field597 + 8 && var37.plane == Huffman.Client_plane) { // L: 6028 - var37.hitpoints = 0; - } - } - - var1.serverPacket = null; // L: 6031 - return true; // L: 6032 - } - - if (ServerPacket.field2170 == var1.serverPacket) { // L: 6034 - DevicePcmPlayerProvider.method897(); // L: 6035 - runEnergy = var3.readUnsignedByte(); // L: 6036 - field775 = cycleCntr; // L: 6037 - var1.serverPacket = null; // L: 6038 - return true; // L: 6039 - } - - long var24; - long var26; - String var36; - if (ServerPacket.field2218 == var1.serverPacket) { // L: 6041 - var36 = var3.readStringCp1252NullTerminated(); // L: 6042 - var24 = (long)var3.readUnsignedShort(); // L: 6043 - var26 = (long)var3.readMedium(); // L: 6044 - PlayerType var28 = (PlayerType)TextureProvider.findEnumerated(ApproximateRouteStrategy.PlayerType_values(), var3.readUnsignedByte()); // L: 6045 - long var29 = var26 + (var24 << 32); // L: 6046 - boolean var31 = false; // L: 6047 - - for (int var13 = 0; var13 < 100; ++var13) { // L: 6048 - if (var29 == field896[var13]) { // L: 6049 - var31 = true; // L: 6050 - break; // L: 6051 - } - } - - if (class60.friendSystem.isIgnored(new Username(var36, WorldMapAreaData.loginType))) { // L: 6054 - var31 = true; - } - - if (!var31 && field790 == 0) { // L: 6055 - field896[field794] = var29; // L: 6056 - field794 = (field794 + 1) % 100; // L: 6057 - String var32 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(var3))); // L: 6058 - byte var49; - if (var28.isPrivileged) { // L: 6060 - var49 = 7; - } else { - var49 = 3; // L: 6061 - } - - if (var28.modIcon != -1) { // L: 6062 - WorldMapRectangle.addGameMessage(var49, WorldMapScaleHandler.method824(var28.modIcon) + var36, var32); - } else { - WorldMapRectangle.addGameMessage(var49, var36, var32); // L: 6063 - } - } - - var1.serverPacket = null; // L: 6065 - return true; // L: 6066 - } - - if (ServerPacket.field2229 == var1.serverPacket) { // L: 6068 - class60.friendSystem.method1919(); // L: 6069 - field870 = cycleCntr; // L: 6070 - var1.serverPacket = null; // L: 6071 - return true; // L: 6072 - } - - if (ServerPacket.field2213 == var1.serverPacket) { // L: 6074 - var16 = var3.method5659(); // L: 6075 - var5 = var3.readInt(); // L: 6076 - var6 = TileItem.getWidget(var5); // L: 6077 - if (var16 != var6.sequenceId || var16 == -1) { // L: 6078 - var6.sequenceId = var16; // L: 6079 - var6.modelFrame = 0; // L: 6080 - var6.modelFrameCycle = 0; // L: 6081 - class52.invalidateWidget(var6); // L: 6082 - } - - var1.serverPacket = null; // L: 6084 - return true; // L: 6085 - } - - if (ServerPacket.field2199 == var1.serverPacket) { // L: 6087 - var3.offset += 28; // L: 6088 - if (var3.checkCrc()) { // L: 6089 - class60.method937(var3, var3.offset - 28); - } - - var1.serverPacket = null; // L: 6090 - return true; // L: 6091 - } - - if (ServerPacket.field2175 == var1.serverPacket) { // L: 6093 - var16 = var3.method5667(); // L: 6094 - var51 = TileItem.getWidget(var16); // L: 6095 - var51.modelType = 3; // L: 6096 - var51.modelId = WorldMapLabelSize.localPlayer.appearance.getChatHeadId(); // L: 6097 - class52.invalidateWidget(var51); // L: 6098 - var1.serverPacket = null; // L: 6099 - return true; // L: 6100 - } - - if (ServerPacket.field2192 == var1.serverPacket) { // L: 6102 - DevicePcmPlayerProvider.method897(); // L: 6103 - var16 = var3.readInt(); // L: 6104 - var5 = var3.method5612(); // L: 6105 - var18 = var3.readUnsignedByte(); // L: 6106 - experience[var5] = var16; // L: 6107 - currentLevels[var5] = var18; // L: 6108 - levels[var5] = 1; // L: 6109 - - for (var7 = 0; var7 < 98; ++var7) { // L: 6110 - if (var16 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6111 - var1.serverPacket = null; // L: 6112 - return true; // L: 6113 - } - - if (ServerPacket.field2235 == var1.serverPacket) { // L: 6115 - hintArrowType = var3.readUnsignedByte(); // L: 6116 - if (hintArrowType == 1) { // L: 6117 - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6118 - if (hintArrowType == 2) { // L: 6119 - hintArrowSubX = 64; // L: 6120 - hintArrowSubY = 64; // L: 6121 - } - - if (hintArrowType == 3) { // L: 6123 - hintArrowSubX = 0; // L: 6124 - hintArrowSubY = 64; // L: 6125 - } - - if (hintArrowType == 4) { // L: 6127 - hintArrowSubX = 128; // L: 6128 - hintArrowSubY = 64; // L: 6129 - } - - if (hintArrowType == 5) { // L: 6131 - hintArrowSubX = 64; // L: 6132 - hintArrowSubY = 0; // L: 6133 - } - - if (hintArrowType == 6) { // L: 6135 - hintArrowSubX = 64; // L: 6136 - hintArrowSubY = 128; // L: 6137 - } - - hintArrowType = 2; // L: 6139 - hintArrowX = var3.readUnsignedShort(); // L: 6140 - hintArrowY = var3.readUnsignedShort(); // L: 6141 - hintArrowHeight = var3.readUnsignedByte(); // L: 6142 - } - - if (hintArrowType == 10) { // L: 6144 - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; // L: 6145 - return true; // L: 6146 - } - - if (ServerPacket.field2176 == var1.serverPacket) { // L: 6148 - var16 = var3.method5667(); // L: 6149 - var17 = var3.readStringCp1252NullTerminated(); // L: 6150 - var6 = TileItem.getWidget(var16); // L: 6151 - if (!var17.equals(var6.text)) { // L: 6152 - var6.text = var17; // L: 6153 - class52.invalidateWidget(var6); // L: 6154 - } - - var1.serverPacket = null; // L: 6156 - return true; // L: 6157 - } - - if (ServerPacket.field2185 == var1.serverPacket) { // L: 6159 - var16 = var3.readUnsignedByte(); // L: 6160 - var5 = var3.readUnsignedByte(); // L: 6161 - var18 = var3.readUnsignedByte(); // L: 6162 - var7 = var3.readUnsignedByte(); // L: 6163 - field922[var16] = true; // L: 6164 - field678[var16] = var5; // L: 6165 - field740[var16] = var18; // L: 6166 - field925[var16] = var7; // L: 6167 - field926[var16] = 0; // L: 6168 - var1.serverPacket = null; // L: 6169 - return true; // L: 6170 - } - - if (ServerPacket.field2237 == var1.serverPacket) { // L: 6172 - MouseHandler.method1134(class194.field2370); // L: 6173 - var1.serverPacket = null; // L: 6174 - return true; // L: 6175 - } - - if (ServerPacket.field2224 == var1.serverPacket) { // L: 6177 - var36 = var3.readStringCp1252NullTerminated(); // L: 6178 - Object[] var50 = new Object[var36.length() + 1]; // L: 6179 - - for (var18 = var36.length() - 1; var18 >= 0; --var18) { // L: 6180 - if (var36.charAt(var18) == 's') { // L: 6181 - var50[var18 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var50[var18 + 1] = new Integer(var3.readInt()); // L: 6182 - } - } - - var50[0] = new Integer(var3.readInt()); // L: 6184 - ScriptEvent var41 = new ScriptEvent(); // L: 6185 - var41.args = var50; // L: 6186 - Script.runScriptEvent(var41); // L: 6187 - var1.serverPacket = null; // L: 6188 - return true; // L: 6189 - } - - if (ServerPacket.field2177 == var1.serverPacket) { // L: 6191 - WorldMapID.loadRegions(false, var1.packetBuffer); // L: 6192 - var1.serverPacket = null; // L: 6193 - return true; // L: 6194 - } - - if (ServerPacket.field2201 == var1.serverPacket) { // L: 6196 - var16 = var3.method5708(); // L: 6197 - var5 = var3.readInt(); // L: 6198 - InterfaceParent var40 = (InterfaceParent)interfaceParents.get((long)var16); // L: 6199 - var56 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6200 - if (var56 != null) { // L: 6201 - class58.closeInterface(var56, var40 == null || var56.group != var40.group); - } - - if (var40 != null) { // L: 6202 - var40.remove(); // L: 6203 - interfaceParents.put(var40, (long)var5); // L: 6204 - } - - var8 = TileItem.getWidget(var16); // L: 6206 - if (var8 != null) { // L: 6207 - class52.invalidateWidget(var8); - } - - var8 = TileItem.getWidget(var5); // L: 6208 - if (var8 != null) { // L: 6209 - class52.invalidateWidget(var8); // L: 6210 - class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); // L: 6211 - } - - if (rootInterface != -1) { // L: 6213 - ClientPacket.runIntfCloseListeners(rootInterface, 1); + widgetFlags.put(new IntegerNode(var16), var31); // L: 6212 } var1.serverPacket = null; // L: 6214 return true; // L: 6215 } - if (ServerPacket.field2166 == var1.serverPacket) { // L: 6217 - MouseHandler.method1134(class194.field2361); // L: 6218 - var1.serverPacket = null; // L: 6219 - return true; // L: 6220 + if (ServerPacket.field2167 == var1.serverPacket) { // L: 6217 + ItemDefinition.method4874(); // L: 6218 + runEnergy = var3.readUnsignedByte(); // L: 6219 + field878 = cycleCntr; // L: 6220 + var1.serverPacket = null; // L: 6221 + return true; // L: 6222 } - if (ServerPacket.field2193 == var1.serverPacket) { // L: 6222 - var16 = var3.method5657(); // L: 6223 - WorldMapData_0.method263(var16); // L: 6224 - changedItemContainers[++field903 - 1 & 31] = var16 & 32767; // L: 6225 - var1.serverPacket = null; // L: 6226 - return true; // L: 6227 - } + if (ServerPacket.field2150 == var1.serverPacket) { // L: 6224 + isCameraLocked = true; // L: 6225 + WorldMapSection2.field225 = var3.readUnsignedByte(); // L: 6226 + WorldMapLabelSize.field152 = var3.readUnsignedByte(); // L: 6227 + SpriteMask.field2542 = var3.readUnsignedShort(); // L: 6228 + Player.field674 = var3.readUnsignedByte(); // L: 6229 + ReflectionCheck.field1364 = var3.readUnsignedByte(); // L: 6230 + if (ReflectionCheck.field1364 >= 100) { // L: 6231 + ItemContainer.cameraX = WorldMapSection2.field225 * 128 + 64; // L: 6232 + WorldMapManager.cameraZ = WorldMapLabelSize.field152 * 128 + 64; // L: 6233 + ChatChannel.cameraY = GrandExchangeOfferWorldComparator.getTileHeight(ItemContainer.cameraX, WorldMapManager.cameraZ, GrandExchangeOfferUnitPriceComparator.Client_plane) - SpriteMask.field2542; // L: 6234 + } - if (ServerPacket.field2230 == var1.serverPacket) { // L: 6229 - ViewportMouse.logOut(); // L: 6230 - var1.serverPacket = null; // L: 6231 - return false; // L: 6232 - } - - if (ServerPacket.field2232 == var1.serverPacket) { // L: 6234 - minimapState = var3.readUnsignedByte(); // L: 6235 var1.serverPacket = null; // L: 6236 return true; // L: 6237 } - if (ServerPacket.field2190 == var1.serverPacket) { // L: 6239 - var36 = var3.readStringCp1252NullTerminated(); // L: 6240 - var17 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(var3))); // L: 6241 - WorldMapRectangle.addGameMessage(6, var36, var17); // L: 6242 - var1.serverPacket = null; // L: 6243 - return true; // L: 6244 + if (ServerPacket.field2189 == var1.serverPacket) { // L: 6239 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 6240 + DevicePcmPlayerProvider.clanChat.method5371(var3); // L: 6241 + } + + ClientPacket.method3744(); // L: 6243 + var1.serverPacket = null; // L: 6244 + return true; // L: 6245 } - if (ServerPacket.field2243 == var1.serverPacket) { // L: 6246 - var16 = var3.readInt(); // L: 6247 - var5 = var3.readUnsignedShort(); // L: 6248 - if (var16 < -70000) { // L: 6249 + if (ServerPacket.field2168 == var1.serverPacket) { // L: 6247 + GrandExchangeEvents.field64 = var3.readUnsignedByte(); // L: 6248 + GameShell.field466 = var3.method5650(); // L: 6249 + + while (var3.offset < var1.serverPacketLength) { // L: 6250 + var16 = var3.readUnsignedByte(); // L: 6251 + class194 var49 = GrandExchangeOffer.method208()[var16]; // L: 6252 + WorldMapEvent.method865(var49); // L: 6253 + } + + var1.serverPacket = null; // L: 6255 + return true; // L: 6256 + } + + if (ServerPacket.field2177 == var1.serverPacket) { // L: 6258 + var16 = var3.readInt(); // L: 6259 + var5 = var3.readUnsignedShort(); // L: 6260 + if (var16 < -70000) { // L: 6261 var5 += 32768; } - if (var16 >= 0) { // L: 6251 - var6 = TileItem.getWidget(var16); + if (var16 >= 0) { // L: 6263 + var27 = UserComparator4.getWidget(var16); } else { - var6 = null; // L: 6252 + var27 = null; // L: 6264 } - for (; var3.offset < var1.serverPacketLength; MidiPcmStream.itemContainerSetItem(var5, var7, var19 - 1, var20)) { // L: 6253 6267 - var7 = var3.readUShortSmart(); // L: 6254 - var19 = var3.readUnsignedShort(); // L: 6255 - var20 = 0; // L: 6256 - if (var19 != 0) { // L: 6257 - var20 = var3.readUnsignedByte(); // L: 6258 - if (var20 == 255) { // L: 6259 - var20 = var3.readInt(); + for (; var3.offset < var1.serverPacketLength; GrandExchangeEvents.itemContainerSetItem(var5, var52, var8 - 1, var24)) { // L: 6265 6279 + var52 = var3.readUShortSmart(); // L: 6266 + var8 = var3.readUnsignedShort(); // L: 6267 + var24 = 0; // L: 6268 + if (var8 != 0) { // L: 6269 + var24 = var3.readUnsignedByte(); // L: 6270 + if (var24 == 255) { // L: 6271 + var24 = var3.readInt(); } } - if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { // L: 6261 6262 - var6.itemIds[var7] = var19; // L: 6263 - var6.itemQuantities[var7] = var20; // L: 6264 + if (var27 != null && var52 >= 0 && var52 < var27.itemIds.length) { // L: 6273 6274 + var27.itemIds[var52] = var8; // L: 6275 + var27.itemQuantities[var52] = var24; // L: 6276 } } - if (var6 != null) { // L: 6269 - class52.invalidateWidget(var6); + if (var27 != null) { // L: 6281 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); } - DevicePcmPlayerProvider.method897(); // L: 6270 - changedItemContainers[++field903 - 1 & 31] = var5 & 32767; // L: 6271 - var1.serverPacket = null; // L: 6272 - return true; // L: 6273 + ItemDefinition.method4874(); // L: 6282 + changedItemContainers[++field941 - 1 & 31] = var5 & 32767; // L: 6283 + var1.serverPacket = null; // L: 6284 + return true; // L: 6285 } - if (ServerPacket.field2236 == var1.serverPacket) { // L: 6275 - var36 = var3.readStringCp1252NullTerminated(); // L: 6276 - var24 = var3.readLong(); // L: 6277 - var26 = (long)var3.readUnsignedShort(); // L: 6278 - var9 = (long)var3.readMedium(); // L: 6279 - PlayerType var11 = (PlayerType)TextureProvider.findEnumerated(ApproximateRouteStrategy.PlayerType_values(), var3.readUnsignedByte()); // L: 6280 - var12 = (var26 << 32) + var9; // L: 6281 - boolean var14 = false; // L: 6282 - - for (int var15 = 0; var15 < 100; ++var15) { // L: 6283 - if (field896[var15] == var12) { // L: 6284 - var14 = true; // L: 6285 - break; // L: 6286 - } - } - - if (var11.isUser && class60.friendSystem.isIgnored(new Username(var36, WorldMapAreaData.loginType))) { // L: 6289 6290 - var14 = true; - } - - if (!var14 && field790 == 0) { // L: 6292 - field896[field794] = var12; // L: 6293 - field794 = (field794 + 1) % 100; // L: 6294 - String var33 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(var3))); // L: 6295 - if (var11.modIcon != -1) { // L: 6296 - WorldMapData_0.addChatMessage(9, WorldMapScaleHandler.method824(var11.modIcon) + var36, var33, GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var24)); - } else { - WorldMapData_0.addChatMessage(9, var36, var33, GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var24)); // L: 6297 - } + Widget var53; + if (ServerPacket.field2219 == var1.serverPacket) { // L: 6287 + var16 = var3.method5797(); // L: 6288 + var5 = var3.method5686(); // L: 6289 + var6 = var3.method5659(); // L: 6290 + var52 = var3.method5797(); // L: 6291 + var53 = UserComparator4.getWidget(var5); // L: 6292 + if (var6 != var53.modelAngleX || var16 != var53.modelAngleY || var52 != var53.modelZoom) { // L: 6293 + var53.modelAngleX = var6; // L: 6294 + var53.modelAngleY = var16; // L: 6295 + var53.modelZoom = var52; // L: 6296 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var53); // L: 6297 } var1.serverPacket = null; // L: 6299 return true; // L: 6300 } - if (ServerPacket.field2233 == var1.serverPacket) { // L: 6302 - MouseHandler.method1134(class194.field2365); // L: 6303 + if (ServerPacket.field2227 == var1.serverPacket) { // L: 6302 + WorldMapEvent.method865(class194.field2348); // L: 6303 var1.serverPacket = null; // L: 6304 return true; // L: 6305 } - if (ServerPacket.field2210 == var1.serverPacket) { // L: 6307 - var16 = var3.method5678(); // L: 6308 - var5 = var3.readShort(); // L: 6309 - var18 = var3.method5658(); // L: 6310 - var21 = TileItem.getWidget(var16); // L: 6311 - if (var18 != var21.rawX || var5 != var21.rawY || var21.xAlignment != 0 || var21.yAlignment != 0) { // L: 6312 - var21.rawX = var18; // L: 6313 - var21.rawY = var5; // L: 6314 - var21.xAlignment = 0; // L: 6315 - var21.yAlignment = 0; // L: 6316 - class52.invalidateWidget(var21); // L: 6317 - this.alignWidget(var21); // L: 6318 - if (var21.type == 0) { // L: 6319 - class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var21, false); + if (ServerPacket.field2193 == var1.serverPacket) { // L: 6307 + ItemDefinition.method4874(); // L: 6308 + weight = var3.readShort(); // L: 6309 + field878 = cycleCntr; // L: 6310 + var1.serverPacket = null; // L: 6311 + return true; // L: 6312 + } + + if (ServerPacket.field2143 == var1.serverPacket) { // L: 6314 + var16 = var3.method5797(); // L: 6315 + var5 = var3.readInt(); // L: 6316 + var6 = var16 >> 10 & 31; // L: 6317 + var52 = var16 >> 5 & 31; // L: 6318 + var8 = var16 & 31; // L: 6319 + var24 = (var52 << 11) + (var6 << 19) + (var8 << 3); // L: 6320 + Widget var28 = UserComparator4.getWidget(var5); // L: 6321 + if (var24 != var28.color) { // L: 6322 + var28.color = var24; // L: 6323 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var28); // L: 6324 + } + + var1.serverPacket = null; // L: 6326 + return true; // L: 6327 + } + + if (ServerPacket.field2158 == var1.serverPacket) { // L: 6329 + PacketWriter.loadRegions(false, var1.packetBuffer); // L: 6330 + var1.serverPacket = null; // L: 6331 + return true; // L: 6332 + } + + if (ServerPacket.field2159 == var1.serverPacket) { // L: 6334 + GrandExchangeEvents.field64 = var3.method5668(); // L: 6335 + GameShell.field466 = var3.method5650(); // L: 6336 + var1.serverPacket = null; // L: 6337 + return true; // L: 6338 + } + + boolean var55; + if (ServerPacket.field2170 == var1.serverPacket) { // L: 6340 + var55 = var3.readUnsignedByte() == 1; // L: 6341 + var5 = var3.method5685(); // L: 6342 + var27 = UserComparator4.getWidget(var5); // L: 6343 + if (var55 != var27.isHidden) { // L: 6344 + var27.isHidden = var55; // L: 6345 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); // L: 6346 + } + + var1.serverPacket = null; // L: 6348 + return true; // L: 6349 + } + + if (ServerPacket.field2214 == var1.serverPacket) { // L: 6351 + var38 = var3.readStringCp1252NullTerminated(); // L: 6352 + var18 = var3.readLong(); // L: 6353 + var20 = (long)var3.readUnsignedShort(); // L: 6354 + var31 = (long)var3.readMedium(); // L: 6355 + PlayerType var33 = (PlayerType)class195.findEnumerated(WorldMapLabelSize.PlayerType_values(), var3.readUnsignedByte()); // L: 6356 + var29 = (var20 << 32) + var31; // L: 6357 + boolean var14 = false; // L: 6358 + + for (int var15 = 0; var15 < 100; ++var15) { // L: 6359 + if (field900[var15] == var29) { // L: 6360 + var14 = true; // L: 6361 + break; // L: 6362 } } - var1.serverPacket = null; // L: 6321 - return true; // L: 6322 + if (var33.isUser && WorldMapLabelSize.friendSystem.isIgnored(new Username(var38, UserComparator4.loginType))) { // L: 6365 6366 + var14 = true; + } + + if (!var14 && field795 == 0) { // L: 6368 + field900[field901] = var29; // L: 6369 + field901 = (field901 + 1) % 100; // L: 6370 + String var34 = AbstractFont.escapeBrackets(WorldMapSection0.method328(Tile.method3004(var3))); // L: 6371 + if (var33.modIcon != -1) { // L: 6372 + class3.addChatMessage(9, PrivateChatMode.method6034(var33.modIcon) + var38, var34, class69.base37DecodeLong(var18)); + } else { + class3.addChatMessage(9, var38, var34, class69.base37DecodeLong(var18)); // L: 6373 + } + } + + var1.serverPacket = null; // L: 6375 + return true; // L: 6376 } - Decimator.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -317415457 * 2122570783 : -1) + "," + (var1.field1348 != null ? var1.field1348.id * -317415457 * 2122570783 : -1) + "," + (var1.field1346 != null ? var1.field1346.id * -317415457 * 2122570783 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6324 - ViewportMouse.logOut(); // L: 6325 - } catch (IOException var34) { // L: 6327 - ArchiveLoader.method1208(); // L: 6328 - } catch (Exception var35) { - var17 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -317415457 * 2122570783 : -1) + "," + (var1.field1348 != null ? var1.field1348.id * -317415457 * 2122570783 : -1) + "," + (var1.field1346 != null ? var1.field1346.id * -317415457 * 2122570783 : -1) + "," + var1.serverPacketLength + "," + (WorldMapLabelSize.localPlayer.pathX[0] + WorldMapManager.baseX) + "," + (WorldMapLabelSize.localPlayer.pathY[0] + WorldMapLabel.baseY) + ","; // L: 6331 - - for (var18 = 0; var18 < var1.serverPacketLength && var18 < 50; ++var18) { // L: 6332 - var17 = var17 + var3.array[var18] + ","; + if (ServerPacket.field2210 == var1.serverPacket) { // L: 6378 + class89.logOut(); // L: 6379 + var1.serverPacket = null; // L: 6380 + return false; // L: 6381 } - Decimator.RunException_sendStackTrace(var17, var35); // L: 6333 - ViewportMouse.logOut(); // L: 6334 + if (ServerPacket.field2156 == var1.serverPacket) { // L: 6383 + var55 = var3.readBoolean(); // L: 6384 + if (var55) { // L: 6385 + if (ModelData0.field1895 == null) { // L: 6386 + ModelData0.field1895 = new class248(); + } + } else { + ModelData0.field1895 = null; // L: 6388 + } + + var1.serverPacket = null; // L: 6389 + return true; // L: 6390 + } + + if (ServerPacket.field2171 == var1.serverPacket) { // L: 6392 + var16 = var3.method5659(); // L: 6393 + var5 = var3.method5685(); // L: 6394 + Varps.Varps_temp[var16] = var5; // L: 6395 + if (Varps.Varps_main[var16] != var5) { // L: 6396 + Varps.Varps_main[var16] = var5; // L: 6397 + } + + class23.changeGameOptions(var16); // L: 6399 + field867[++field868 - 1 & 31] = var16; // L: 6400 + var1.serverPacket = null; // L: 6401 + return true; // L: 6402 + } + + if (ServerPacket.field2190 == var1.serverPacket) { // L: 6404 + var16 = var3.method5686(); // L: 6405 + var5 = var3.method5679(); // L: 6406 + var27 = UserComparator4.getWidget(var16); // L: 6407 + if (var5 != var27.sequenceId || var5 == -1) { // L: 6408 + var27.sequenceId = var5; // L: 6409 + var27.modelFrame = 0; // L: 6410 + var27.modelFrameCycle = 0; // L: 6411 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); // L: 6412 + } + + var1.serverPacket = null; // L: 6414 + return true; // L: 6415 + } + + if (ServerPacket.field2180 == var1.serverPacket) { // L: 6417 + MusicPatch.updateNpcs(true, var3); // L: 6418 + var1.serverPacket = null; // L: 6419 + return true; // L: 6420 + } + + if (ServerPacket.field2183 == var1.serverPacket) { // L: 6422 + var55 = var3.readUnsignedByte() == 1; // L: 6423 + if (var55) { // L: 6424 + class58.field444 = User.currentTimeMillis() - var3.readLong(); // L: 6425 + WorldMapDecoration.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6426 + } else { + WorldMapDecoration.grandExchangeEvents = null; // L: 6428 + } + + field852 = cycleCntr; // L: 6429 + var1.serverPacket = null; // L: 6430 + return true; // L: 6431 + } + + if (ServerPacket.field2222 == var1.serverPacket) { // L: 6433 + var38 = var3.readStringCp1252NullTerminated(); // L: 6434 + Object[] var48 = new Object[var38.length() + 1]; // L: 6435 + + for (var6 = var38.length() - 1; var6 >= 0; --var6) { // L: 6436 + if (var38.charAt(var6) == 's') { // L: 6437 + var48[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var48[var6 + 1] = new Integer(var3.readInt()); // L: 6438 + } + } + + var48[0] = new Integer(var3.readInt()); // L: 6440 + ScriptEvent var59 = new ScriptEvent(); // L: 6441 + var59.args = var48; // L: 6442 + Entity.runScriptEvent(var59); // L: 6443 + var1.serverPacket = null; // L: 6444 + return true; // L: 6445 + } + + if (ServerPacket.field2142 == var1.serverPacket) { // L: 6447 + var16 = var3.method5685(); // L: 6448 + var47 = UserComparator4.getWidget(var16); // L: 6449 + var47.modelType = 3; // L: 6450 + var47.modelId = PlayerType.localPlayer.appearance.getChatHeadId(); // L: 6451 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var47); // L: 6452 + var1.serverPacket = null; // L: 6453 + return true; // L: 6454 + } + + if (ServerPacket.field2175 == var1.serverPacket) { // L: 6456 + WorldMapEvent.method865(class194.field2355); // L: 6457 + var1.serverPacket = null; // L: 6458 + return true; // L: 6459 + } + + String var56; + if (ServerPacket.field2164 == var1.serverPacket) { // L: 6461 + byte[] var40 = new byte[var1.serverPacketLength]; // L: 6462 + var3.method5584(var40, 0, var40.length); // L: 6463 + Buffer var46 = new Buffer(var40); // L: 6464 + var56 = var46.readStringCp1252NullTerminated(); // L: 6465 + Skeleton.openURL(var56, true, false); // L: 6466 + var1.serverPacket = null; // L: 6467 + return true; // L: 6468 + } + + if (ServerPacket.field2176 == var1.serverPacket) { // L: 6470 + var16 = var3.readInt(); // L: 6471 + var5 = var3.readUnsignedShort(); // L: 6472 + if (var16 < -70000) { // L: 6473 + var5 += 32768; + } + + if (var16 >= 0) { // L: 6475 + var27 = UserComparator4.getWidget(var16); + } else { + var27 = null; // L: 6476 + } + + if (var27 != null) { // L: 6477 + for (var52 = 0; var52 < var27.itemIds.length; ++var52) { // L: 6478 + var27.itemIds[var52] = 0; // L: 6479 + var27.itemQuantities[var52] = 0; // L: 6480 + } + } + + class3.clearItemContainer(var5); // L: 6483 + var52 = var3.readUnsignedShort(); // L: 6484 + + for (var8 = 0; var8 < var52; ++var8) { // L: 6485 + var24 = var3.method5650(); // L: 6486 + if (var24 == 255) { // L: 6487 + var24 = var3.readInt(); + } + + var25 = var3.readUnsignedShort(); // L: 6488 + if (var27 != null && var8 < var27.itemIds.length) { // L: 6489 6490 + var27.itemIds[var8] = var25; // L: 6491 + var27.itemQuantities[var8] = var24; // L: 6492 + } + + GrandExchangeEvents.itemContainerSetItem(var5, var8, var25 - 1, var24); // L: 6495 + } + + if (var27 != null) { // L: 6497 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); + } + + ItemDefinition.method4874(); // L: 6498 + changedItemContainers[++field941 - 1 & 31] = var5 & 32767; // L: 6499 + var1.serverPacket = null; // L: 6500 + return true; // L: 6501 + } + + if (ServerPacket.field2223 == var1.serverPacket) { // L: 6503 + hintArrowType = var3.readUnsignedByte(); // L: 6504 + if (hintArrowType == 1) { // L: 6505 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6506 + if (hintArrowType == 2) { // L: 6507 + hintArrowSubX = 64; // L: 6508 + hintArrowSubY = 64; // L: 6509 + } + + if (hintArrowType == 3) { // L: 6511 + hintArrowSubX = 0; // L: 6512 + hintArrowSubY = 64; // L: 6513 + } + + if (hintArrowType == 4) { // L: 6515 + hintArrowSubX = 128; // L: 6516 + hintArrowSubY = 64; // L: 6517 + } + + if (hintArrowType == 5) { // L: 6519 + hintArrowSubX = 64; // L: 6520 + hintArrowSubY = 0; // L: 6521 + } + + if (hintArrowType == 6) { // L: 6523 + hintArrowSubX = 64; // L: 6524 + hintArrowSubY = 128; // L: 6525 + } + + hintArrowType = 2; // L: 6527 + hintArrowX = var3.readUnsignedShort(); // L: 6528 + hintArrowY = var3.readUnsignedShort(); // L: 6529 + hintArrowHeight = var3.readUnsignedByte(); // L: 6530 + } + + if (hintArrowType == 10) { // L: 6532 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 6533 + return true; // L: 6534 + } + + if (ServerPacket.field2230 == var1.serverPacket) { // L: 6536 + WorldMapEvent.method865(class194.field2349); // L: 6537 + var1.serverPacket = null; // L: 6538 + return true; // L: 6539 + } + + if (ServerPacket.field2152 == var1.serverPacket) { // L: 6541 + var16 = var3.method5675(); // L: 6542 + if (var16 == 65535) { // L: 6543 + var16 = -1; + } + + Messages.playSong(var16); // L: 6544 + var1.serverPacket = null; // L: 6545 + return true; // L: 6546 + } + + if (ServerPacket.field2178 == var1.serverPacket) { // L: 6548 + var16 = var3.method5675(); // L: 6549 + if (var16 == 65535) { // L: 6550 + var16 = -1; + } + + var5 = var3.method5852(); // L: 6551 + Projectile.playSoundJingle(var16, var5); // L: 6552 + var1.serverPacket = null; // L: 6553 + return true; // L: 6554 + } + + if (ServerPacket.field2206 == var1.serverPacket) { // L: 6556 + var16 = var3.method5686(); // L: 6557 + var5 = var3.method5685(); // L: 6558 + InterfaceParent var58 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6559 + var41 = (InterfaceParent)interfaceParents.get((long)var16); // L: 6560 + if (var41 != null) { // L: 6561 + Player.closeInterface(var41, var58 == null || var41.group != var58.group); + } + + if (var58 != null) { // L: 6562 + var58.remove(); // L: 6563 + interfaceParents.put(var58, (long)var16); // L: 6564 + } + + var53 = UserComparator4.getWidget(var5); // L: 6566 + if (var53 != null) { // L: 6567 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var53); + } + + var53 = UserComparator4.getWidget(var16); // L: 6568 + if (var53 != null) { // L: 6569 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var53); // L: 6570 + UserComparator9.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var53.id >>> 16], var53, true); // L: 6571 + } + + if (rootInterface != -1) { // L: 6573 + WorldMapAreaData.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 6574 + return true; // L: 6575 + } + + if (ServerPacket.field2211 == var1.serverPacket) { // L: 6577 + var16 = var3.readUnsignedShort(); // L: 6578 + rootInterface = var16; // L: 6579 + this.resizeRoot(false); // L: 6580 + FontName.Widget_resetModelFrames(var16); // L: 6581 + ScriptFrame.runWidgetOnLoadListener(rootInterface); // L: 6582 + + for (var5 = 0; var5 < 100; ++var5) { // L: 6583 + field834[var5] = true; + } + + var1.serverPacket = null; // L: 6584 + return true; // L: 6585 + } + + if (ServerPacket.field2199 == var1.serverPacket) { // L: 6587 + var3.offset += 28; // L: 6588 + if (var3.checkCrc()) { // L: 6589 + UserComparator6.method3565(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6590 + return true; // L: 6591 + } + + if (ServerPacket.field2174 == var1.serverPacket) { // L: 6593 + WorldMapEvent.method865(class194.field2356); // L: 6594 + var1.serverPacket = null; // L: 6595 + return true; // L: 6596 + } + + if (ServerPacket.field2191 == var1.serverPacket) { // L: 6598 + WorldMapEvent.method865(class194.field2352); // L: 6599 + var1.serverPacket = null; // L: 6600 + return true; // L: 6601 + } + + if (ServerPacket.field2181 == var1.serverPacket) { // L: 6603 + var16 = var3.readUShortSmart(); // L: 6604 + boolean var42 = var3.readUnsignedByte() == 1; // L: 6605 + var56 = ""; // L: 6606 + boolean var23 = false; // L: 6607 + if (var42) { // L: 6608 + var56 = var3.readStringCp1252NullTerminated(); // L: 6609 + if (WorldMapLabelSize.friendSystem.isIgnored(new Username(var56, UserComparator4.loginType))) { // L: 6610 + var23 = true; + } + } + + String var26 = var3.readStringCp1252NullTerminated(); // L: 6612 + if (!var23) { // L: 6613 + DevicePcmPlayerProvider.addGameMessage(var16, var56, var26); + } + + var1.serverPacket = null; // L: 6614 + return true; // L: 6615 + } + + if (ServerPacket.field2217 == var1.serverPacket) { // L: 6617 + WorldMapEvent.method865(class194.field2357); // L: 6618 + var1.serverPacket = null; // L: 6619 + return true; // L: 6620 + } + + if (ServerPacket.field2225 == var1.serverPacket) { // L: 6622 + var16 = var3.readInt(); // L: 6623 + var5 = var3.method5797(); // L: 6624 + var27 = UserComparator4.getWidget(var16); // L: 6625 + if (var27.modelType != 1 || var5 != var27.modelId) { // L: 6626 + var27.modelType = 1; // L: 6627 + var27.modelId = var5; // L: 6628 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); // L: 6629 + } + + var1.serverPacket = null; // L: 6631 + return true; // L: 6632 + } + + if (ServerPacket.field2154 == var1.serverPacket) { // L: 6634 + for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { // L: 6635 + if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { // L: 6636 + Varps.Varps_main[var16] = Varps.Varps_temp[var16]; // L: 6637 + class23.changeGameOptions(var16); // L: 6638 + field867[++field868 - 1 & 31] = var16; // L: 6639 + } + } + + var1.serverPacket = null; // L: 6642 + return true; // L: 6643 + } + + if (ServerPacket.field2203 == var1.serverPacket) { // L: 6645 + WorldMapEvent.method865(class194.field2359); // L: 6646 + var1.serverPacket = null; // L: 6647 + return true; // L: 6648 + } + + if (ServerPacket.field2163 == var1.serverPacket) { // L: 6650 + if (var1.serverPacketLength == 0) { // L: 6651 + DevicePcmPlayerProvider.clanChat = null; // L: 6652 + } else { + if (DevicePcmPlayerProvider.clanChat == null) { // L: 6655 + DevicePcmPlayerProvider.clanChat = new ClanChat(UserComparator4.loginType, ByteArrayPool.client); // L: 6656 + } + + DevicePcmPlayerProvider.clanChat.readUpdate(var3); // L: 6658 + } + + ClientPacket.method3744(); // L: 6660 + var1.serverPacket = null; // L: 6661 + return true; // L: 6662 + } + + if (ServerPacket.field2160 == var1.serverPacket) { // L: 6664 + rebootTimer = var3.method5659() * 30; // L: 6665 + field878 = cycleCntr; // L: 6666 + var1.serverPacket = null; // L: 6667 + return true; // L: 6668 + } + + if (ServerPacket.field2205 == var1.serverPacket) { // L: 6670 + WorldMapEvent.method865(class194.field2353); // L: 6671 + var1.serverPacket = null; // L: 6672 + return true; // L: 6673 + } + + if (ServerPacket.field2213 == var1.serverPacket) { // L: 6675 + var16 = var3.readInt(); // L: 6676 + if (var16 != field763) { // L: 6677 + field763 = var16; // L: 6678 + ScriptEvent.method1282(); // L: 6679 + } + + var1.serverPacket = null; // L: 6681 + return true; // L: 6682 + } + + if (ServerPacket.field2197 == var1.serverPacket) { // L: 6684 + var16 = var3.method5659(); // L: 6685 + var5 = var3.readInt(); // L: 6686 + var6 = var3.method5659(); // L: 6687 + var7 = UserComparator4.getWidget(var5); // L: 6688 + var7.field2734 = var16 + (var6 << 16); // L: 6689 + var1.serverPacket = null; // L: 6690 + return true; // L: 6691 + } + + if (ServerPacket.field2200 == var1.serverPacket) { // L: 6693 + World var39 = new World(); // L: 6694 + var39.host = var3.readStringCp1252NullTerminated(); // L: 6695 + var39.id = var3.readUnsignedShort(); // L: 6696 + var5 = var3.readInt(); // L: 6697 + var39.properties = var5; // L: 6698 + BuddyRankComparator.updateGameState(45); // L: 6699 + var2.close(); // L: 6700 + var2 = null; // L: 6701 + AbstractByteArrayCopier.changeWorld(var39); // L: 6702 + var1.serverPacket = null; // L: 6703 + return false; // L: 6704 + } + + if (ServerPacket.field2212 == var1.serverPacket) { // L: 6706 + var38 = var3.readStringCp1252NullTerminated(); // L: 6707 + var17 = AbstractFont.escapeBrackets(WorldMapSection0.method328(Tile.method3004(var3))); // L: 6708 + DevicePcmPlayerProvider.addGameMessage(6, var38, var17); // L: 6709 + var1.serverPacket = null; // L: 6710 + return true; // L: 6711 + } + + if (ServerPacket.field2151 == var1.serverPacket) { // L: 6713 + WorldMapLabelSize.friendSystem.method1957(); // L: 6714 + field874 = cycleCntr; // L: 6715 + var1.serverPacket = null; // L: 6716 + return true; // L: 6717 + } + + if (ServerPacket.field2209 == var1.serverPacket) { // L: 6719 + PacketWriter.loadRegions(true, var1.packetBuffer); // L: 6720 + var1.serverPacket = null; // L: 6721 + return true; // L: 6722 + } + + if (ServerPacket.field2161 == var1.serverPacket) { // L: 6724 + isCameraLocked = false; // L: 6725 + + for (var16 = 0; var16 < 5; ++var16) { // L: 6726 + field926[var16] = false; + } + + var1.serverPacket = null; // L: 6727 + return true; // L: 6728 + } + + if (ServerPacket.field2201 == var1.serverPacket) { // L: 6730 + var16 = var3.method5678(); // L: 6731 + var5 = var3.readShort(); // L: 6732 + var6 = var3.method5685(); // L: 6733 + var7 = UserComparator4.getWidget(var6); // L: 6734 + if (var16 != var7.rawX || var5 != var7.rawY || var7.xAlignment != 0 || var7.yAlignment != 0) { // L: 6735 + var7.rawX = var16; // L: 6736 + var7.rawY = var5; // L: 6737 + var7.xAlignment = 0; // L: 6738 + var7.yAlignment = 0; // L: 6739 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var7); // L: 6740 + this.alignWidget(var7); // L: 6741 + if (var7.type == 0) { // L: 6742 + UserComparator9.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var6 >> 16], var7, false); + } + } + + var1.serverPacket = null; // L: 6744 + return true; // L: 6745 + } + + if (ServerPacket.field2173 == var1.serverPacket) { // L: 6747 + WorldMapLabelSize.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6748 + field874 = cycleCntr; // L: 6749 + var1.serverPacket = null; // L: 6750 + return true; // L: 6751 + } + + if (ServerPacket.field2198 == var1.serverPacket) { // L: 6753 + for (var16 = 0; var16 < players.length; ++var16) { // L: 6754 + if (players[var16] != null) { // L: 6755 + players[var16].sequence = -1; + } + } + + for (var16 = 0; var16 < npcs.length; ++var16) { // L: 6757 + if (npcs[var16] != null) { // L: 6758 + npcs[var16].sequence = -1; + } + } + + var1.serverPacket = null; // L: 6760 + return true; // L: 6761 + } + + if (ServerPacket.field2187 == var1.serverPacket) { // L: 6763 + var16 = var3.readUnsignedByte(); // L: 6764 + WorldMapArea.forceDisconnect(var16); // L: 6765 + var1.serverPacket = null; // L: 6766 + return false; // L: 6767 + } + + if (ServerPacket.field2148 == var1.serverPacket) { // L: 6769 + WorldMapData_1.readReflectionCheck(var3, var1.serverPacketLength); // L: 6770 + var1.serverPacket = null; // L: 6771 + return true; // L: 6772 + } + + if (ServerPacket.field2149 == var1.serverPacket) { // L: 6774 + WorldMapEvent.method865(class194.field2354); // L: 6775 + var1.serverPacket = null; // L: 6776 + return true; // L: 6777 + } + + if (ServerPacket.field2169 == var1.serverPacket) { // L: 6779 + MusicPatch.updateNpcs(false, var3); // L: 6780 + var1.serverPacket = null; // L: 6781 + return true; // L: 6782 + } + + if (ServerPacket.field2186 == var1.serverPacket) { // L: 6784 + destinationX = var3.readUnsignedByte(); // L: 6785 + if (destinationX == 255) { // L: 6786 + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); // L: 6787 + if (destinationY == 255) { // L: 6788 + destinationY = 0; + } + + var1.serverPacket = null; // L: 6789 + return true; // L: 6790 + } + + if (ServerPacket.field2215 == var1.serverPacket) { // L: 6792 + var16 = var3.readUnsignedShort(); // L: 6793 + var5 = var3.readUnsignedByte(); // L: 6794 + var6 = var3.readUnsignedShort(); // L: 6795 + KitDefinition.queueSoundEffect(var16, var5, var6); // L: 6796 + var1.serverPacket = null; // L: 6797 + return true; // L: 6798 + } + + if (ServerPacket.field2226 == var1.serverPacket) { // L: 6800 + var16 = var3.method5675(); // L: 6801 + WorldMapData_1.method817(var16); // L: 6802 + changedItemContainers[++field941 - 1 & 31] = var16 & 32767; // L: 6803 + var1.serverPacket = null; // L: 6804 + return true; // L: 6805 + } + + if (ServerPacket.field2192 == var1.serverPacket) { // L: 6807 + var16 = var3.readUnsignedByte(); // L: 6808 + Decimator.method2668(var16); // L: 6809 + var1.serverPacket = null; // L: 6810 + return true; // L: 6811 + } + + if (ServerPacket.field2155 == var1.serverPacket) { // L: 6813 + GameShell.field466 = var3.method5650(); // L: 6814 + GrandExchangeEvents.field64 = var3.readUnsignedByte(); // L: 6815 + + for (var16 = GameShell.field466; var16 < GameShell.field466 + 8; ++var16) { // L: 6816 + for (var5 = GrandExchangeEvents.field64; var5 < GrandExchangeEvents.field64 + 8; ++var5) { // L: 6817 + if (groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var16][var5] != null) { // L: 6818 + groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var16][var5] = null; // L: 6819 + class41.updateItemPile(var16, var5); // L: 6820 + } + } + } + + for (PendingSpawn var37 = (PendingSpawn)pendingSpawns.last(); var37 != null; var37 = (PendingSpawn)pendingSpawns.previous()) { // L: 6824 6825 6827 + if (var37.x >= GameShell.field466 && var37.x < GameShell.field466 + 8 && var37.y >= GrandExchangeEvents.field64 && var37.y < GrandExchangeEvents.field64 + 8 && var37.plane == GrandExchangeOfferUnitPriceComparator.Client_plane) { // L: 6826 + var37.hitpoints = 0; + } + } + + var1.serverPacket = null; // L: 6829 + return true; // L: 6830 + } + + if (ServerPacket.field2146 == var1.serverPacket) { // L: 6832 + var16 = var3.readUnsignedShort(); // L: 6833 + var5 = var3.method5686(); // L: 6834 + var27 = UserComparator4.getWidget(var5); // L: 6835 + if (var27 != null && var27.type == 0) { // L: 6836 + if (var16 > var27.scrollHeight - var27.height) { // L: 6837 + var16 = var27.scrollHeight - var27.height; + } + + if (var16 < 0) { // L: 6838 + var16 = 0; + } + + if (var16 != var27.scrollY) { // L: 6839 + var27.scrollY = var16; // L: 6840 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); // L: 6841 + } + } + + var1.serverPacket = null; // L: 6844 + return true; // L: 6845 + } + + if (ServerPacket.field2147 == var1.serverPacket) { // L: 6847 + var16 = var3.readUnsignedShort(); // L: 6848 + var5 = var3.readInt(); // L: 6849 + var27 = UserComparator4.getWidget(var5); // L: 6850 + if (var27.modelType != 2 || var16 != var27.modelId) { // L: 6851 + var27.modelType = 2; // L: 6852 + var27.modelId = var16; // L: 6853 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var27); // L: 6854 + } + + var1.serverPacket = null; // L: 6856 + return true; // L: 6857 + } + + PacketWriter.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1044340673 * 1695854657 : -1) + "," + (var1.field1339 != null ? var1.field1339.id * 1044340673 * 1695854657 : -1) + "," + (var1.field1350 != null ? var1.field1350.id * 1044340673 * 1695854657 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6859 + class89.logOut(); // L: 6860 + } catch (IOException var35) { // L: 6862 + FloorDecoration.method2986(); // L: 6863 + } catch (Exception var36) { + var17 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1044340673 * 1695854657 : -1) + "," + (var1.field1339 != null ? var1.field1339.id * 1044340673 * 1695854657 : -1) + "," + (var1.field1350 != null ? var1.field1350.id * 1044340673 * 1695854657 : -1) + "," + var1.serverPacketLength + "," + (PlayerType.localPlayer.pathX[0] + FloorDecoration.baseX) + "," + (PlayerType.localPlayer.pathY[0] + WorldMapData_0.baseY) + ","; // L: 6866 + + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 6867 + var17 = var17 + var3.array[var6] + ","; + } + + PacketWriter.RunException_sendStackTrace(var17, var36); // L: 6868 + class89.logOut(); // L: 6869 } - return true; // L: 6336 + return true; // L: 6871 } } - @ObfuscatedName("hk") + @ObfuscatedName("ho") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "736639709" + garbageValue = "-1619365796" ) + @Export("menu") final void menu() { - boolean var1 = false; // L: 7056 + boolean var1 = false; // L: 7744 int var2; int var5; - while (!var1) { // L: 7057 - var1 = true; // L: 7058 + while (!var1) { // L: 7745 + var1 = true; // L: 7746 - for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { // L: 7059 - if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { // L: 7060 - String var14 = menuTargets[var2]; // L: 7061 - menuTargets[var2] = menuTargets[var2 + 1]; // L: 7062 - menuTargets[var2 + 1] = var14; // L: 7063 - String var15 = menuActions[var2]; // L: 7064 - menuActions[var2] = menuActions[var2 + 1]; // L: 7065 - menuActions[var2 + 1] = var15; // L: 7066 - var5 = menuOpcodes[var2]; // L: 7067 - menuOpcodes[var2] = menuOpcodes[var2 + 1]; // L: 7068 - menuOpcodes[var2 + 1] = var5; // L: 7069 - var5 = menuArguments1[var2]; // L: 7070 - menuArguments1[var2] = menuArguments1[var2 + 1]; // L: 7071 - menuArguments1[var2 + 1] = var5; // L: 7072 - var5 = menuArguments2[var2]; // L: 7073 - menuArguments2[var2] = menuArguments2[var2 + 1]; // L: 7074 - menuArguments2[var2 + 1] = var5; // L: 7075 - var5 = menuIdentifiers[var2]; // L: 7076 - menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; // L: 7077 - menuIdentifiers[var2 + 1] = var5; // L: 7078 - boolean var13 = menuShiftClick[var2]; // L: 7079 - menuShiftClick[var2] = menuShiftClick[var2 + 1]; // L: 7080 - menuShiftClick[var2 + 1] = var13; // L: 7081 - var1 = false; // L: 7082 + for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { // L: 7747 + if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { // L: 7748 + String var15 = menuTargets[var2]; // L: 7749 + menuTargets[var2] = menuTargets[var2 + 1]; // L: 7750 + menuTargets[var2 + 1] = var15; // L: 7751 + String var16 = menuActions[var2]; // L: 7752 + menuActions[var2] = menuActions[var2 + 1]; // L: 7753 + menuActions[var2 + 1] = var16; // L: 7754 + var5 = menuOpcodes[var2]; // L: 7755 + menuOpcodes[var2] = menuOpcodes[var2 + 1]; // L: 7756 + menuOpcodes[var2 + 1] = var5; // L: 7757 + var5 = menuArguments1[var2]; // L: 7758 + menuArguments1[var2] = menuArguments1[var2 + 1]; // L: 7759 + menuArguments1[var2 + 1] = var5; // L: 7760 + var5 = menuArguments2[var2]; // L: 7761 + menuArguments2[var2] = menuArguments2[var2 + 1]; // L: 7762 + menuArguments2[var2 + 1] = var5; // L: 7763 + var5 = menuIdentifiers[var2]; // L: 7764 + menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; // L: 7765 + menuIdentifiers[var2 + 1] = var5; // L: 7766 + boolean var13 = menuShiftClick[var2]; // L: 7767 + menuShiftClick[var2] = menuShiftClick[var2 + 1]; // L: 7768 + menuShiftClick[var2 + 1] = var13; // L: 7769 + var1 = false; // L: 7770 } } } - if (BuddyRankComparator.dragInventoryWidget == null) { // L: 7087 - if (clickedWidget == null) { // L: 7088 + if (GameBuild.dragInventoryWidget == null) { // L: 7775 + if (clickedWidget == null) { // L: 7776 int var4; - label300: { - int var16 = MouseHandler.MouseHandler_lastButton; // L: 7089 + int var10; + int var19; + label296: { + int var17 = MouseHandler.MouseHandler_lastButton; // L: 7777 int var3; int var8; - if (isMenuOpen) { // L: 7090 - int var17; + if (isMenuOpen) { // L: 7778 int var18; - if (var16 != 1 && (ScriptEvent.mouseCam || var16 != 4)) { // L: 7091 - var2 = MouseHandler.MouseHandler_x; // L: 7092 - var3 = MouseHandler.MouseHandler_y; // L: 7093 - if (var2 < ChatChannel.menuX - 10 || var2 > DevicePcmPlayerProvider.menuWidth + ChatChannel.menuX + 10 || var3 < menuY - 10 || var3 > WorldMapManager.menuHeight + menuY + 10) { // L: 7094 - isMenuOpen = false; // L: 7095 - var4 = ChatChannel.menuX; // L: 7096 - var5 = menuY; // L: 7097 - var18 = DevicePcmPlayerProvider.menuWidth; // L: 7098 - var17 = WorldMapManager.menuHeight; // L: 7099 + int var20; + if (var17 != 1 && (MusicPatchNode.mouseCam || var17 != 4)) { // L: 7779 + var2 = MouseHandler.MouseHandler_x; // L: 7780 + var3 = MouseHandler.MouseHandler_y; // L: 7781 + if (var2 < Coord.menuX - 10 || var2 > KeyHandler.menuWidth + Coord.menuX + 10 || var3 < WorldMapArea.menuY - 10 || var3 > ServerPacket.menuHeight + WorldMapArea.menuY + 10) { // L: 7782 + isMenuOpen = false; // L: 7783 + var4 = Coord.menuX; // L: 7784 + var5 = WorldMapArea.menuY; // L: 7785 + var20 = KeyHandler.menuWidth; // L: 7786 + var18 = ServerPacket.menuHeight; // L: 7787 - for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 7101 - if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var4 + var18 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var17) { // L: 7102 - field882[var8] = true; + for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 7789 + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var20 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var18) { // L: 7790 + field834[var8] = true; } } } } - if (var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) { // L: 7107 - var2 = ChatChannel.menuX; // L: 7108 - var3 = menuY; // L: 7109 - var4 = DevicePcmPlayerProvider.menuWidth; // L: 7110 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7111 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 7112 - var17 = -1; // L: 7113 + if (var17 == 1 || !MusicPatchNode.mouseCam && var17 == 4) { // L: 7795 + var2 = Coord.menuX; // L: 7796 + var3 = WorldMapArea.menuY; // L: 7797 + var4 = KeyHandler.menuWidth; // L: 7798 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7799 + var20 = MouseHandler.MouseHandler_lastPressedY; // L: 7800 + var18 = -1; // L: 7801 - int var9; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7114 - var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 7115 - if (var5 > var2 && var5 < var4 + var2 && var18 > var9 - 13 && var18 < var9 + 3) { // L: 7116 - var17 = var8; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7802 + var19 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 7803 + if (var5 > var2 && var5 < var4 + var2 && var20 > var19 - 13 && var20 < var19 + 3) { // L: 7804 + var18 = var8; } } - if (var17 != -1) { // L: 7118 - Widget.method4175(var17); + if (var18 != -1) { // L: 7806 + EnumDefinition.method4721(var18); } - isMenuOpen = false; // L: 7119 - var8 = ChatChannel.menuX; // L: 7120 - var9 = menuY; // L: 7121 - int var10 = DevicePcmPlayerProvider.menuWidth; // L: 7122 - int var11 = WorldMapManager.menuHeight; // L: 7123 + isMenuOpen = false; // L: 7807 + var8 = Coord.menuX; // L: 7808 + var19 = WorldMapArea.menuY; // L: 7809 + var10 = KeyHandler.menuWidth; // L: 7810 + int var14 = ServerPacket.menuHeight; // L: 7811 - for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 7125 - if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { // L: 7126 - field882[var12] = true; + for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 7813 + if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var10 + var8 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var19 && rootWidgetYs[var12] < var14 + var19) { // L: 7814 + field834[var12] = true; } } } } else { - var2 = GrandExchangeOffer.method209(); // L: 7132 - if ((var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) && var2 >= 0) { // L: 7133 - var3 = menuOpcodes[var2]; // L: 7134 - 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) { // L: 7135 - var4 = menuArguments1[var2]; // L: 7136 - var5 = menuArguments2[var2]; // L: 7137 - Widget var6 = TileItem.getWidget(var5); // L: 7138 - var8 = WorldMapIcon_0.getWidgetFlags(var6); // L: 7140 - boolean var7 = (var8 >> 28 & 1) != 0; // L: 7142 - if (var7) { // L: 7144 - break label300; + var2 = FileSystem.method3638(); // L: 7820 + if ((var17 == 1 || !MusicPatchNode.mouseCam && var17 == 4) && var2 >= 0) { // L: 7821 + var3 = menuOpcodes[var2]; // L: 7822 + 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) { // L: 7823 + var4 = menuArguments1[var2]; // L: 7824 + var5 = menuArguments2[var2]; // L: 7825 + Widget var6 = UserComparator4.getWidget(var5); // L: 7826 + var8 = WorldMapData_0.getWidgetFlags(var6); // L: 7828 + boolean var7 = (var8 >> 28 & 1) != 0; // L: 7830 + if (var7) { // L: 7833 + break label296; } - Object var10000 = null; - if (Widget.method4172(WorldMapIcon_0.getWidgetFlags(var6))) { - break label300; + var10 = WorldMapData_0.getWidgetFlags(var6); // L: 7835 + boolean var9 = (var10 >> 29 & 1) != 0; // L: 7837 + if (var9) { // L: 7839 + break label296; } } } - if ((var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7163 7164 - var16 = 2; // L: 7165 + if ((var17 == 1 || !MusicPatchNode.mouseCam && var17 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7867 7868 + var17 = 2; // L: 7869 } - if ((var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) && menuOptionsCount > 0) { // L: 7168 - Widget.method4175(var2); // L: 7169 + if ((var17 == 1 || !MusicPatchNode.mouseCam && var17 == 4) && menuOptionsCount > 0) { // L: 7872 + EnumDefinition.method4721(var2); // L: 7873 } - if (var16 == 2 && menuOptionsCount > 0) { // L: 7171 + if (var17 == 2 && menuOptionsCount > 0) { // L: 7875 this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } - return; // L: 7173 + return; // L: 7877 } - if (BuddyRankComparator.dragInventoryWidget != null && !field788 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7145 7146 - SecureRandomFuture.method2211(draggedWidgetX, draggedWidgetY); // L: 7147 + if (GameBuild.dragInventoryWidget != null && !field830 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7841 7842 + var19 = draggedWidgetX; // L: 7843 + var10 = draggedWidgetY; // L: 7844 + MenuAction var11 = GrandExchangeOffer.tempMenuAction; // L: 7846 + Calendar.menuAction(var11.param0, var11.param1, var11.opcode, var11.identifier, var11.action, var11.action, var19, var10); // L: 7848 + GrandExchangeOffer.tempMenuAction = null; // L: 7850 } - field788 = false; // L: 7150 - itemDragDuration = 0; // L: 7151 - if (BuddyRankComparator.dragInventoryWidget != null) { // L: 7152 - class52.invalidateWidget(BuddyRankComparator.dragInventoryWidget); + field830 = false; // L: 7854 + itemDragDuration = 0; // L: 7855 + if (GameBuild.dragInventoryWidget != null) { // L: 7856 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(GameBuild.dragInventoryWidget); } - BuddyRankComparator.dragInventoryWidget = TileItem.getWidget(var5); // L: 7153 - dragItemSlotSource = var4; // L: 7154 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7155 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7156 - if (var2 >= 0) { // L: 7157 - ObjectSound.method1983(var2); + GameBuild.dragInventoryWidget = UserComparator4.getWidget(var5); // L: 7857 + dragItemSlotSource = var4; // L: 7858 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7859 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7860 + if (var2 >= 0) { // L: 7861 + AbstractByteArrayCopier.method4087(var2); } - class52.invalidateWidget(BuddyRankComparator.dragInventoryWidget); // L: 7158 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(GameBuild.dragInventoryWidget); // L: 7862 } } - } // L: 7159 + } // L: 7863 - @ObfuscatedName("hp") + @ObfuscatedName("hs") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-40940345" + garbageValue = "279427498" ) + @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = GrandExchangeOffer.method209(); // L: 7176 - boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 7177 - if (!var2) { // L: 7178 - boolean var3; - if (var1 < 0) { // L: 7181 - var3 = false; // L: 7182 - } else { - int var4 = menuOpcodes[var1]; // L: 7185 - if (var4 >= 2000) { // L: 7186 - var4 -= 2000; - } - - if (var4 == 1007) { // L: 7187 - var3 = true; // L: 7188 - } else { - var3 = false; // L: 7191 - } - } - - var2 = var3; // L: 7193 - } - - return var2 && !menuShiftClick[var1]; // L: 7195 + int var1 = FileSystem.method3638(); // L: 7880 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || WorldMapSectionType.method336(var1)) && !menuShiftClick[var1]; // L: 7881 } - @ObfuscatedName("ht") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-756667188" + descriptor = "(IIB)V", + garbageValue = "-4" ) + @Export("openMenu") final void openMenu(int var1, int var2) { - WorldMapSprite.method493(var1, var2); // L: 7199 - ScriptEvent.scene.menuOpen(Huffman.Client_plane, var1, var2, false); // L: 7200 - isMenuOpen = true; // L: 7201 - } // L: 7202 + KitDefinition.method4634(var1, var2); // L: 7885 + ModeWhere.scene.menuOpen(GrandExchangeOfferUnitPriceComparator.Client_plane, var1, var2, false); // L: 7886 + isMenuOpen = true; // L: 7887 + } // L: 7888 - @ObfuscatedName("ic") + @ObfuscatedName("il") @ObfuscatedSignature( descriptor = "(ZB)V", - garbageValue = "56" + garbageValue = "4" ) + @Export("resizeRoot") final void resizeRoot(boolean var1) { - int var2 = rootInterface; // L: 9185 - int var3 = FloorDecoration.canvasWidth; // L: 9186 - int var4 = GameShell.canvasHeight; // L: 9187 - if (WorldMapSprite.loadInterface(var2)) { // L: 9189 - KeyHandler.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 9190 - } + Fonts.method5463(rootInterface, ItemContainer.canvasWidth, HealthBar.canvasHeight, var1); // L: 9855 + } // L: 9856 - } // L: 9192 - - @ObfuscatedName("ip") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(Lhq;I)V", - garbageValue = "1722928474" + descriptor = "(Lht;B)V", + garbageValue = "121" ) + @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : TileItem.getWidget(var1.parentId); // L: 9195 + Widget var2 = var1.parentId == -1 ? null : UserComparator4.getWidget(var1.parentId); // L: 9859 int var3; int var4; - if (var2 == null) { // L: 9198 - var3 = FloorDecoration.canvasWidth; // L: 9199 - var4 = GameShell.canvasHeight; // L: 9200 + if (var2 == null) { // L: 9862 + var3 = ItemContainer.canvasWidth; // L: 9863 + var4 = HealthBar.canvasHeight; // L: 9864 } else { - var3 = var2.width; // L: 9203 - var4 = var2.height; // L: 9204 + var3 = var2.width; // L: 9867 + var4 = var2.height; // L: 9868 } - MouseRecorder.alignWidgetSize(var1, var3, var4, false); // L: 9206 - DirectByteArrayCopier.alignWidgetPosition(var1, var3, var4); // L: 9207 - } // L: 9208 + WorldMapIcon_0.alignWidgetSize(var1, var3, var4, false); // L: 9870 + FileSystem.alignWidgetPosition(var1, var3, var4); // L: 9871 + } // L: 9872 - @ObfuscatedName("ju") + @ObfuscatedName("jn") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "10" + descriptor = "(I)V", + garbageValue = "1835347071" ) - final void method1458() { - class52.invalidateWidget(clickedWidget); // L: 10175 - ++BoundaryObject.widgetDragDuration; // L: 10176 - if (field880 && field799) { // L: 10177 - int var1 = MouseHandler.MouseHandler_x; // L: 10183 - int var2 = MouseHandler.MouseHandler_y; // L: 10184 - var1 -= widgetClickX; // L: 10185 - var2 -= widgetClickY; // L: 10186 - if (var1 < field856) { // L: 10187 - var1 = field856; + final void method1405() { + GrandExchangeOfferOwnWorldComparator.invalidateWidget(clickedWidget); // L: 10918 + ++GrandExchangeEvent.widgetDragDuration; // L: 10919 + if (field705 && field859) { // L: 10920 + int var1 = MouseHandler.MouseHandler_x; // L: 10926 + int var2 = MouseHandler.MouseHandler_y; // L: 10927 + var1 -= widgetClickX; // L: 10928 + var2 -= widgetClickY; // L: 10929 + if (var1 < field860) { // L: 10930 + var1 = field860; } - if (var1 + clickedWidget.width > field856 + clickedWidgetParent.width) { // L: 10188 - var1 = field856 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field860 + clickedWidgetParent.width) { // L: 10931 + var1 = field860 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field785) { // L: 10189 - var2 = field785; + if (var2 < field861) { // L: 10932 + var2 = field861; } - if (var2 + clickedWidget.height > field785 + clickedWidgetParent.height) { // L: 10190 - var2 = field785 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field861 + clickedWidgetParent.height) { // L: 10933 + var2 = field861 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field859; // L: 10191 - int var4 = var2 - field795; // L: 10192 - int var5 = clickedWidget.dragZoneSize; // L: 10193 - if (BoundaryObject.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10194 10195 - isDraggingWidget = true; // L: 10196 + int var3 = var1 - field931; // L: 10934 + int var4 = var2 - field701; // L: 10935 + int var5 = clickedWidget.dragZoneSize; // L: 10936 + if (GrandExchangeEvent.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10937 10938 + isDraggingWidget = true; // L: 10939 } - int var6 = var1 - field856 + clickedWidgetParent.scrollX; // L: 10199 - int var7 = var2 - field785 + clickedWidgetParent.scrollY; // L: 10200 + int var6 = var1 - field860 + clickedWidgetParent.scrollX; // L: 10942 + int var7 = var2 - field861 + clickedWidgetParent.scrollY; // L: 10943 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10201 - var8 = new ScriptEvent(); // L: 10202 - var8.widget = clickedWidget; // L: 10203 - var8.mouseX = var6; // L: 10204 - var8.mouseY = var7; // L: 10205 - var8.args = clickedWidget.onDrag; // L: 10206 - Script.runScriptEvent(var8); // L: 10207 + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10944 + var8 = new ScriptEvent(); // L: 10945 + var8.widget = clickedWidget; // L: 10946 + var8.mouseX = var6; // L: 10947 + var8.mouseY = var7; // L: 10948 + var8.args = clickedWidget.onDrag; // L: 10949 + Entity.runScriptEvent(var8); // L: 10950 } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10209 - if (isDraggingWidget) { // L: 10210 - if (clickedWidget.onDragComplete != null) { // L: 10211 - var8 = new ScriptEvent(); // L: 10212 - var8.widget = clickedWidget; // L: 10213 - var8.mouseX = var6; // L: 10214 - var8.mouseY = var7; // L: 10215 - var8.dragTarget = draggedOnWidget; // L: 10216 - var8.args = clickedWidget.onDragComplete; // L: 10217 - Script.runScriptEvent(var8); // L: 10218 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10952 + if (isDraggingWidget) { // L: 10953 + if (clickedWidget.onDragComplete != null) { // L: 10954 + var8 = new ScriptEvent(); // L: 10955 + var8.widget = clickedWidget; // L: 10956 + var8.mouseX = var6; // L: 10957 + var8.mouseY = var7; // L: 10958 + var8.dragTarget = draggedOnWidget; // L: 10959 + var8.args = clickedWidget.onDragComplete; // L: 10960 + Entity.runScriptEvent(var8); // L: 10961 } - if (draggedOnWidget != null && ReflectionCheck.method2381(clickedWidget) != null) { // L: 10220 - PacketBufferNode var9 = getPacketBufferNode(ClientPacket.field2266, packetWriter.isaacCipher); // L: 10222 - var9.packetBuffer.writeInt(draggedOnWidget.id); // L: 10223 - var9.packetBuffer.method5663(clickedWidget.id); // L: 10224 - var9.packetBuffer.method5665(clickedWidget.childIndex); // L: 10225 - var9.packetBuffer.method5653(draggedOnWidget.itemId); // L: 10226 - var9.packetBuffer.method5653(draggedOnWidget.childIndex); // L: 10227 - var9.packetBuffer.method5653(clickedWidget.itemId); // L: 10228 - packetWriter.addNode(var9); // L: 10229 + if (draggedOnWidget != null) { // L: 10963 + Widget var15 = clickedWidget; // L: 10965 + int var11 = WorldMapData_0.getWidgetFlags(var15); // L: 10968 + int var16 = var11 >> 17 & 7; // L: 10970 + int var12 = var16; // L: 10972 + Widget var17; + if (var16 == 0) { // L: 10973 + var17 = null; // L: 10974 + } else { + int var13 = 0; + + while (true) { + if (var13 >= var12) { + var17 = var15; // L: 10984 + break; + } + + var15 = UserComparator4.getWidget(var15.parentId); // L: 10978 + if (var15 == null) { // L: 10979 + var17 = null; // L: 10980 + break; // L: 10981 + } + + ++var13; // L: 10977 + } + } + + if (var17 != null) { // L: 10986 + PacketBufferNode var18 = class4.getPacketBufferNode(ClientPacket.field2315, packetWriter.isaacCipher); // L: 10988 + var18.packetBuffer.method5682(draggedOnWidget.id); // L: 10989 + var18.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 10990 + var18.packetBuffer.method5673(clickedWidget.itemId); // L: 10991 + var18.packetBuffer.method5673(clickedWidget.childIndex); // L: 10992 + var18.packetBuffer.method5674(draggedOnWidget.childIndex); // L: 10993 + var18.packetBuffer.method5684(clickedWidget.id); // L: 10994 + packetWriter.addNode(var18); // L: 10995 + } } - } else if (this.shouldLeftClickOpenMenu()) { // L: 10233 - this.openMenu(widgetClickX + field859, field795 + widgetClickY); // L: 10234 - } else if (menuOptionsCount > 0) { // L: 10236 - SecureRandomFuture.method2211(widgetClickX + field859, widgetClickY + field795); // L: 10237 + } else if (this.shouldLeftClickOpenMenu()) { // L: 11000 + this.openMenu(widgetClickX + field931, field701 + widgetClickY); // L: 11001 + } else if (menuOptionsCount > 0) { // L: 11003 + int var14 = widgetClickX + field931; // L: 11004 + int var9 = widgetClickY + field701; // L: 11005 + MenuAction var10 = GrandExchangeOffer.tempMenuAction; // L: 11007 + Calendar.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var14, var9); // L: 11009 + GrandExchangeOffer.tempMenuAction = null; // L: 11011 } - clickedWidget = null; // L: 10240 + clickedWidget = null; // L: 11015 } } else { - if (BoundaryObject.widgetDragDuration > 1) { // L: 10178 - clickedWidget = null; // L: 10179 + if (GrandExchangeEvent.widgetDragDuration > 1) { // L: 10921 + clickedWidget = null; // L: 10922 } } - } // L: 10181 10242 + } // L: 10924 11017 - @ObfuscatedName("ks") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(I)Lku;", - garbageValue = "1348007061" + descriptor = "(B)Lkm;", + garbageValue = "104" ) + @Export("username") public Username username() { - return WorldMapLabelSize.localPlayer != null ? WorldMapLabelSize.localPlayer.username : null; // L: 10858 + return PlayerType.localPlayer != null ? PlayerType.localPlayer.username : null; // L: 11642 } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-2048198145" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "89" ) - public static int method1789(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 - if ((var1 & 1) != 0) { - var2 = var0 * var2; // L: 26 + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "3" + ) + static final void method1838(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 64 + for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 65 + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 66 + class299.field3679[0][var5][var4] = 127; // L: 67 + if (var0 == var5 && var5 > 0) { // L: 68 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var5 == var0 + var2 && var5 < 103) { // L: 69 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { // L: 70 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var3 + var1 == var4 && var4 < 103) { // L: 71 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } } - - var0 *= var0; } - if (var1 == 1) { - return var0 * var2; - } else { - return var2; - } - } + } // L: 75 - @ObfuscatedName("k") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(DDII)[D", - garbageValue = "1556840096" + descriptor = "(Lde;I)V", + garbageValue = "964773449" ) - public static double[] method1378(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; // L: 18 - double[] var6 = new double[var5]; // L: 19 - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - var6[var8] = class278.method5090((double)var7, var0, var2); // L: 21 - ++var7; // L: 20 + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 259 + if (var0.sound != null) { // L: 260 + var0.sound.position = 0; } - return var6; // L: 23 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lgf;Llh;I)Lgb;", - garbageValue = "-1510216701" - ) - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = ItemContainer.method1226(); // L: 27 - var2.clientPacket = var0; // L: 28 - var2.clientPacketLength = var0.length; // L: 29 - if (var2.clientPacketLength == -1) { // L: 30 - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); // L: 31 - } else if (var2.clientPacketLength <= 18) { // L: 32 - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { // L: 33 - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); // L: 34 + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 261 } - var2.packetBuffer.setIsaacCipher(var1); // L: 35 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 - var2.index = 0; // L: 37 - return var2; // L: 38 - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "887338283" - ) - static boolean method1792() { - return (drawPlayerNames & 1) != 0; // L: 4405 - } + } // L: 262 } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index dc3de4df90..03dd9bf170 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -1,674 +1,782 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gz") +@Implements("ClientPacket") public class ClientPacket implements class190 { + @ObfuscatedName("ph") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2238; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2237; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2313; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2234; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2267; + public static final ClientPacket field2329; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2236; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" + ) + static final ClientPacket field2307; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2288; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2239; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2330; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2324; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2242; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2243; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2244; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2245; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2246; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lgz;" ) public static final ClientPacket field2247; @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) public static final ClientPacket field2248; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2249; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2250; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2252; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2329; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2255; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2341; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2258; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2259; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - static final ClientPacket field2316; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2261; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2262; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2263; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2264; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2253; - @ObfuscatedName("r") + public static final ClientPacket field2249; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2337; - @ObfuscatedName("u") + public static final ClientPacket field2250; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2321; - @ObfuscatedName("p") + public static final ClientPacket field2251; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2293; - @ObfuscatedName("b") + public static final ClientPacket field2252; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2269; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2270; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2299; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2272; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2274; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2275; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2290; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2277; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2319; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2279; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2280; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2281; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2282; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2283; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) public static final ClientPacket field2284; - @ObfuscatedName("ah") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2285; - @ObfuscatedName("av") + public static final ClientPacket field2254; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2296; - @ObfuscatedName("ax") + public static final ClientPacket field2274; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2271; - @ObfuscatedName("as") + public static final ClientPacket field2256; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2288; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2347; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2278; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2336; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2292; - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2303; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2307; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2294; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2291; + public static final ClientPacket field2257; @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2297; - @ObfuscatedName("bl") + public static final ClientPacket field2258; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lgf;" - ) - static final ClientPacket field2298; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2265; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2300; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2301; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2302; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2340; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2304; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2305; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2246; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - static final ClientPacket field2295; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2260; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2309; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2310; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2311; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2312; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2313; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2314; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2315; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2339; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2317; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2318; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2325; - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2320; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2276; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2322; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2323; - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2324; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2268; - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2326; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2327; - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2328; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2266; - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2330; - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2331; - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2332; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2333; - @ObfuscatedName("cw") - @ObfuscatedSignature( - descriptor = "Lgf;" - ) - public static final ClientPacket field2334; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) public static final ClientPacket field2335; - @ObfuscatedName("cc") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2287; - @ObfuscatedName("cf") + public static final ClientPacket field2260; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2342; - @ObfuscatedName("cj") + public static final ClientPacket field2261; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2338; - @ObfuscatedName("cd") + public static final ClientPacket field2262; + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" + ) + public static final ClientPacket field2263; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2264; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2265; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2290; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2267; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2268; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2269; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2270; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2271; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2272; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2298; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2282; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2275; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + static final ClientPacket field2295; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2277; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2240; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2279; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2280; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2281; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2315; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + static final ClientPacket field2283; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2255; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2285; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lgz;" ) public static final ClientPacket field2286; - @ObfuscatedName("cx") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2348; - @ObfuscatedName("cp") + public static final ClientPacket field2325; + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" + ) + public static final ClientPacket field2331; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lgz;" ) public static final ClientPacket field2289; - @ObfuscatedName("ch") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" + ) + public static final ClientPacket field2334; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2291; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2292; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2293; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2294; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2253; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2296; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2297; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2276; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2312; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2300; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2301; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + static final ClientPacket field2302; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2303; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2304; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2306; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2241; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2318; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lgz;" ) public static final ClientPacket field2308; @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2343; - @ObfuscatedName("ck") + public static final ClientPacket field2309; + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2344; - @ObfuscatedName("co") + public static final ClientPacket field2310; + @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2345; + public static final ClientPacket field2311; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2323; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2322; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2314; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2299; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2316; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2317; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2266; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2319; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2320; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2321; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2233; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + static final ClientPacket field2231; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2305; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2287; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2326; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2327; + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2328; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2259; @ObfuscatedName("cz") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgz;" ) - public static final ClientPacket field2346; - @ObfuscatedName("cy") + public static final ClientPacket field2332; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2235; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2232; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lgz;" + ) + public static final ClientPacket field2333; + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -1495788607 + intValue = -1312212621 ) + @Export("id") final int id; - @ObfuscatedName("cb") + @ObfuscatedName("dg") @ObfuscatedGetter( - intValue = -1365749519 + intValue = 848809965 ) + @Export("length") final int length; static { - field2267 = new ClientPacket(0, 0); // L: 5 - field2247 = new ClientPacket(1, 8); // L: 6 - field2248 = new ClientPacket(2, 7); // L: 7 - field2249 = new ClientPacket(3, -2); // L: 8 - field2250 = new ClientPacket(4, -1); // L: 9 - field2251 = new ClientPacket(5, 4); // L: 10 - field2252 = new ClientPacket(6, 7); // L: 11 - field2329 = new ClientPacket(7, -1); // L: 12 - field2254 = new ClientPacket(8, 16); // L: 13 - field2255 = new ClientPacket(9, 8); // L: 14 - field2341 = new ClientPacket(10, 5); // L: 15 - field2257 = new ClientPacket(11, -1); // L: 16 - field2258 = new ClientPacket(12, 0); // L: 17 - field2259 = new ClientPacket(13, 8); // L: 18 - field2316 = new ClientPacket(14, 2); // L: 19 - field2261 = new ClientPacket(15, 8); // L: 20 - field2262 = new ClientPacket(16, 10); // L: 21 - field2263 = new ClientPacket(17, 8); // L: 22 - field2264 = new ClientPacket(18, 4); // L: 23 - field2253 = new ClientPacket(19, 8); // L: 24 - field2337 = new ClientPacket(20, 8); // L: 25 - field2321 = new ClientPacket(21, 3); // L: 26 - field2293 = new ClientPacket(22, 2); // L: 27 - field2269 = new ClientPacket(23, -1); // L: 28 - field2270 = new ClientPacket(24, 3); // L: 29 - field2273 = new ClientPacket(25, -1); // L: 30 - field2299 = new ClientPacket(26, 1); // L: 31 - field2272 = new ClientPacket(27, 3); // L: 32 - field2274 = new ClientPacket(28, 3); // L: 33 - field2275 = new ClientPacket(29, 16); // L: 34 - field2290 = new ClientPacket(30, 0); // L: 35 - field2277 = new ClientPacket(31, 8); // L: 36 - field2319 = new ClientPacket(32, -1); // L: 37 - field2279 = new ClientPacket(33, 3); // L: 38 - field2280 = new ClientPacket(34, 3); // L: 39 - field2281 = new ClientPacket(35, 7); // L: 40 - field2282 = new ClientPacket(36, 7); // L: 41 - field2283 = new ClientPacket(37, 3); // L: 42 - field2284 = new ClientPacket(38, -2); // L: 43 - field2285 = new ClientPacket(39, 11); // L: 44 - field2296 = new ClientPacket(40, -1); // L: 45 - field2271 = new ClientPacket(41, -1); // L: 46 - field2288 = new ClientPacket(42, -1); // L: 47 - field2347 = new ClientPacket(43, 3); // L: 48 - field2278 = new ClientPacket(44, 8); // L: 49 - field2336 = new ClientPacket(45, 0); // L: 50 - field2292 = new ClientPacket(46, 15); // L: 51 - field2303 = new ClientPacket(47, 13); // L: 52 - field2307 = new ClientPacket(48, 13); // L: 53 - field2294 = new ClientPacket(49, 9); // L: 54 - field2291 = new ClientPacket(50, 8); // L: 55 - field2297 = new ClientPacket(51, 3); // L: 56 - field2298 = new ClientPacket(52, 7); // L: 57 - field2265 = new ClientPacket(53, 3); // L: 58 - field2300 = new ClientPacket(54, 8); // L: 59 - field2301 = new ClientPacket(55, 9); // L: 60 - field2302 = new ClientPacket(56, 11); // L: 61 - field2340 = new ClientPacket(57, 8); // L: 62 - field2304 = new ClientPacket(58, 8); // L: 63 - field2305 = new ClientPacket(59, 8); // L: 64 - field2246 = new ClientPacket(60, 3); // L: 65 - field2295 = new ClientPacket(61, -1); // L: 66 - field2260 = new ClientPacket(62, 7); // L: 67 - field2309 = new ClientPacket(63, 9); // L: 68 - field2310 = new ClientPacket(64, 7); // L: 69 - field2311 = new ClientPacket(65, 2); // L: 70 - field2312 = new ClientPacket(66, 6); // L: 71 - field2313 = new ClientPacket(67, 8); // L: 72 - field2314 = new ClientPacket(68, 8); // L: 73 - field2315 = new ClientPacket(69, -1); // L: 74 - field2339 = new ClientPacket(70, -1); // L: 75 - field2317 = new ClientPacket(71, -1); // L: 76 - field2318 = new ClientPacket(72, 0); // L: 77 - field2325 = new ClientPacket(73, 13); // L: 78 - field2320 = new ClientPacket(74, 3); // L: 79 - field2276 = new ClientPacket(75, 6); // L: 80 - field2322 = new ClientPacket(76, -1); // L: 81 - field2323 = new ClientPacket(77, 7); // L: 82 - field2324 = new ClientPacket(78, -1); // L: 83 - field2268 = new ClientPacket(79, 8); // L: 84 - field2326 = new ClientPacket(80, 2); // L: 85 - field2327 = new ClientPacket(81, 9); // L: 86 - field2328 = new ClientPacket(82, 7); // L: 87 - field2266 = new ClientPacket(83, 16); // L: 88 - field2330 = new ClientPacket(84, 8); // L: 89 - field2331 = new ClientPacket(85, 8); // L: 90 - field2332 = new ClientPacket(86, 4); // L: 91 - field2333 = new ClientPacket(87, 3); // L: 92 - field2334 = new ClientPacket(88, 4); // L: 93 - field2335 = new ClientPacket(89, 14); // L: 94 - field2287 = new ClientPacket(90, 7); // L: 95 - field2342 = new ClientPacket(91, -1); // L: 96 - field2338 = new ClientPacket(92, 2); // L: 97 - field2286 = new ClientPacket(93, 8); // L: 98 - field2348 = new ClientPacket(94, 15); // L: 99 - field2289 = new ClientPacket(95, 4); // L: 100 - field2308 = new ClientPacket(96, -2); // L: 101 - field2343 = new ClientPacket(97, 3); // L: 102 - field2344 = new ClientPacket(98, -1); // L: 103 - field2345 = new ClientPacket(99, -1); // L: 104 - field2346 = new ClientPacket(100, 7); // L: 105 + field2238 = new ClientPacket(0, 16); // L: 5 + field2237 = new ClientPacket(1, -1); // L: 6 + field2313 = new ClientPacket(2, 8); // L: 7 + field2234 = new ClientPacket(3, -1); // L: 8 + field2329 = new ClientPacket(4, -1); // L: 9 + field2236 = new ClientPacket(5, 14); // L: 10 + field2307 = new ClientPacket(6, -1); // L: 11 + field2288 = new ClientPacket(7, 7); // L: 12 + field2239 = new ClientPacket(8, 3); // L: 13 + field2330 = new ClientPacket(9, 4); // L: 14 + field2324 = new ClientPacket(10, 3); // L: 15 + field2242 = new ClientPacket(11, 8); // L: 16 + field2243 = new ClientPacket(12, 8); // L: 17 + field2244 = new ClientPacket(13, 3); // L: 18 + field2245 = new ClientPacket(14, 3); // L: 19 + field2246 = new ClientPacket(15, 7); // L: 20 + field2247 = new ClientPacket(16, 0); // L: 21 + field2248 = new ClientPacket(17, 8); // L: 22 + field2249 = new ClientPacket(18, 7); + field2250 = new ClientPacket(19, 8); + field2251 = new ClientPacket(20, 8); + field2252 = new ClientPacket(21, 8); + field2284 = new ClientPacket(22, 2); + field2254 = new ClientPacket(23, 3); + field2274 = new ClientPacket(24, 8); + field2256 = new ClientPacket(25, 8); + field2257 = new ClientPacket(26, 7); // L: 31 + field2258 = new ClientPacket(27, 7); // L: 32 + field2335 = new ClientPacket(28, 13); // L: 33 + field2260 = new ClientPacket(29, -1); // L: 34 + field2261 = new ClientPacket(30, 13); // L: 35 + field2262 = new ClientPacket(31, 0); // L: 36 + field2263 = new ClientPacket(32, 8); // L: 37 + field2264 = new ClientPacket(33, 3); // L: 38 + field2265 = new ClientPacket(34, 7); // L: 39 + field2290 = new ClientPacket(35, 3); // L: 40 + field2267 = new ClientPacket(36, 9); // L: 41 + field2268 = new ClientPacket(37, 4); // L: 42 + field2269 = new ClientPacket(38, -1); // L: 43 + field2270 = new ClientPacket(39, -1); // L: 44 + field2271 = new ClientPacket(40, 0); // L: 45 + field2272 = new ClientPacket(41, 5); // L: 46 + field2298 = new ClientPacket(42, 8); // L: 47 + field2282 = new ClientPacket(43, 13); // L: 48 + field2275 = new ClientPacket(44, 9); // L: 49 + field2295 = new ClientPacket(45, 7); // L: 50 + field2277 = new ClientPacket(46, 8); // L: 51 + field2240 = new ClientPacket(47, -1); // L: 52 + field2279 = new ClientPacket(48, -1); // L: 53 + field2280 = new ClientPacket(49, 3); // L: 54 + field2281 = new ClientPacket(50, 3); // L: 55 + field2315 = new ClientPacket(51, 16); // L: 56 + field2283 = new ClientPacket(52, -1); // L: 57 + field2255 = new ClientPacket(53, -2); // L: 58 + field2285 = new ClientPacket(54, 8); // L: 59 + field2286 = new ClientPacket(55, 4); // L: 60 + field2325 = new ClientPacket(56, 3); // L: 61 + field2331 = new ClientPacket(57, -1); // L: 62 + field2289 = new ClientPacket(58, 8); // L: 63 + field2334 = new ClientPacket(59, -1); // L: 64 + field2291 = new ClientPacket(60, 8); // L: 65 + field2292 = new ClientPacket(61, 4); // L: 66 + field2293 = new ClientPacket(62, 15); // L: 67 + field2294 = new ClientPacket(63, 8); // L: 68 + field2253 = new ClientPacket(64, 6); // L: 69 + field2296 = new ClientPacket(65, 10); // L: 70 + field2297 = new ClientPacket(66, 8); // L: 71 + field2276 = new ClientPacket(67, 8); // L: 72 + field2312 = new ClientPacket(68, 1); // L: 73 + field2300 = new ClientPacket(69, 8); // L: 74 + field2301 = new ClientPacket(70, 7); // L: 75 + field2302 = new ClientPacket(71, -1); // L: 76 + field2303 = new ClientPacket(72, -1); // L: 77 + field2304 = new ClientPacket(73, 9); // L: 78 + field2306 = new ClientPacket(74, 7); // L: 79 + field2241 = new ClientPacket(75, -1); // L: 80 + field2318 = new ClientPacket(76, -1); // L: 81 + field2308 = new ClientPacket(77, 3); // L: 82 + field2309 = new ClientPacket(78, 9); + field2310 = new ClientPacket(79, -2); + field2311 = new ClientPacket(80, 3); + field2323 = new ClientPacket(81, 3); + field2322 = new ClientPacket(82, 6); + field2314 = new ClientPacket(83, -1); + field2299 = new ClientPacket(84, 15); + field2316 = new ClientPacket(85, 2); + field2317 = new ClientPacket(86, 2); + field2266 = new ClientPacket(87, 8); + field2319 = new ClientPacket(88, 0); + field2320 = new ClientPacket(89, 0); + field2321 = new ClientPacket(90, 4); + field2233 = new ClientPacket(91, 2); + field2231 = new ClientPacket(92, 2); + field2305 = new ClientPacket(93, 7); + field2287 = new ClientPacket(94, -1); + field2326 = new ClientPacket(95, -2); + field2327 = new ClientPacket(96, -1); + field2328 = new ClientPacket(97, 11); + field2259 = new ClientPacket(98, 7); + field2332 = new ClientPacket(99, 11); + field2235 = new ClientPacket(100, 3); // L: 105 + field2232 = new ClientPacket(101, 16); // L: 106 + field2333 = new ClientPacket(102, -1); // L: 107 } ClientPacket(int var1, int var2) { - this.id = var1; // L: 110 - this.length = var2; // L: 111 - } // L: 112 + this.id = var1; + this.length = var2; + } - @ObfuscatedName("fg") + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IS)Ljo;", + garbageValue = "29667" + ) + @Export("StructDefinition_getStructDefinition") + public static StructDefinition StructDefinition_getStructDefinition(int var0) { + StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); // L: 25 + var1 = new StructDefinition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 28 + StructDefinition.StructDefinition_cached.put(var1, (long)var0); // L: 29 + return var1; // L: 30 + } + } + + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2030904822" + garbageValue = "711631648" ) - static final void method3706() { - int[] var0 = Players.Players_indices; // L: 3405 - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3406 - Player var4 = Client.players[var0[var1]]; // L: 3407 - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3408 - --var4.overheadTextCyclesRemaining; // L: 3409 - if (var4.overheadTextCyclesRemaining == 0) { // L: 3410 - var4.overheadText = null; + static void method3745() { + try { + File var0 = new File(class52.userHomeDirectory, "random.dat"); // L: 281 + int var2; + if (var0.exists()) { // L: 282 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 283 + } else { + label38: + for (int var1 = 0; var1 < Client.field957.length; ++var1) { // L: 286 + for (var2 = 0; var2 < GrandExchangeEvents.field68.length; ++var2) { // L: 287 + File var3 = new File(GrandExchangeEvents.field68[var2] + Client.field957[var1] + File.separatorChar + "random.dat"); // L: 288 + if (var3.exists()) { // L: 289 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 290 + break label38; // L: 291 + } + } } } - } - for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3413 - int var2 = Client.npcIndices[var1]; // L: 3414 - NPC var3 = Client.npcs[var2]; // L: 3415 - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3416 - --var3.overheadTextCyclesRemaining; // L: 3417 - if (var3.overheadTextCyclesRemaining == 0) { // L: 3418 - var3.overheadText = null; - } + if (JagexCache.JagexCache_randomDat == null) { // L: 296 + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 297 + var2 = var4.read(); // L: 298 + var4.seek(0L); // L: 299 + var4.write(var2); // L: 300 + var4.seek(0L); // L: 301 + var4.close(); // L: 302 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 303 } + } catch (IOException var5) { // L: 306 } - } // L: 3421 + } // L: 307 - @ObfuscatedName("jd") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-100" + descriptor = "([BI)Lco;", + garbageValue = "-1523199610" ) - static final void runIntfCloseListeners(int var0, int var1) { - if (WorldMapSprite.loadInterface(var0)) { // L: 10110 - WorldMapAreaData.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10111 + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 83 + Buffer var2 = new Buffer(var0); // L: 84 + var2.offset = var2.array.length - 2; // L: 85 + int var3 = var2.readUnsignedShort(); // L: 86 + int var4 = var2.array.length - 2 - var3 - 12; // L: 87 + var2.offset = var4; // L: 88 + int var5 = var2.readInt(); // L: 89 + var1.localIntCount = var2.readUnsignedShort(); // L: 90 + var1.localStringCount = var2.readUnsignedShort(); // L: 91 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 92 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 93 + int var6 = var2.readUnsignedByte(); // L: 94 + int var7; + int var8; + if (var6 > 0) { // L: 95 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 96 + + for (var7 = 0; var7 < var6; ++var7) { // L: 97 + var8 = var2.readUnsignedShort(); // L: 98 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? WorldMapData_0.method266(var8) : 1); // L: 99 + var1.switches[var7] = var9; // L: 100 + + while (var8-- > 0) { // L: 101 + int var10 = var2.readInt(); // L: 102 + int var11 = var2.readInt(); // L: 103 + var9.put(new IntegerNode(var11), (long)var10); // L: 104 + } + } } - } // L: 10112 + + var2.offset = 0; // L: 108 + var2.readStringCp1252NullTerminatedOrNull(); // L: 109 + var1.opcodes = new int[var5]; // L: 110 + var1.intOperands = new int[var5]; // L: 111 + var1.stringOperands = new String[var5]; // L: 112 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 113 114 119 + var8 = var2.readUnsignedShort(); // L: 115 + if (var8 == 3) { // L: 116 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { // L: 117 + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 118 + } + } + + return var1; // L: 121 + } + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1900705803" + ) + static final void method3744() { + Client.field875 = Client.cycleCntr; // L: 11489 + ClanChat_inClanChat = true; // L: 11490 + } // L: 11491 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index c2ed19c619..1de4548820 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -1,41 +1,46 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map.Entry; +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("ce") +@ObfuscatedName("cp") +@Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("ot") - @ObfuscatedSignature( - descriptor = "Lco;" + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 297838275 ) - static Varcs varcs; + @Export("ClientPreferences_optionCount") + static int ClientPreferences_optionCount; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + static Bounds field1089; + @ObfuscatedName("l") + @Export("roofsHidden") + boolean roofsHidden; + @ObfuscatedName("m") + @Export("titleMusicDisabled") + boolean titleMusicDisabled; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1940309873 - ) - static int ClientPreferences_optionCount; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "[Lls;" - ) - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("s") - boolean roofsHidden; - @ObfuscatedName("t") - boolean titleMusicDisabled; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1674568027 + intValue = 183452859 ) + @Export("windowMode") int windowMode; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("parameters") LinkedHashMap parameters; static { @@ -47,11 +52,11 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1907(true); // L: 21 + this.method1948(true); // L: 21 } // L: 22 @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; // L: 15 @@ -91,27 +96,28 @@ public class ClientPreferences { this.hideUsername = var1.readBoolean(); // L: 53 } } else { - this.method1907(true); // L: 31 + this.method1948(true); // L: 31 } } else { - this.method1907(true); // L: 26 + this.method1948(true); // L: 26 } } // L: 57 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "124970777" + descriptor = "(ZB)V", + garbageValue = "120" ) - void method1907(boolean var1) { + void method1948(boolean var1) { } // L: 59 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Lkf;", - garbageValue = "1981106247" + descriptor = "(I)Lkb;", + garbageValue = "-948717510" ) + @Export("toBuffer") Buffer toBuffer() { Buffer var1 = new Buffer(100); // L: 62 var1.writeByte(ClientPreferences_optionCount); // L: 63 diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 2470bdcf12..997e07f28c 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,213 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") +@ObfuscatedName("ft") +@Implements("Clock") public abstract class Clock { Clock() { } // L: 4 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "208275261" + garbageValue = "345512591" ) + @Export("mark") public abstract void mark(); - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-16016139" + garbageValue = "-837141414" ) + @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("ik") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "24" + descriptor = "(II)Ljn;", + garbageValue = "-1793250808" ) - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - GrandExchangeEvent.scrollBarSprites[0].drawAt(var0, var1); // L: 9309 - GrandExchangeEvent.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 9310 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field739); // L: 9311 - int var5 = var3 * (var3 - 32) / var4; // L: 9312 - if (var5 < 8) { // L: 9313 - var5 = 8; + @Export("getNpcDefinition") + public static NPCDefinition getNpcDefinition(int var0) { + NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); // L: 57 + if (var1 != null) { // L: 58 + return var1; + } else { + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); // L: 59 + var1 = new NPCDefinition(); // L: 60 + var1.id = var0; // L: 61 + if (var2 != null) { // L: 62 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 63 + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); // L: 64 + return var1; // L: 65 } + } - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 9314 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field670); // L: 9315 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field742); // L: 9316 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field742); // L: 9317 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field742); // L: 9318 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field742); // L: 9319 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field741); // L: 9320 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field741); // L: 9321 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field741); // L: 9322 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field741); // L: 9323 - } // L: 9324 - - @ObfuscatedName("je") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "59" + descriptor = "(B)Z", + garbageValue = "34" ) - static final void changeGameOptions(int var0) { - DevicePcmPlayerProvider.method897(); // L: 10348 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 10350 - if (var1.obj != null) { // L: 10351 - var1.set(); + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 183 + if (KeyHandler.field428 == KeyHandler.field415) { // L: 184 + return false; + } else { + SecureRandomCallable.field555 = KeyHandler.field425[KeyHandler.field415]; // L: 185 + WorldMapManager.field335 = KeyHandler.field424[KeyHandler.field415]; // L: 186 + KeyHandler.field415 = KeyHandler.field415 + 1 & 127; // L: 187 + return true; // L: 188 } } - - int var4 = class195.VarpDefinition_get(var0).type; // L: 10354 - if (var4 != 0) { // L: 10355 - int var2 = Varps.Varps_main[var0]; // L: 10356 - if (var4 == 1) { // L: 10357 - if (var2 == 1) { // L: 10358 - Rasterizer3D.Rasterizer3D_setBrightness(0.9D); // L: 10359 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); // L: 10360 - } - - if (var2 == 2) { // L: 10362 - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 10363 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); // L: 10364 - } - - if (var2 == 3) { // L: 10366 - Rasterizer3D.Rasterizer3D_setBrightness(0.7D); // L: 10367 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); // L: 10368 - } - - if (var2 == 4) { // L: 10370 - Rasterizer3D.Rasterizer3D_setBrightness(0.6D); // L: 10371 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); // L: 10372 - } - - ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 10375 - } - - if (var4 == 3) { // L: 10378 - short var3 = 0; // L: 10379 - if (var2 == 0) { // L: 10380 - var3 = 255; - } - - if (var2 == 1) { // L: 10381 - var3 = 192; - } - - if (var2 == 2) { // L: 10382 - var3 = 128; - } - - if (var2 == 3) { // L: 10383 - var3 = 64; - } - - if (var2 == 4) { // L: 10384 - var3 = 0; - } - - if (var3 != Client.musicVolume) { // L: 10385 - if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 10386 - Script.method2322(CollisionMap.archive6, Client.currentTrackGroupId, 0, var3, false); // L: 10387 - Client.field704 = false; // L: 10388 - } else if (var3 == 0) { // L: 10390 - class206.midiPcmStream.clear(); // L: 10392 - class206.musicPlayerStatus = 1; // L: 10393 - class204.musicTrackArchive = null; // L: 10394 - Client.field704 = false; // L: 10396 - } else { - GrandExchangeEvents.method150(var3); // L: 10398 - } - - Client.musicVolume = var3; // L: 10399 - } - } - - if (var4 == 4) { // L: 10402 - if (var2 == 0) { // L: 10403 - Client.soundEffectVolume = 127; - } - - if (var2 == 1) { // L: 10404 - Client.soundEffectVolume = 96; - } - - if (var2 == 2) { // L: 10405 - Client.soundEffectVolume = 64; - } - - if (var2 == 3) { // L: 10406 - Client.soundEffectVolume = 32; - } - - if (var2 == 4) { // L: 10407 - Client.soundEffectVolume = 0; - } - } - - if (var4 == 5) { // L: 10409 - Client.leftClickOpensMenu = var2; - } - - if (var4 == 6) { // L: 10410 - Client.chatEffects = var2; - } - - if (var4 == 9) { // L: 10411 - Client.field707 = var2; - } - - if (var4 == 10) { // L: 10412 - if (var2 == 0) { // L: 10413 - Client.areaSoundEffectVolume = 127; - } - - if (var2 == 1) { // L: 10414 - Client.areaSoundEffectVolume = 96; - } - - if (var2 == 2) { // L: 10415 - Client.areaSoundEffectVolume = 64; - } - - if (var2 == 3) { // L: 10416 - Client.areaSoundEffectVolume = 32; - } - - if (var2 == 4) { // L: 10417 - Client.areaSoundEffectVolume = 0; - } - } - - if (var4 == 17) { // L: 10419 - Client.followerIndex = var2 & 65535; // L: 10420 - } - - if (var4 == 18) { // L: 10422 - Client.playerAttackOption = (AttackOption)TextureProvider.findEnumerated(AbstractWorldMapIcon.method679(), var2); // L: 10423 - if (Client.playerAttackOption == null) { // L: 10424 - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var4 == 19) { // L: 10426 - if (var2 == -1) { // L: 10427 - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 10428 - } - } - - if (var4 == 22) { // L: 10430 - Client.npcAttackOption = (AttackOption)TextureProvider.findEnumerated(AbstractWorldMapIcon.method679(), var2); // L: 10431 - if (Client.npcAttackOption == null) { // L: 10432 - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } // L: 10434 + } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index a1cff82dee..6ed6502e67 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,51 +1,55 @@ +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("ft") +@ObfuscatedName("fh") +@Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("df") - @ObfuscatedSignature( - descriptor = "Liw;" + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = 1469076521 ) - static Archive archive6; + @Export("xInset") + int xInset; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = -1784403855 + ) + @Export("yInset") + int yInset; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 803284803 + ) + @Export("xSize") + int xSize; @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 232599941 - ) - int xInset; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = -2100158867 - ) - int yInset; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -393101507 - ) - int xSize; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = -2096335191 + intValue = 726006289 ) + @Export("ySize") int ySize; - @ObfuscatedName("aq") + @ObfuscatedName("ai") + @Export("flags") public int[][] flags; public CollisionMap(int var1, int var2) { this.xInset = 0; // L: 44 - this.yInset = 0; // L: 45 - this.xSize = var1; // L: 46 - this.ySize = var2; // L: 47 + this.yInset = 0; + this.xSize = var1; + this.ySize = var2; this.flags = new int[this.xSize][this.ySize]; // L: 48 - this.clear(); // L: 49 + this.clear(); } // L: 50 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1749898511" + garbageValue = "1102469876" ) + @Export("clear") public void clear() { for (int var1 = 0; var1 < this.xSize; ++var1) { // L: 53 for (int var2 = 0; var2 < this.ySize; ++var2) { // L: 54 @@ -59,12 +63,12 @@ public class CollisionMap { } // L: 59 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "580618753" + garbageValue = "1208614237" ) - public void method3630(int var1, int var2, int var3, int var4, boolean var5) { + public void method3683(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; // L: 62 var2 -= this.yInset; // L: 63 if (var3 == 0) { // L: 64 @@ -73,7 +77,7 @@ public class CollisionMap { this.setFlag(var1 - 1, var2, 8); // L: 67 } - if (var4 == 1) { + if (var4 == 1) { // L: 69 this.setFlag(var1, var2, 2); // L: 70 this.setFlag(var1, var2 + 1, 32); // L: 71 } @@ -211,11 +215,12 @@ public class CollisionMap { } // L: 182 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1934730516" + descriptor = "(IIIIZB)V", + garbageValue = "1" ) + @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { int var6 = 256; // L: 185 if (var5) { // L: 186 @@ -237,11 +242,12 @@ public class CollisionMap { } // L: 196 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1924690823" + garbageValue = "-497900388" ) + @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { var1 -= this.xInset; // L: 199 var2 -= this.yInset; // L: 200 @@ -249,11 +255,12 @@ public class CollisionMap { var10000[var2] |= 2097152; } // L: 202 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1474053794" + garbageValue = "-2077478185" ) + @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { var1 -= this.xInset; // L: 205 var2 -= this.yInset; // L: 206 @@ -261,22 +268,23 @@ public class CollisionMap { var10000[var2] |= 262144; } // L: 208 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "88" + descriptor = "(IIII)V", + garbageValue = "-1102921575" ) + @Export("setFlag") void setFlag(int var1, int var2, int var3) { int[] var10000 = this.flags[var1]; // L: 211 var10000[var2] |= var3; } // L: 212 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "1610140342" + garbageValue = "1625102421" ) - public void method3635(int var1, int var2, int var3, int var4, boolean var5) { + public void method3688(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; // L: 215 var2 -= this.yInset; // L: 216 if (var3 == 0) { // L: 217 @@ -423,11 +431,12 @@ public class CollisionMap { } // L: 335 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "65280" + garbageValue = "825527844" ) + @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { int var7 = 256; // L: 338 if (var6) { // L: 339 @@ -455,483 +464,52 @@ public class CollisionMap { } // L: 354 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-1445892610" + garbageValue = "-1464049351" ) + @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { int[] var10000 = this.flags[var1]; // L: 357 var10000[var2] &= ~var3; } // L: 358 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "794579216" + descriptor = "(IIS)V", + garbageValue = "-5902" ) - public void method3638(int var1, int var2) { + public void method3691(int var1, int var2) { var1 -= this.xInset; // L: 361 var2 -= this.yInset; // L: 362 int[] var10000 = this.flags[var1]; // L: 363 var10000[var2] &= -262145; } // L: 364 - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1810709507" + descriptor = "(Ljava/lang/Object;ZI)[B", + garbageValue = "299117016" ) - public static void method3653() { - ParamDefinition.ParamDefinition_cached.clear(); // L: 68 - } // L: 69 - - @ObfuscatedName("ez") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1831550493" - ) - static void updateGameState(int var0) { - if (var0 != Client.gameState) { // L: 1279 - if (Client.gameState == 0) { // L: 1280 - class2.client.method1002(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1281 - Client.loginState = 0; // L: 1282 - Client.field822 = 0; // L: 1283 - Client.field708 = 0; // L: 1284 - Client.timer.method5110(var0); // L: 1285 - if (var0 != 20) { // L: 1286 - class22.method245(false); - } - } - - if (var0 != 20 && var0 != 40 && MouseHandler.field508 != null) { // L: 1288 1289 - MouseHandler.field508.close(); // L: 1290 - MouseHandler.field508 = null; // L: 1291 - } - - if (Client.gameState == 25) { // L: 1294 - Client.field732 = 0; // L: 1295 - Client.field728 = 0; // L: 1296 - Client.field711 = 1; // L: 1297 - Client.field895 = 0; // L: 1298 - Client.field791 = 1; // L: 1299 - } - - if (var0 != 5 && var0 != 10) { // L: 1301 - if (var0 == 20) { // L: 1304 - UserComparator1.method6041(Occluder.archive10, Huffman.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1305 - } else if (var0 == 11) { // L: 1307 - UserComparator1.method6041(Occluder.archive10, Huffman.archive8, false, 4); // L: 1308 - } else { - Strings.method4202(); // L: 1310 - } + public static byte[] method3712(Object var0, boolean var1) { + if (var0 == null) { // L: 30 + return null; + } else if (var0 instanceof byte[]) { // L: 31 + byte[] var6 = (byte[])((byte[])var0); // L: 32 + if (var1) { // L: 33 + int var4 = var6.length; // L: 36 + byte[] var5 = new byte[var4]; // L: 37 + System.arraycopy(var6, 0, var5, 0, var4); // L: 38 + return var5; // L: 41 } else { - UserComparator1.method6041(Occluder.archive10, Huffman.archive8, true, 0); // L: 1302 + return var6; // L: 43 } - - Client.gameState = var0; // L: 1311 - } - } // L: 1312 - - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(Lcg;II)V", - garbageValue = "1018652463" - ) - static final void updateActorSequence(Actor var0, int var1) { - SequenceDefinition var2; - int var3; - int var4; - int var11; - if (var0.field1026 >= Client.cycle) { // L: 3570 - Coord.method4084(var0); + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 45 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 46 + return var2.get(); // L: 47 } else { - int var5; - int var7; - if (var0.field1019 >= Client.cycle) { // L: 3571 - if (var0.field1019 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapRegion.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3572 - var11 = var0.field1019 - var0.field1026; // L: 3573 - var3 = Client.cycle - var0.field1026; // L: 3574 - var4 = var0.field1014 * 64 + var0.field997 * 128; // L: 3575 - var5 = var0.field1014 * 64 + var0.field1016 * 128; // L: 3576 - int var6 = var0.field1014 * 64 + var0.field1015 * 128; // L: 3577 - var7 = var0.field1014 * 64 + var0.field1017 * 128; // L: 3578 - var0.x = (var3 * var6 + var4 * (var11 - var3)) / var11; // L: 3579 - var0.y = (var3 * var7 + var5 * (var11 - var3)) / var11; // L: 3580 - } - - var0.field1032 = 0; // L: 3582 - var0.orientation = var0.field1027; // L: 3583 - var0.rotation = var0.orientation; // L: 3584 - } else { - var0.movementSequence = var0.idleSequence; // L: 3587 - if (var0.pathLength == 0) { // L: 3588 - var0.field1032 = 0; // L: 3589 - } else { - label540: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3592 - var2 = WorldMapRegion.SequenceDefinition_get(var0.sequence); // L: 3593 - if (var0.field973 > 0 && var2.field3549 == 0) { // L: 3594 - ++var0.field1032; // L: 3595 - break label540; // L: 3596 - } - - if (var0.field973 <= 0 && var2.field3541 == 0) { // L: 3598 - ++var0.field1032; // L: 3599 - break label540; // L: 3600 - } - } - - var11 = var0.x; // L: 3603 - var3 = var0.y; // L: 3604 - var4 = var0.field1014 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3605 - var5 = var0.field1014 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3606 - if (var11 < var4) { // L: 3607 - if (var3 < var5) { // L: 3608 - var0.orientation = 1280; - } else if (var3 > var5) { // L: 3609 - var0.orientation = 1792; - } else { - var0.orientation = 1536; // L: 3610 - } - } else if (var11 > var4) { // L: 3612 - if (var3 < var5) { // L: 3613 - var0.orientation = 768; - } else if (var3 > var5) { // L: 3614 - var0.orientation = 256; - } else { - var0.orientation = 512; // L: 3615 - } - } else if (var3 < var5) { // L: 3617 - var0.orientation = 1024; - } else if (var3 > var5) { // L: 3618 - var0.orientation = 0; - } - - byte var15 = var0.pathTraversed[var0.pathLength - 1]; // L: 3619 - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3620 - var7 = var0.orientation - var0.rotation & 2047; // L: 3627 - if (var7 > 1024) { // L: 3628 - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; // L: 3629 - if (var7 >= -256 && var7 <= 256) { // L: 3630 - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { // L: 3631 - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { // L: 3632 - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { // L: 3633 - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; // L: 3634 - int var9 = 4; // L: 3635 - boolean var10 = true; // L: 3636 - if (var0 instanceof NPC) { // L: 3637 - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { // L: 3638 - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1025 != 0) { // L: 3639 - var9 = 2; - } - - if (var0.pathLength > 2) { // L: 3640 - var9 = 6; - } - - if (var0.pathLength > 3) { // L: 3641 - var9 = 8; - } - - if (var0.field1032 > 0 && var0.pathLength > 1) { // L: 3642 - var9 = 8; // L: 3643 - --var0.field1032; // L: 3644 - } - } else { - if (var0.pathLength > 1) { // L: 3648 - var9 = 6; - } - - if (var0.pathLength > 2) { // L: 3649 - var9 = 8; - } - - if (var0.field1032 > 0 && var0.pathLength > 1) { // L: 3650 - var9 = 8; // L: 3651 - --var0.field1032; // L: 3652 - } - } - - if (var15 == 2) { // L: 3655 - var9 <<= 1; - } - - if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3656 - var0.movementSequence = var0.runSequence; - } - - if (var4 != var11 || var5 != var3) { // L: 3657 - if (var11 < var4) { // L: 3658 - var0.x += var9; // L: 3659 - if (var0.x > var4) { // L: 3660 - var0.x = var4; - } - } else if (var11 > var4) { // L: 3662 - var0.x -= var9; // L: 3663 - if (var0.x < var4) { // L: 3664 - var0.x = var4; - } - } - - if (var3 < var5) { // L: 3666 - var0.y += var9; // L: 3667 - if (var0.y > var5) { // L: 3668 - var0.y = var5; - } - } else if (var3 > var5) { // L: 3670 - var0.y -= var9; // L: 3671 - if (var0.y < var5) { // L: 3672 - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { // L: 3675 - --var0.pathLength; // L: 3676 - if (var0.field973 > 0) { // L: 3677 - --var0.field973; - } - } - } else { - var0.x = var4; // L: 3621 - var0.y = var5; // L: 3622 - --var0.pathLength; // L: 3623 - if (var0.field973 > 0) { // L: 3624 - --var0.field973; - } - } - } - } - } + throw new IllegalArgumentException(); // L: 49 } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3680 - var0.sequence = -1; // L: 3681 - var0.spotAnimation = -1; // L: 3682 - var0.field1026 = 0; // L: 3683 - var0.field1019 = 0; // L: 3684 - var0.x = var0.pathX[0] * 128 + var0.field1014 * 64; // L: 3685 - var0.y = var0.field1014 * 64 + var0.pathY[0] * 128; // L: 3686 - var0.method1797(); // L: 3687 - } - - if (WorldMapLabelSize.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3689 3690 - var0.sequence = -1; // L: 3691 - var0.spotAnimation = -1; // L: 3692 - var0.field1026 = 0; // L: 3693 - var0.field1019 = 0; // L: 3694 - var0.x = var0.pathX[0] * 128 + var0.field1014 * 64; // L: 3695 - var0.y = var0.field1014 * 64 + var0.pathY[0] * 128; // L: 3696 - var0.method1797(); // L: 3697 - } - - if (var0.field1025 != 0) { // L: 3701 - if (var0.targetIndex != -1) { // L: 3702 - Object var13 = null; // L: 3703 - if (var0.targetIndex < 32768) { // L: 3704 - var13 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 3705 - var13 = Client.players[var0.targetIndex - 32768]; - } - - if (var13 != null) { // L: 3706 - var3 = var0.x - ((Actor)var13).x; // L: 3707 - var4 = var0.y - ((Actor)var13).y; // L: 3708 - if (var3 != 0 || var4 != 0) { // L: 3709 - var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; - } - } else if (var0.false0) { // L: 3711 - var0.targetIndex = -1; // L: 3712 - var0.false0 = false; // L: 3713 - } - } - - if (var0.field1000 != -1 && (var0.pathLength == 0 || var0.field1032 > 0)) { // L: 3716 - var0.orientation = var0.field1000; // L: 3717 - var0.field1000 = -1; // L: 3718 - } - - var11 = var0.orientation - var0.rotation & 2047; // L: 3720 - if (var11 == 0 && var0.false0) { // L: 3721 - var0.targetIndex = -1; // L: 3722 - var0.false0 = false; // L: 3723 - } - - if (var11 != 0) { // L: 3725 - ++var0.field1024; // L: 3726 - boolean var14; - if (var11 > 1024) { // L: 3727 - var0.rotation -= var0.field1025; // L: 3728 - var14 = true; // L: 3729 - if (var11 < var0.field1025 || var11 > 2048 - var0.field1025) { // L: 3730 - var0.rotation = var0.orientation; // L: 3731 - var14 = false; // L: 3732 - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1024 > 25 || var14)) { // L: 3734 - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; // L: 3735 - } else { - var0.movementSequence = var0.walkSequence; // L: 3736 - } - } - } else { - var0.rotation += var0.field1025; // L: 3740 - var14 = true; // L: 3741 - if (var11 < var0.field1025 || var11 > 2048 - var0.field1025) { // L: 3742 - var0.rotation = var0.orientation; // L: 3743 - var14 = false; // L: 3744 - } - - if (var0.idleSequence == var0.movementSequence && (var0.field1024 > 25 || var14)) { // L: 3746 - if (var0.turnRightSequence != -1) { // L: 3747 - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 3748 - } - } - } - - var0.rotation &= 2047; // L: 3752 - } else { - var0.field1024 = 0; // L: 3754 - } - } - - var0.isWalking = false; // L: 3757 - if (var0.movementSequence != -1) { // L: 3758 - var2 = WorldMapRegion.SequenceDefinition_get(var0.movementSequence); // L: 3759 - if (var2 != null && var2.frameIds != null) { // L: 3760 - ++var0.movementFrameCycle; // L: 3761 - if (var0.movementFrame < var2.frameIds.length && var0.movementFrameCycle > var2.frameLengths[var0.movementFrame]) { // L: 3762 - var0.movementFrameCycle = 1; // L: 3763 - ++var0.movementFrame; // L: 3764 - GrandExchangeEvent.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); // L: 3765 - } - - if (var0.movementFrame >= var2.frameIds.length) { // L: 3767 - var0.movementFrameCycle = 0; // L: 3768 - var0.movementFrame = 0; // L: 3769 - GrandExchangeEvent.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); // L: 3770 - } - } else { - var0.movementSequence = -1; // L: 3773 - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1013) { // L: 3775 - if (var0.spotAnimationFrame < 0) { // L: 3776 - var0.spotAnimationFrame = 0; - } - - var11 = Tiles.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3777 - if (var11 != -1) { // L: 3778 - SequenceDefinition var12 = WorldMapRegion.SequenceDefinition_get(var11); // L: 3779 - if (var12 != null && var12.frameIds != null) { // L: 3780 - ++var0.spotAnimationFrameCycle; // L: 3781 - if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { // L: 3782 - var0.spotAnimationFrameCycle = 1; // L: 3783 - ++var0.spotAnimationFrame; // L: 3784 - GrandExchangeEvent.addSequenceSoundEffect(var12, var0.spotAnimationFrame, var0.x, var0.y); // L: 3785 - } - - if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) { // L: 3787 3788 - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; // L: 3791 - } - } else { - var0.spotAnimation = -1; // L: 3793 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3795 - var2 = WorldMapRegion.SequenceDefinition_get(var0.sequence); // L: 3796 - if (var2.field3549 == 1 && var0.field973 > 0 && var0.field1026 <= Client.cycle && var0.field1019 < Client.cycle) { // L: 3797 3798 - var0.sequenceDelay = 1; // L: 3799 - return; // L: 3826 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3804 - var2 = WorldMapRegion.SequenceDefinition_get(var0.sequence); // L: 3805 - if (var2 != null && var2.frameIds != null) { // L: 3806 - ++var0.sequenceFrameCycle; // L: 3807 - if (var0.sequenceFrame < var2.frameIds.length && var0.sequenceFrameCycle > var2.frameLengths[var0.sequenceFrame]) { // L: 3808 - var0.sequenceFrameCycle = 1; // L: 3809 - ++var0.sequenceFrame; // L: 3810 - GrandExchangeEvent.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); // L: 3811 - } - - if (var0.sequenceFrame >= var2.frameIds.length) { // L: 3813 - var0.sequenceFrame -= var2.frameCount; // L: 3814 - ++var0.field1009; // L: 3815 - if (var0.field1009 >= var2.field3548) { // L: 3816 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2.frameIds.length) { // L: 3817 - GrandExchangeEvent.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); // L: 3818 - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var2.field3544; // L: 3820 - } else { - var0.sequence = -1; // L: 3822 - } - } - - if (var0.sequenceDelay > 0) { // L: 3824 - --var0.sequenceDelay; - } - } - - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1510761090" - ) - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4289 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4290 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4291 - int var3 = var2.x >> 7; // L: 4292 - int var4 = var2.y >> 7; // L: 4293 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4294 - if (var2.field1014 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4295 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4296 - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4297 - } - - long var5 = class227.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4299 - var2.playerCycle = Client.cycle; // L: 4300 - ScriptEvent.scene.drawEntity(Huffman.Client_plane, var2.x, var2.y, ArchiveLoader.getTileHeight(var2.field1014 * 64 - 64 + var2.x, var2.field1014 * 64 - 64 + var2.y, Huffman.Client_plane), var2.field1014 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4301 - } - } - } - - } // L: 4305 } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 67892f9c02..60a82b723f 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -1,27 +1,54 @@ +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("hg") +@ObfuscatedName("hw") +@Implements("Coord") public class Coord { @ObfuscatedName("k") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("ej") @ObfuscatedGetter( - intValue = -877871317 + intValue = -579877889 ) + @Export("port1") + static int port1; + @ObfuscatedName("em") + @ObfuscatedGetter( + intValue = 604273715 + ) + @Export("port2") + static int port2; + @ObfuscatedName("lv") + @ObfuscatedGetter( + intValue = 1585489899 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 252017765 + ) + @Export("plane") public int plane; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1594066417 + intValue = -865171177 ) + @Export("x") public int x; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1889586591 + intValue = 1194018723 ) + @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lhg;)V" + descriptor = "(Lhw;)V" ) public Coord(Coord var1) { this.plane = var1.plane; // L: 15 @@ -46,20 +73,22 @@ public class Coord { } // L: 27 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-78" + descriptor = "(I)I", + garbageValue = "-330056145" ) + @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; // L: 30 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lhg;I)Z", - garbageValue = "24386397" + descriptor = "(Lhw;I)Z", + garbageValue = "824045461" ) + @Export("equalsCoord") boolean equalsCoord(Coord var1) { if (this.plane != var1.plane) { // L: 40 return false; @@ -70,11 +99,12 @@ public class Coord { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "0" + garbageValue = "-40" ) + @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); // L: 55 } @@ -95,80 +125,87 @@ public class Coord { return this.toString(","); // L: 51 } - @ObfuscatedName("q") + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-34" + descriptor = "(IIIIZI)V", + garbageValue = "1944404" ) - static final int method4083(int var0, int var1) { - if (var0 == -2) { // L: 871 - return 12345678; - } else if (var0 == -1) { // L: 872 - if (var1 < 2) { // L: 873 - var1 = 2; - } else if (var1 > 126) { // L: 874 - var1 = 126; - } - - return var1; // L: 875 - } else { - var1 = (var0 & 127) * var1 / 128; // L: 877 - if (var1 < 2) { // L: 878 - var1 = 2; - } else if (var1 > 126) { // L: 879 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 880 - } - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "(Lcg;B)V", - garbageValue = "115" - ) - static final void method4084(Actor var0) { - int var1 = Math.max(1, var0.field1026 - Client.cycle); // L: 3829 - int var2 = var0.field1014 * 64 + var0.field997 * 128; // L: 3830 - int var3 = var0.field1014 * 64 + var0.field1016 * 128; // L: 3831 - var0.x += (var2 - var0.x) / var1; // L: 3832 - var0.y += (var3 - var0.y) / var1; // L: 3833 - var0.field1032 = 0; // L: 3834 - var0.orientation = var0.field1027; // L: 3835 - } // L: 3836 - - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(Lcg;IB)V", - garbageValue = "-77" - ) - static final void method4086(Actor var0, int var1) { - class89.worldToScreen(var0.x, var0.y, var1); // L: 4941 - } // L: 4942 - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "(IIIILlp;Lhz;I)V", - garbageValue = "-334370993" - ) - static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; // L: 10644 - if (var6 > 4225 && var6 < 90000) { // L: 10645 - int var7 = Client.camAngleY & 2047; // L: 10646 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 10647 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 10648 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 10649 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 10650 - double var12 = Math.atan2((double)var10, (double)var11); // L: 10651 - int var14 = var5.width / 2 - 25; // L: 10652 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 10653 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 10654 - byte var17 = 20; // L: 10655 - FontName.redHintArrowSprite.method6264(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 10656 - } else { - HealthBar.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 10658 + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4748 + var2 = 1; } - } // L: 10659 + if (var3 < 1) { // L: 4749 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4750 + int var6; + if (var5 < 0) { // L: 4752 + var6 = Client.field873; + } else if (var5 >= 100) { // L: 4753 + var6 = Client.field932; + } else { + var6 = (Client.field932 - Client.field873) * var5 / 100 + Client.field873; // L: 4754 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4755 + int var8; + int var9; + short var14; + if (var7 < Client.field937) { // L: 4756 + var14 = Client.field937; // L: 4757 + var6 = var14 * var2 * 334 / (var3 * 512); // L: 4758 + if (var6 > Client.field753) { // L: 4759 + var6 = Client.field753; // L: 4760 + var8 = var3 * var6 * 512 / (var14 * 334); // L: 4761 + var9 = (var2 - var8) / 2; // L: 4762 + if (var4) { // L: 4763 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4764 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4765 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4766 + } + + var0 += var9; // L: 4768 + var2 -= var9 * 2; // L: 4769 + } + } else if (var7 > Client.field935) { // L: 4772 + var14 = Client.field935; // L: 4773 + var6 = var14 * var2 * 334 / (var3 * 512); // L: 4774 + if (var6 < Client.field865) { // L: 4775 + var6 = Client.field865; // L: 4776 + var8 = var14 * var2 * 334 / (var6 * 512); // L: 4777 + var9 = (var3 - var8) / 2; // L: 4778 + if (var4) { // L: 4779 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4780 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4781 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4782 + } + + var1 += var9; // L: 4784 + var3 -= var9 * 2; // L: 4785 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 4788 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4789 + int[] var13 = new int[9]; // L: 4791 + + for (var9 = 0; var9 < var13.length; ++var9) { // L: 4792 + int var10 = var9 * 32 + 15 + 128; // L: 4793 + int var11 = MilliClock.method3587(var10); // L: 4794 + int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4795 + var11 = HorizontalAlignment.method4876(var11, var3); // L: 4796 + var13[var9] = var11 * var12 >> 16; // L: 4797 + } + + Scene.Scene_buildVisiblityMap(var13, 500, 800, var2 * 334 / var3, 334); // L: 4799 + } + + Client.viewportOffsetX = var0; // L: 4802 + Client.viewportOffsetY = var1; // L: 4803 + Client.viewportWidth = var2; // L: 4804 + Client.viewportHeight = var3; // L: 4805 + } // L: 4806 } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index aa5b55e401..5baff2c97a 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -1,888 +1,173 @@ -import java.io.BufferedReader; -import java.io.DataInputStream; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -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("df") +@ObfuscatedName("dw") +@Implements("Decimator") public class Decimator { - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1258605941 + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Liw;" ) - static int field1491; - @ObfuscatedName("t") + @Export("Widget_archive") + static AbstractArchive Widget_archive; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1300343433 + intValue = 176497707 ) + @Export("inputRate") int inputRate; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1507874041 + intValue = 829338493 ) + @Export("outputRate") int outputRate; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { // L: 14 - int var4 = var1; // L: 16 - int var5 = var2; // L: 17 - if (var2 > var1) { // L: 19 - var4 = var2; // L: 21 - var5 = var1; // L: 22 - } + int var3 = GameShell.method1072(var1, var2); // L: 15 + var1 /= var3; // L: 16 + var2 /= var3; // L: 17 + this.inputRate = var1; // L: 18 + this.outputRate = var2; // L: 19 + this.table = new int[var1][14]; // L: 20 - while (var5 != 0) { // L: 24 - int var6 = var4 % var5; // L: 25 - var4 = var5; // L: 26 - var5 = var6; // L: 27 - } - - var1 /= var4; // L: 32 - var2 /= var4; - this.inputRate = var1; - this.outputRate = var2; // L: 35 - this.table = new int[var1][14]; - - for (int var7 = 0; var7 < var1; ++var7) { // L: 37 - int[] var8 = this.table[var7]; // L: 38 - double var9 = 6.0D + (double)var7 / (double)var1; - int var11 = (int)Math.floor(var9 - 7.0D + 1.0D); - if (var11 < 0) { - var11 = 0; + for (int var4 = 0; var4 < var1; ++var4) { // L: 21 + int[] var5 = this.table[var4]; // L: 22 + double var6 = (double)var4 / (double)var1 + 6.0D; // L: 23 + int var8 = (int)Math.floor(var6 - 7.0D + 1.0D); // L: 24 + if (var8 < 0) { // L: 25 + var8 = 0; } - int var12 = (int)Math.ceil(7.0D + var9); - if (var12 > 14) { // L: 43 - var12 = 14; + int var9 = (int)Math.ceil(7.0D + var6); // L: 26 + if (var9 > 14) { // L: 27 + var9 = 14; } - for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { - double var15 = ((double)var11 - var9) * 3.141592653589793D; - 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) { // L: 28 + double var12 = 3.141592653589793D * ((double)var8 - var6); + double var14 = var10; + if (var12 < -1.0E-4D || var12 > 1.0E-4D) { + var14 = var10 * (Math.sin(var12) / var12); } - var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); - var8[var11] = (int)Math.floor(var17 * 65536.0D + 0.5D); + var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); + var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); } } } - } + } // L: 37 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "-47" + descriptor = "([BI)[B", + garbageValue = "-792714030" ) + @Export("resample") byte[] resample(byte[] var1) { - if (this.table != null) { - int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; - int[] var3 = new int[var2]; - int var4 = 0; - int var5 = 0; + if (this.table != null) { // L: 40 + int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; // L: 41 + int[] var3 = new int[var2]; // L: 42 + int var4 = 0; // L: 43 + int var5 = 0; // L: 44 int var6; - for (var6 = 0; var6 < var1.length; ++var6) { - byte var7 = var1[var6]; - int[] var8 = this.table[var5]; + for (var6 = 0; var6 < var1.length; ++var6) { // L: 45 + byte var7 = var1[var6]; // L: 46 + int[] var8 = this.table[var5]; // L: 47 int var9; - for (var9 = 0; var9 < 14; ++var9) { // L: 64 - var3[var4 + var9] += var7 * var8[var9]; + for (var9 = 0; var9 < 14; ++var9) { // L: 48 + var3[var9 + var4] += var8[var9] * var7; } - var5 += this.outputRate; - var9 = var5 / this.inputRate; // L: 66 - var4 += var9; - var5 -= var9 * this.inputRate; + var5 += this.outputRate; // L: 49 + var9 = var5 / this.inputRate; // L: 50 + var4 += var9; // L: 51 + var5 -= var9 * this.inputRate; // L: 52 } - var1 = new byte[var2]; + var1 = new byte[var2]; // L: 54 - for (var6 = 0; var6 < var2; ++var6) { // L: 71 - int var10 = var3[var6] + 32768 >> 16; - if (var10 < -128) { // L: 73 + for (var6 = 0; var6 < var2; ++var6) { // L: 55 + int var10 = var3[var6] + 32768 >> 16; // L: 56 + if (var10 < -128) { // L: 57 var1[var6] = -128; - } else if (var10 > 127) { // L: 74 + } else if (var10 > 127) { // L: 58 var1[var6] = 127; } else { - var1[var6] = (byte)var10; + var1[var6] = (byte)var10; // L: 59 } } } - return var1; + return var1; // L: 62 } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" - ) - int scaleRate(int var1) { - if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); - } - - return var1; - } - - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1133574944" + garbageValue = "1298471977" ) - int scalePosition(int var1) { + @Export("scaleRate") + int scaleRate(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); // L: 66 } - return var1; + return var1; // L: 67 } - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", - garbageValue = "0" + descriptor = "(II)I", + garbageValue = "-1879393337" ) - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); + @Export("scalePosition") + int scalePosition(int var1) { + if (this.table != null) { // L: 71 + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; + } + + return var1; // L: 72 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Ljd;", + garbageValue = "1446464010" + ) + @Export("getEnum") + public static EnumDefinition getEnum(int var0) { + EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); // L: 29 + if (var1 != null) { // L: 30 + return var1; } else { - try { - String var2 = ""; // L: 33 - if (var1 != null) { // L: 34 - Throwable var4 = var1; // L: 36 - String var5; - if (var1 instanceof RunException) { // L: 39 - RunException var6 = (RunException)var1; // L: 40 - var5 = var6.message + " | "; // L: 41 - var4 = var6.throwable; // L: 42 - } else { - var5 = ""; // L: 44 - } - - StringWriter var18 = new StringWriter(); // L: 45 - PrintWriter var7 = new PrintWriter(var18); // L: 46 - var4.printStackTrace(var7); // L: 47 - var7.close(); // L: 48 - String var8 = var18.toString(); // L: 49 - BufferedReader var9 = new BufferedReader(new StringReader(var8)); // L: 50 - String var10 = var9.readLine(); // L: 51 - - label61: - while (true) { - while (true) { - String var11 = var9.readLine(); // L: 53 - if (var11 == null) { // L: 54 - var5 = var5 + "| " + var10; // L: 72 - var2 = var5; // L: 75 - break label61; - } - - int var12 = var11.indexOf(40); // L: 55 - int var13 = var11.indexOf(41, var12 + 1); // L: 56 - if (var12 >= 0 && var13 >= 0) { // L: 57 - String var14 = var11.substring(var12 + 1, var13); // L: 58 - int var15 = var14.indexOf(".java:"); // L: 59 - if (var15 >= 0) { // L: 60 - var14 = var14.substring(0, var15) + var14.substring(var15 + 5); // L: 61 - var5 = var5 + var14 + ' '; // L: 62 - continue; // L: 63 - } - - var11 = var11.substring(0, var12); // L: 65 - } - - var11 = var11.trim(); // L: 67 - var11 = var11.substring(var11.lastIndexOf(32) + 1); // L: 68 - var11 = var11.substring(var11.lastIndexOf(9) + 1); // L: 69 - var5 = var5 + var11 + ' '; // L: 70 - } - } - } - - if (var0 != null) { // L: 77 - if (var1 != null) { // L: 78 - var2 = var2 + " | "; - } - - var2 = var2 + var0; // L: 79 - } - - System.out.println("Error: " + var2); // L: 81 - var2 = var2.replace(':', '.'); // L: 82 - var2 = var2.replace('@', '_'); // L: 83 - var2 = var2.replace('&', '_'); // L: 84 - var2 = var2.replace('#', '_'); // L: 85 - if (RunException.RunException_applet == null) { // L: 86 - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + ObjectDefinition.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + WorldMapID.clientType + "&e=" + var2); // L: 87 - DataInputStream var17 = new DataInputStream(var3.openStream()); // L: 88 - var17.read(); // L: 89 - var17.close(); // L: 90 - } catch (Exception var16) { // L: 92 + byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); // L: 31 + var1 = new EnumDefinition(); // L: 32 + if (var2 != null) { // L: 33 + var1.decode(new Buffer(var2)); } + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 + return var1; // L: 35 } - } // L: 93 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)Lct;", - garbageValue = "-1387826100" - ) - static World worldListStart() { - World.World_listCount = 0; // L: 237 - return WorldMapEvent.getNextWorldListWorld(); // L: 238 } - @ObfuscatedName("bc") + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "-65" + descriptor = "(II)V", + garbageValue = "1079487427" ) - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 119 - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "([Lhq;IIIIIIIII)V", - garbageValue = "1194287146" - ) - 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); // L: 8669 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 8670 - - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 8671 - Widget var10 = var0[var9]; // L: 8672 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 8673 8674 - int var11; - if (var8 == -1) { // L: 8676 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 8677 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 8678 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 8679 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 8680 - var11 = ++Client.rootWidgetCount - 1; // L: 8681 - } else { - var11 = var8; // L: 8683 - } - - var10.rootIndex = var11; // L: 8684 - var10.cycle = Client.cycle; // L: 8685 - if (!var10.isIf3 || !GrandExchangeOfferUnitPriceComparator.isComponentHidden(var10)) { // L: 8686 - if (var10.contentType > 0) { // L: 8687 - Canvas.method903(var10); - } - - int var12 = var10.x + var6; // L: 8688 - int var13 = var7 + var10.y; // L: 8689 - int var14 = var10.transparencyTop; // L: 8690 - int var15; - int var16; - if (var10 == Client.clickedWidget) { // L: 8691 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 8692 - GrandExchangeOfferNameComparator.field115 = var0; // L: 8693 - Client.field947 = var6; // L: 8694 - class219.field2547 = var7; // L: 8695 - continue; // L: 8696 - } - - if (Client.isDraggingWidget && Client.field799) { // L: 8698 - var15 = MouseHandler.MouseHandler_x; // L: 8699 - var16 = MouseHandler.MouseHandler_y; // L: 8700 - var15 -= Client.widgetClickX; // L: 8701 - var16 -= Client.widgetClickY; // L: 8702 - if (var15 < Client.field856) { // L: 8703 - var15 = Client.field856; - } - - if (var15 + var10.width > Client.field856 + Client.clickedWidgetParent.width) { // L: 8704 - var15 = Client.field856 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field785) { // L: 8705 - var16 = Client.field785; - } - - if (var16 + var10.height > Client.field785 + Client.clickedWidgetParent.height) { // L: 8706 - var16 = Client.field785 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; // L: 8707 - var13 = var16; // L: 8708 - } - - if (!var10.isScrollBar) { // L: 8710 - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { // L: 8716 - var15 = var2; // L: 8717 - var16 = var3; // L: 8718 - var17 = var4; // L: 8719 - var18 = var5; // L: 8720 - } else if (var10.type == 9) { // L: 8722 - var19 = var12; // L: 8723 - var20 = var13; // L: 8724 - var21 = var12 + var10.width; // L: 8725 - var22 = var13 + var10.height; // L: 8726 - if (var21 < var12) { // L: 8727 - var19 = var21; // L: 8729 - var21 = var12; // L: 8730 - } - - if (var22 < var13) { // L: 8732 - var20 = var22; // L: 8734 - var22 = var13; // L: 8735 - } - - ++var21; // L: 8737 - ++var22; // L: 8738 - var15 = var19 > var2 ? var19 : var2; // L: 8739 - var16 = var20 > var3 ? var20 : var3; // L: 8740 - var17 = var21 < var4 ? var21 : var4; // L: 8741 - var18 = var22 < var5 ? var22 : var5; // L: 8742 - } else { - var19 = var12 + var10.width; // L: 8745 - var20 = var13 + var10.height; // L: 8746 - var15 = var12 > var2 ? var12 : var2; // L: 8747 - var16 = var13 > var3 ? var13 : var3; // L: 8748 - var17 = var19 < var4 ? var19 : var4; // L: 8749 - var18 = var20 < var5 ? var20 : var5; // L: 8750 - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 8752 - if (var10.contentType != 0) { // L: 8753 - if (var10.contentType == 1336) { // L: 8754 - if (Client.displayFps) { // L: 8755 - var13 += 15; // L: 8756 - ItemDefinition.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); // L: 8757 - var13 += 15; // L: 8758 - Runtime var42 = Runtime.getRuntime(); // L: 8759 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 8760 - var21 = 16776960; // L: 8761 - if (var20 > 327680 && !Client.isLowDetail) { // L: 8762 - var21 = 16711680; - } - - ItemDefinition.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 8763 - var13 += 15; // L: 8764 - } - continue; - } - - if (var10.contentType == 1337) { // L: 8768 - Client.viewportX = var12; // L: 8769 - Client.viewportY = var13; // L: 8770 - GrandExchangeOfferOwnWorldComparator.drawEntities(var12, var13, var10.width, var10.height); // L: 8771 - Client.field882[var10.rootIndex] = true; // L: 8772 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8773 - continue; // L: 8774 - } - - if (var10.contentType == 1338) { // L: 8776 - AbstractUserComparator.drawMinimap(var10, var12, var13, var11); // L: 8777 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8778 - continue; // L: 8779 - } - - if (var10.contentType == 1339) { // L: 8781 - class69.drawCompass(var10, var12, var13, var11); // L: 8782 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8783 - continue; // L: 8784 - } - - if (var10.contentType == 1400) { // L: 8786 - Message.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 8787 - } - - if (var10.contentType == 1401) { // L: 8789 - Message.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 8790 - } - - if (var10.contentType == 1402) { // L: 8792 - Varcs.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 8793 - } - } - - if (var10.type == 0) { // L: 8796 - if (!var10.isIf3 && GrandExchangeOfferUnitPriceComparator.isComponentHidden(var10) && var10 != TriBool.mousedOverWidgetIf1) { // L: 8797 - continue; - } - - if (!var10.isIf3) { // L: 8798 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 8799 - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { // L: 8800 - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 8802 - if (var10.children != null) { // L: 8803 - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 8804 - if (var30 != null) { // L: 8805 - PlayerAppearance.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 8806 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8808 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 8809 - } - - if (Client.isResizable || Client.field884[var11] || Client.gameDrawingMode > 1) { // L: 8811 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 8812 8813 - Clock.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { // L: 8815 - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { // L: 8818 - var19 = 0; // L: 8819 - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 8820 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 8821 - var22 = var12 + var21 * (var10.paddingX + 32); // L: 8822 - var23 = var13 + var20 * (var10.paddingY + 32); // L: 8823 - if (var19 < 20) { // L: 8824 - var22 += var10.inventoryXOffsets[var19]; // L: 8825 - var23 += var10.inventoryYOffsets[var19]; // L: 8826 - } - - if (var10.itemIds[var19] <= 0) { // L: 8828 - if (var10.inventorySprites != null && var19 < 20) { // L: 8873 - Sprite var46 = var10.getInventorySprite(var19); // L: 8874 - if (var46 != null) { // L: 8875 - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2611) { // L: 8876 - class52.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; // L: 8829 - boolean var38 = false; // L: 8830 - var26 = var10.itemIds[var19] - 1; // L: 8831 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == BuddyRankComparator.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 8832 - Sprite var35; - if (Client.isItemSelected == 1 && var19 == GrandExchangeOfferUnitPriceComparator.selectedItemSlot && var10.id == class105.selectedItemWidget) { // L: 8834 - var35 = ChatChannel.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = ChatChannel.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 8835 - } - - if (var35 != null) { // L: 8836 - if (var10 == BuddyRankComparator.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 8837 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 8838 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 8839 - if (var24 < 5 && var24 > -5) { // L: 8840 - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { // L: 8841 - var25 = 0; - } - - if (Client.itemDragDuration < 5) { // L: 8842 - var24 = 0; // L: 8843 - var25 = 0; // L: 8844 - } - - var35.drawTransAt(var22 + var24, var23 + var25, 128); // L: 8846 - if (var1 != -1) { // L: 8847 - Widget var28 = var0[var1 & 65535]; // L: 8848 - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 8849 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field737 / 3; // L: 8850 - if (var29 > Client.field737 * 10) { // L: 8851 - var29 = Client.field737 * 10; - } - - if (var29 > var28.scrollY) { // L: 8852 - var29 = var28.scrollY; - } - - var28.scrollY -= var29; // L: 8853 - Client.draggedWidgetY += var29; // L: 8854 - class52.invalidateWidget(var28); // L: 8855 - } - - if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 8857 - var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field737 / 3; // L: 8858 - if (var29 > Client.field737 * 10) { // L: 8859 - var29 = Client.field737 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 8860 - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; // L: 8861 - Client.draggedWidgetY -= var29; // L: 8862 - class52.invalidateWidget(var28); // L: 8863 - } - } - } else if (var10 == GrandExchangeEvent.field79 && var19 == Client.field944) { // L: 8867 - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); // L: 8868 - } - } else { - class52.invalidateWidget(var10); // L: 8870 - } - } - } - - ++var19; // L: 8878 - } - } - } else if (var10.type == 3) { // L: 8883 - if (MusicPatch.runCs1(var10)) { // L: 8885 - var19 = var10.color2; // L: 8886 - if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 8887 - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; // L: 8890 - if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 8891 - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { // L: 8893 - switch(var10.fillMode.id) { // L: 8894 - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 8896 - break; // L: 8897 - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 8903 - break; // L: 8904 - default: - if (var14 == 0) { // L: 8899 - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 8900 - } - } - } else if (var14 == 0) { // L: 8908 - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 8909 - } - } else { - Font var39; - if (var10.type == 4) { // L: 8913 - var39 = var10.getFont(); // L: 8914 - if (var39 == null) { // L: 8915 - if (Widget.field2611) { // L: 8916 - class52.invalidateWidget(var10); - } - } else { - String var44 = var10.text; // L: 8920 - if (MusicPatch.runCs1(var10)) { // L: 8921 - var20 = var10.color2; // L: 8922 - if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 8923 - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { // L: 8924 - var44 = var10.text2; - } - } else { - var20 = var10.color; // L: 8927 - if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 8928 - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { // L: 8930 - ItemDefinition var45 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10.itemId); // L: 8931 - var44 = var45.name; // L: 8932 - if (var44 == null) { // L: 8933 - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 8934 - var44 = WorldMapAreaData.colorStartTag(16748608) + var44 + "" + " " + 'x' + class297.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { // L: 8936 - var44 = "Please wait..."; // L: 8937 - var20 = var10.color; // L: 8938 - } - - if (!var10.isIf3) { // L: 8940 - var44 = AbstractByteArrayCopier.method4028(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 8941 - } - } else if (var10.type == 5) { // L: 8944 - Sprite var40; - if (!var10.isIf3) { // L: 8945 - var40 = var10.getSprite(MusicPatch.runCs1(var10)); // L: 8946 - if (var40 != null) { // L: 8947 - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2611) { // L: 8948 - class52.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { // L: 8952 - var40 = ChatChannel.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); // L: 8953 - } - - if (var40 == null) { // L: 8954 - if (Widget.field2611) { // L: 8978 - class52.invalidateWidget(var10); - } - } else { - var20 = var40.width; // L: 8955 - var21 = var40.height; // L: 8956 - if (!var10.spriteTiling) { // L: 8957 - var22 = var10.width * 4096 / var20; // L: 8971 - if (var10.spriteAngle != 0) { // L: 8972 - var40.method6296(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 8973 - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 8974 - var40.drawTransBgAt(var12, var13); // L: 8975 - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 8958 - var22 = (var20 - 1 + var10.width) / var20; // L: 8959 - var23 = (var21 - 1 + var10.height) / var21; // L: 8960 - - for (var24 = 0; var24 < var22; ++var24) { // L: 8961 - for (var25 = 0; var25 < var23; ++var25) { // L: 8962 - if (var10.spriteAngle != 0) { // L: 8963 - var40.method6296(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 8964 - var40.drawTransAt(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 8965 - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8968 - } - } - } - } else { - ItemDefinition var33; - if (var10.type == 6) { // L: 8982 - boolean var36 = MusicPatch.runCs1(var10); // L: 8983 - if (var36) { // L: 8985 - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; // L: 8986 - } - - Model var41 = null; // L: 8987 - var22 = 0; // L: 8988 - if (var10.itemId != -1) { // L: 8989 - var33 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10.itemId); // L: 8990 - if (var33 != null) { // L: 8991 - var33 = var33.getCountObj(var10.itemQuantity); // L: 8992 - var41 = var33.getModel(1); // L: 8993 - if (var41 != null) { // L: 8994 - var41.calculateBoundsCylinder(); // L: 8995 - var22 = var41.height / 2; // L: 8996 - } else { - class52.invalidateWidget(var10); // L: 8998 - } - } - } else if (var10.modelType == 5) { // L: 9001 - if (var10.modelId == 0) { // L: 9002 - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = WorldMapLabelSize.localPlayer.getModel(); // L: 9003 - } - } else if (var20 == -1) { // L: 9005 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, WorldMapLabelSize.localPlayer.appearance); // L: 9006 - if (var41 == null && Widget.field2611) { // L: 9007 - class52.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = WorldMapRegion.SequenceDefinition_get(var20); // L: 9010 - var41 = var10.getModel(var47, var10.modelFrame, var36, WorldMapLabelSize.localPlayer.appearance); // L: 9011 - if (var41 == null && Widget.field2611) { // L: 9012 - class52.invalidateWidget(var10); - } - } - - Rasterizer3D.method3181(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9014 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9015 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9016 - if (var41 != null) { // L: 9017 - if (!var10.isIf3) { // L: 9018 - var41.method3003(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); // L: 9020 - if (var10.modelOrthog) { // L: 9021 - var41.method3005(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method3003(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9022 - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); // L: 9025 - } else { - if (var10.type == 7) { // L: 9028 - var39 = var10.getFont(); // L: 9029 - if (var39 == null) { // L: 9030 - if (Widget.field2611) { // L: 9031 - class52.invalidateWidget(var10); - } - continue; - } - - var20 = 0; // L: 9034 - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9035 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9036 - if (var10.itemIds[var20] > 0) { // L: 9037 - var33 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9038 - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9040 - var34 = WorldMapAreaData.colorStartTag(16748608) + var33.name + ""; // L: 9041 - } else { - var34 = WorldMapAreaData.colorStartTag(16748608) + var33.name + "" + " " + 'x' + class297.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var22 * (var10.paddingX + 115) + var12; // L: 9042 - var26 = var13 + (var10.paddingY + 12) * var21; // L: 9043 - if (var10.textXAlignment == 0) { // L: 9044 - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 9045 - var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9046 - } - } - - ++var20; // L: 9048 - } - } - } - - if (var10.type == 8 && var10 == Occluder.field1950 && Client.field828 == Client.field770) { // L: 9052 9053 - var19 = 0; // L: 9054 - var20 = 0; // L: 9055 - Font var31 = ItemDefinition.fontPlain12; // L: 9056 - String var32 = var10.text; // L: 9057 - - String var43; - for (var32 = AbstractByteArrayCopier.method4028(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9059 9060 9072 - var24 = var32.indexOf("
"); // L: 9061 - if (var24 != -1) { // L: 9062 - var43 = var32.substring(0, var24); // L: 9063 - var32 = var32.substring(var24 + 4); // L: 9064 - } else { - var43 = var32; // L: 9067 - var32 = ""; // L: 9068 - } - - var25 = var31.stringWidth(var43); // L: 9070 - if (var25 > var19) { // L: 9071 - var19 = var25; - } - } - - var19 += 6; // L: 9074 - var20 += 7; // L: 9075 - var24 = var12 + var10.width - 5 - var19; // L: 9076 - var25 = var13 + var10.height + 5; // L: 9077 - if (var24 < var12 + 5) { // L: 9078 - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { // L: 9079 - var24 = var4 - var19; - } - - if (var25 + var20 > var5) { // L: 9080 - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9081 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9082 - var32 = var10.text; // L: 9083 - var26 = var25 + var31.ascent + 2; // L: 9084 - - for (var32 = AbstractByteArrayCopier.method4028(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9085 9086 9097 - int var27 = var32.indexOf("
"); // L: 9087 - if (var27 != -1) { // L: 9088 - var43 = var32.substring(0, var27); // L: 9089 - var32 = var32.substring(var27 + 4); // L: 9090 - } else { - var43 = var32; // L: 9093 - var32 = ""; // L: 9094 - } - - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9096 - } - } - - if (var10.type == 9) { // L: 9101 - if (var10.field2639) { // L: 9106 - var19 = var12; // L: 9107 - var20 = var13 + var10.height; // L: 9108 - var21 = var12 + var10.width; // L: 9109 - var22 = var13; // L: 9110 - } else { - var19 = var12; // L: 9113 - var20 = var13; // L: 9114 - var21 = var12 + var10.width; // L: 9115 - var22 = var13 + var10.height; // L: 9116 - } - - if (var10.lineWid == 1) { // L: 9118 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9119 - } else { - ObjectSound.method1987(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9122 - } - } - } - } - } - } - } - } - } - } - } - - } // L: 9127 + static void method2668(int var0) { + Client.oculusOrbState = var0; // L: 11660 + } // L: 11661 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 9131cbc56a..944e23ba6c 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,22 +1,44 @@ +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("la") +@ObfuscatedName("lk") +@Implements("DefaultsGroup") public class DefaultsGroup { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llk;" + ) + static final DefaultsGroup field3833; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("SequenceDefinition_skeletonsArchive") + public static AbstractArchive SequenceDefinition_skeletonsArchive; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lla;" + descriptor = "[Lcf;" ) - static final DefaultsGroup field3828; - @ObfuscatedName("k") + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "[Lle;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -116036803 + intValue = -506210431 ) + @Export("group") final int group; static { - field3828 = new DefaultsGroup(3); // L: 4 + field3833 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 72df556684..852698ede4 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -1,27 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fi") +@Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("capacity") int capacity; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("remaining") int remaining; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) + @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljt;" ) + @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lea;" + descriptor = "Lee;" ) - class155 field2001; + class155 field1986; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); // L: 11 @@ -35,7 +42,8 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); // L: 19 } // L: 20 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 23 if (var3 == null) { // L: 24 @@ -65,16 +73,18 @@ public final class DemotingHashTable { } } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 48 this.removeWrapper(var3); // L: 49 } // L: 50 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lfx;)V" + descriptor = "(Lfw;)V" ) + @Export("removeWrapper") void removeWrapper(Wrapper var1) { if (var1 != null) { // L: 53 var1.remove(); // L: 54 @@ -84,7 +94,8 @@ public final class DemotingHashTable { } // L: 58 - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { // L: 61 throw new IllegalStateException(); @@ -102,8 +113,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); // L: 70 - if (this.field2001 != null) { // L: 71 - this.field2001.method3442(var5.get()); // L: 72 + if (this.field1986 != null) { // L: 71 + this.field1986.method3450(var5.get()); // L: 72 } } @@ -114,7 +125,8 @@ public final class DemotingHashTable { } } // L: 79 - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 82 if (var2.isSoft()) { // L: 83 @@ -134,7 +146,8 @@ public final class DemotingHashTable { } // L: 101 - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("clear") public void clear() { this.queue.clear(); // L: 104 this.hashTable.clear(); // L: 105 diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 2921bb0125..149e250e9b 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -1,37 +1,41 @@ +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("mf") +@ObfuscatedName("mx") +@Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1098787301 + intValue = 1591606451 ) - int field3933; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 125115333 - ) - int field3936; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1328442545 - ) - int field3930; - + int field3938; @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Lmr;", - garbageValue = "-1896317364" + @ObfuscatedGetter( + intValue = -1274184543 ) + int field3941; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1204832127 + ) + int field3944; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Lme;", + garbageValue = "1154202585" + ) + @Export("get") public PlatformInfo get() { byte var1; - if (JagexCache.field2094.startsWith("win")) { // L: 15 + if (MouseRecorder.field617.startsWith("win")) { // L: 15 var1 = 1; - } else if (JagexCache.field2094.startsWith("mac")) { // L: 16 + } else if (MouseRecorder.field617.startsWith("mac")) { // L: 16 var1 = 2; - } else if (JagexCache.field2094.startsWith("linux")) { // L: 17 + } else if (MouseRecorder.field617.startsWith("linux")) { // L: 17 var1 = 3; } else { var1 = 4; // L: 18 @@ -129,10 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; // L: 74 } - this.method6396(var5); // L: 75 + this.method6425(var5); // L: 75 int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 int var11; - if (this.field3933 > 3) { // L: 80 + if (this.field3938 > 3) { // L: 80 var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; // L: 81 @@ -146,53 +150,53 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; // L: 87 String var18 = ""; // L: 88 int[] var23 = new int[3]; // L: 93 - return new PlatformInfo(var1, var24, var7, var8, this.field3933, this.field3936, this.field3930, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 + return new PlatformInfo(var1, var24, var7, var8, this.field3938, this.field3941, this.field3944, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "395335674" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "1" ) - void method6396(String var1) { + void method6425(String var1) { if (var1.startsWith("1.")) { // L: 101 - this.method6399(var1); // L: 102 + this.method6426(var1); // L: 102 } else { - this.method6400(var1); // L: 105 + this.method6427(var1); // L: 105 } } // L: 107 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1051455651" + garbageValue = "291167261" ) - void method6399(String var1) { + void method6426(String var1) { String[] var2 = var1.split("\\."); // L: 110 try { - this.field3933 = Integer.parseInt(var2[1]); // L: 112 + this.field3938 = Integer.parseInt(var2[1]); // L: 112 var2 = var2[2].split("_"); // L: 113 - this.field3936 = Integer.parseInt(var2[0]); // L: 114 - this.field3930 = Integer.parseInt(var2[1]); // L: 115 + this.field3941 = Integer.parseInt(var2[0]); // L: 114 + this.field3944 = Integer.parseInt(var2[1]); // L: 115 } catch (Exception var4) { // L: 117 } } // L: 118 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2119124304" + garbageValue = "-1635640262" ) - void method6400(String var1) { + void method6427(String var1) { String[] var2 = var1.split("\\."); // L: 121 try { - this.field3933 = Integer.parseInt(var2[0]); // L: 123 - this.field3936 = Integer.parseInt(var2[1]); // L: 124 - this.field3930 = Integer.parseInt(var2[2]); // L: 125 + this.field3938 = Integer.parseInt(var2[0]); // L: 123 + this.field3941 = Integer.parseInt(var2[1]); // L: 124 + this.field3944 = Integer.parseInt(var2[2]); // L: 125 } catch (Exception var4) { // L: 127 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 9c39bd5fee..8aba60b604 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -3,42 +3,51 @@ import javax.sound.sampled.AudioSystem; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; import javax.sound.sampled.DataLine.Info; +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("bn") +@Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("format") AudioFormat format; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("line") SourceDataLine line; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -636994811 + intValue = 1657780029 ) + @Export("capacity2") int capacity2; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } // L: 18 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-841767260" + garbageValue = "-906788639" ) + @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field1447, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 + this.format = new AudioFormat((float)PcmPlayer.field1442, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 } // L: 23 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-120" + garbageValue = "-32" ) + @Export("open") protected void open(int var1) throws LineUnavailableException { try { Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27 @@ -46,64 +55,74 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.open(); // L: 29 this.line.start(); // L: 30 this.capacity2 = var1; // L: 31 - } catch (LineUnavailableException var3) { // L: 33 - if (Canvas.method905(var1) != 1) { // L: 34 - this.open(class297.method5378(var1)); // L: 35 + } catch (LineUnavailableException var5) { // L: 33 + int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); // L: 37 + var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459); // L: 38 + var4 = (var4 >>> 4) + var4 & 252645135; // L: 39 + var4 += var4 >>> 8; // L: 40 + var4 += var4 >>> 16; // L: 41 + int var3 = var4 & 255; // L: 42 + if (var3 != 1) { // L: 44 + this.open(WorldMapData_0.method266(var1)); // L: 45 } else { - this.line = null; // L: 38 - throw var3; // L: 39 + this.line = null; // L: 48 + throw var5; // L: 49 } } - } // L: 36 41 + } // L: 46 51 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "106" + descriptor = "(I)I", + garbageValue = "-612241013" ) + @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 54 } - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("write") protected void write() { - int var1 = 256; // L: 49 - if (PcmPlayer.PcmPlayer_stereo) { // L: 50 + int var1 = 256; // L: 59 + if (PcmPlayer.PcmPlayer_stereo) { // L: 60 var1 <<= 1; } - for (int var2 = 0; var2 < var1; ++var2) { // L: 51 - int var3 = super.samples[var2]; // L: 52 - if ((var3 + 8388608 & -16777216) != 0) { // L: 53 - var3 = 8388607 ^ var3 >> 31; // L: 54 + for (int var2 = 0; var2 < var1; ++var2) { // L: 61 + int var3 = super.samples[var2]; // L: 62 + if ((var3 + 8388608 & -16777216) != 0) { // L: 63 + var3 = 8388607 ^ var3 >> 31; // L: 64 } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 56 - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 57 + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 66 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 67 } - this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 - } // L: 60 + this.line.write(this.byteSamples, 0, var1 << 1); // L: 69 + } // L: 70 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "667465439" + descriptor = "(B)V", + garbageValue = "0" ) + @Export("close") protected void close() { - if (this.line != null) { // L: 63 - this.line.close(); // L: 64 - this.line = null; // L: 65 + if (this.line != null) { // L: 73 + this.line.close(); // L: 74 + this.line = null; // L: 75 } - } // L: 67 + } // L: 77 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2027971398" + garbageValue = "1393012391" ) + @Export("discard") protected void discard() { - this.line.flush(); // L: 70 - } // L: 71 + this.line.flush(); // L: 80 + } // L: 81 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index d127e6d991..bdd87f2e41 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,128 +1,146 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("bg") +@Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PlayerProvider { - @ObfuscatedName("fl") + @ObfuscatedName("pt") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lkv;" ) - static Fonts WorldMapElement_fonts; - @ObfuscatedName("lf") - @ObfuscatedGetter( - intValue = 1325063249 + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lle;" ) - static int menuWidth; + static IndexedSprite field439; + @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("fontPlain11") + static Font fontPlain11; DevicePcmPlayerProvider() { } // L: 7 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ldr;", - garbageValue = "-1032997343" + descriptor = "(I)Ldh;", + garbageValue = "1306134642" ) + @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); // L: 10 } - @ObfuscatedName("t") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgb;I)I", + garbageValue = "-1791433879" ) - public static int iLog(int var0) { - int var1 = 0; // L: 54 - if (var0 < 0 || var0 >= 65536) { // L: 55 - var0 >>>= 16; // L: 56 - var1 += 16; // L: 57 - } + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); // L: 11 + int var4 = var1.length(); // L: 12 + int var5 = 0; // L: 13 + int var6 = 0; // L: 14 + char var7 = 0; // L: 15 + char var8 = 0; // L: 16 - if (var0 >= 256) { // L: 59 - var0 >>>= 8; // L: 60 - var1 += 8; // L: 61 - } + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; + } - if (var0 >= 16) { // L: 63 - var0 >>>= 4; // L: 64 - var1 += 4; // L: 65 - } + if (var6 - var8 >= var4) { // L: 20 + return 1; + } - if (var0 >= 4) { // L: 67 - var0 >>>= 2; // L: 68 - var1 += 2; // L: 69 - } - - if (var0 >= 1) { // L: 71 - var0 >>>= 1; // L: 72 - ++var1; // L: 73 - } - - return var0 + var1; // L: 75 - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-2036549161" - ) - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 363 - int var2 = var1.readUnsignedByte(); // L: 364 - int var3 = var1.readInt(); // L: 365 - if (var3 < 0 || AbstractArchive.field3176 != 0 && var3 > AbstractArchive.field3176) { // L: 366 - throw new RuntimeException(); // L: 367 - } else if (var2 == 0) { // L: 369 - byte[] var6 = new byte[var3]; // L: 370 - var1.readBytes(var6, 0, var3); // L: 371 - return var6; // L: 372 - } else { - int var4 = var1.readInt(); // L: 375 - if (var4 >= 0 && (AbstractArchive.field3176 == 0 || var4 <= AbstractArchive.field3176)) { // L: 376 - byte[] var5 = new byte[var4]; // L: 379 - if (var2 == 1) { // L: 380 - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 381 - } - - return var5; // L: 382 + char var9; + if (var7 != 0) { + var9 = var7; + boolean var14 = false; // L: 25 } else { - throw new RuntimeException(); // L: 377 + var9 = var0.charAt(var5++); // L: 27 } + + char var10; + if (var8 != 0) { // L: 28 + var10 = var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } + + var7 = VarbitDefinition.method4663(var9); // L: 33 + var8 = VarbitDefinition.method4663(var10); // L: 34 + var9 = class182.standardizeChar(var9, var2); // L: 35 + var10 = class182.standardizeChar(var10, var2); // L: 36 + if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37 + var9 = Character.toLowerCase(var9); // L: 38 + var10 = Character.toLowerCase(var10); // L: 39 + if (var10 != var9) { // L: 40 + return AbstractWorldMapIcon.lowercaseChar(var9, var2) - AbstractWorldMapIcon.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); // L: 43 + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { // L: 44 + if (var2 == Language.Language_FR) { // L: 45 + var5 = var3 - 1 - var17; // L: 46 + var6 = var4 - 1 - var17; // L: 47 + } else { + var6 = var17; // L: 49 + var5 = var17; + } + + char var11 = var0.charAt(var5); // L: 50 + var12 = var1.charAt(var6); // L: 51 + if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52 + var11 = Character.toLowerCase(var11); // L: 53 + var12 = Character.toLowerCase(var12); // L: 54 + if (var11 != var12) { + return AbstractWorldMapIcon.lowercaseChar(var11, var2) - AbstractWorldMapIcon.lowercaseChar(var12, var2); // L: 55 + } + } + } + + var17 = var3 - var4; // L: 58 + if (var17 != 0) { // L: 59 + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { // L: 60 + var12 = var0.charAt(var18); // L: 61 + char var13 = var1.charAt(var18); // L: 62 + if (var13 != var12) { // L: 63 + return AbstractWorldMapIcon.lowercaseChar(var12, var2) - AbstractWorldMapIcon.lowercaseChar(var13, var2); + } + } + + return 0; // L: 65 } } - @ObfuscatedName("jl") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-334845913" + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-243383079" ) - static void method897() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 10265 - int var1 = var0.group; // L: 10266 - if (WorldMapSprite.loadInterface(var1)) { // L: 10267 - boolean var2 = true; // L: 10268 - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 10269 + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + class3.addChatMessage(var0, var1, var2, (String)null); // L: 23 + } // L: 24 - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 10270 - if (var3[var4] != null) { // L: 10271 - var2 = var3[var4].isIf3; // L: 10272 - break; - } - } - - if (!var2) { // L: 10276 - var4 = (int)var0.key; // L: 10277 - Widget var5 = TileItem.getWidget(var4); // L: 10278 - if (var5 != null) { // L: 10279 - class52.invalidateWidget(var5); - } - } - } - } - - } // L: 10283 + @ObfuscatedName("b") + public static boolean method941(long var0) { + return var0 != 0L && !WorldMapCacheName.method725(var0); // L: 48 + } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 22d42de203..676118b1f4 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -1,30 +1,25 @@ import java.nio.ByteBuffer; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("hv") +@Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - static GameBuild field2525; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("directBuffer") ByteBuffer directBuffer; DirectByteArrayCopier() { } // L: 10 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "-1021172953" + descriptor = "(B)[B", + garbageValue = "-47" ) + @Export("get") byte[] get() { byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 this.directBuffer.position(0); // L: 14 @@ -32,50 +27,15 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; // L: 16 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-1366071744" + descriptor = "([BB)V", + garbageValue = "0" ) + @Export("set") void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20 this.directBuffer.position(0); // L: 21 this.directBuffer.put(var1); // L: 22 } // L: 23 - - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "(Lhq;IIB)V", - garbageValue = "47" - ) - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 9262 - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 9263 - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 9264 - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 9265 - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 9266 - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9267 - } - - if (var0.yAlignment == 0) { // L: 9268 - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 9269 - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 9270 - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 9271 - } else if (var0.yAlignment == 4) { // L: 9272 - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 9273 - } - - } // L: 9274 } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index e236ed3637..d43efefbd8 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -1,8 +1,12 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fq") +@ObfuscatedName("fs") +@Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("obj") Object obj; DirectWrapper(Object var1, int var2) { @@ -10,12 +14,14 @@ public class DirectWrapper extends Wrapper { this.obj = var1; // L: 8 } // L: 9 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("get") Object get() { return this.obj; // L: 12 } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("isSoft") boolean isSoft() { return false; // L: 16 } diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 9d8b685c71..c711118f93 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -1,22 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gp") +@Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cj") + @ObfuscatedName("cq") + @Export("keyDual") public long keyDual; @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgp;" ) + @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cx") + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgp;" ) + @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("dq") + @ObfuscatedName("cu") + @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 this.nextDual.previousDual = this.previousDual; // L: 10 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index bd5ecd06f1..26eacc7cfd 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -1,12 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jv") +@Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgp;" ) + @Export("sentinel") DualNode sentinel; public DualNodeDeque() { @@ -15,10 +19,11 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgp;)V" ) + @Export("addFirst") public void addFirst(DualNode var1) { if (var1.nextDual != null) { // L: 14 var1.removeDual(); @@ -30,10 +35,11 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 18 } // L: 19 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgp;)V" ) + @Export("addLast") public void addLast(DualNode var1) { if (var1.nextDual != null) { // L: 22 var1.removeDual(); @@ -45,10 +51,11 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lgs;" + descriptor = "()Lgp;" ) + @Export("removeLast") public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; // L: 30 return var1 == this.sentinel ? null : var1; // L: 31 32 diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index ccf4f9c2ee..cedca224e3 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -1,62 +1,69 @@ +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("cb") +@ObfuscatedName("ck") +@Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "Lkr;" + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -550843083 ) - static Font fontPlain11; + @Export("id") + int id; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 174390429 + ) + @Export("type") + int type; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 89407283 + ) + @Export("orientation") + int orientation; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1374963731 + ) + @Export("plane") + int plane; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -992554479 - ) - int id; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -224037215 - ) - int type; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1337748479 - ) - int orientation; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 719138669 - ) - int plane; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1011089507 + intValue = -2010464009 ) + @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1704315949 + intValue = 647351421 ) + @Export("y") int y; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljg;" ) + @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -791329731 + intValue = 2125087057 ) + @Export("frame") int frame; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1556832647 + intValue = 561855979 ) + @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLez;)V" + descriptor = "(IIIIIIIZLej;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; // L: 20 @@ -66,12 +73,12 @@ public class DynamicObject extends Entity { this.x = var5; // L: 24 this.y = var6; // L: 25 if (var7 != -1) { // L: 26 - this.sequenceDefinition = WorldMapRegion.SequenceDefinition_get(var7); // L: 27 + this.sequenceDefinition = class105.SequenceDefinition_get(var7); // L: 27 this.frame = 0; // L: 28 this.cycleStart = Client.cycle - 1; // L: 29 - if (this.sequenceDefinition.field3535 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 + if (this.sequenceDefinition.field3551 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 DynamicObject var10 = (DynamicObject)var9; // L: 31 - if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32 + if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 this.frame = var10.frame; // L: 33 this.cycleStart = var10.cycleStart; // L: 34 return; // L: 35 @@ -86,11 +93,12 @@ public class DynamicObject extends Entity { } // L: 43 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ler;", - garbageValue = "-2026237468" + descriptor = "(I)Leh;", + garbageValue = "-2070677844" ) + @Export("getModel") protected final Model getModel() { if (this.sequenceDefinition != null) { // L: 46 int var1 = Client.cycle - this.cycleStart; // L: 47 @@ -98,11 +106,11 @@ public class DynamicObject extends Entity { var1 = 100; } - label54: { + label55: { do { do { if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 49 - break label54; + break label55; } var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50 @@ -118,7 +126,7 @@ public class DynamicObject extends Entity { this.cycleStart = Client.cycle - var1; // L: 60 } - ObjectDefinition var12 = MidiPcmStream.getObjectDefinition(this.id); // L: 62 + ObjectDefinition var12 = ScriptEvent.getObjectDefinition(this.id); // L: 62 if (var12.transforms != null) { // L: 63 var12 = var12.transform(); } @@ -148,84 +156,43 @@ public class DynamicObject extends Entity { } } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkf;IIIIIIB)V", - garbageValue = "24" + descriptor = "(IIII)I", + garbageValue = "1129350300" ) - 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) { // L: 108 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 109 + static final int method2357(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 436 + int var4 = var0 & var2 - 1; // L: 437 + int var5 = var1 / var2; // L: 438 + int var6 = var1 & var2 - 1; // L: 439 + int var7 = WorldMapID.method665(var3, var5); // L: 440 + int var8 = WorldMapID.method665(var3 + 1, var5); // L: 441 + int var9 = WorldMapID.method665(var3, var5 + 1); // L: 442 + int var10 = WorldMapID.method665(var3 + 1, var5 + 1); // L: 443 + int var11 = PendingSpawn.method1841(var7, var8, var4, var2); // L: 444 + int var12 = PendingSpawn.method1841(var9, var10, var4, var2); // L: 445 + return PendingSpawn.method1841(var11, var12, var6, var2); // L: 446 + } - while (true) { - var7 = var0.readUnsignedByte(); // L: 111 - if (var7 == 0) { // L: 112 - if (var1 == 0) { // L: 113 - int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 114 - int var11 = var2 + var4 + 932731; // L: 117 - int var12 = var3 + var5 + 556238; // L: 118 - int var13 = class60.method947(45365 + var11, 91923 + var12, 4) - 128 + (class60.method947(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (class60.method947(var11, var12, 1) - 128 >> 2); // L: 120 - var13 = (int)((double)var13 * 0.3D) + 35; // L: 121 - if (var13 < 10) { // L: 122 - var13 = 10; - } else if (var13 > 60) { // L: 123 - var13 = 60; - } + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-41" + ) + static boolean method2362(int var0) { + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 8956 + } - var14[var3] = -var13 * 8; // L: 126 - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 128 - } - break; - } - - if (var7 == 1) { // L: 131 - int var8 = var0.readUnsignedByte(); // L: 132 - if (var8 == 1) { // L: 133 - var8 = 0; - } - - if (var1 == 0) { // L: 134 - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 135 - } - break; - } - - if (var7 <= 49) { // L: 138 - Tiles.field521[var1][var2][var3] = var0.readByte(); // L: 139 - class297.field3668[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 140 - class171.field2049[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 141 - } else if (var7 <= 81) { // L: 144 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 145 - } else { - Tiles.field528[var1][var2][var3] = (byte)(var7 - 81); // L: 148 - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); // L: 153 - if (var7 == 0) { // L: 154 - break; - } - - if (var7 == 1) { // L: 155 - var0.readUnsignedByte(); // L: 156 - break; - } - - if (var7 <= 49) { // L: 159 - var0.readUnsignedByte(); - } - } + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-2144644905" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (ScriptFrame.loadInterface(var0)) { // L: 10342 + class69.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10343 } - - } // L: 162 - - @ObfuscatedName("m") - static final void addEntityUnderMouse(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 99 - } // L: 100 + } // L: 10344 } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index e1126cf3c6..c0824432fa 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -1,34 +1,47 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("ej") +@Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("pe") + @ObfuscatedName("hj") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "[Llc;" ) - static ClanChat clanChat; - @ObfuscatedName("cf") + @Export("mapDotSprites") + static Sprite[] mapDotSprites; + @ObfuscatedName("iz") @ObfuscatedGetter( - intValue = -282434447 + intValue = 685420897 ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("cu") + @ObfuscatedGetter( + intValue = 1647777713 + ) + @Export("height") public int height; protected Entity() { this.height = 1000; // L: 6 } // L: 8 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ler;", - garbageValue = "-2026237468" + descriptor = "(I)Leh;", + garbageValue = "-2070677844" ) + @Export("getModel") protected Model getModel() { return null; // L: 19 } - @ObfuscatedName("cb") + @ObfuscatedName("cg") + @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); // L: 11 if (var11 != null) { // L: 12 @@ -38,14 +51,13 @@ public abstract class Entity extends DualNode { } // L: 16 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;Lic;B)V", - garbageValue = "28" + descriptor = "(Lbd;I)V", + garbageValue = "-1146861517" ) - public static void method3381(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; // L: 27 - KitDefinition.KitDefinition_modelsArchive = var1; // L: 28 - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 29 - } // L: 30 + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class58.runScript(var0, 500000); // L: 97 + } // L: 98 } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index dee4beb1af..3f89abeb0f 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -1,40 +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("jp") +@ObfuscatedName("jd") +@Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("EnumDefinition_archive") static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) + @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("bb") + @Export("otp") + static String otp; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "[Llc;" + ) + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; + @ObfuscatedName("l") + @Export("inputType") public char inputType; - @ObfuscatedName("t") - public char outputType; - @ObfuscatedName("i") - public String defaultStr; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1401922337 - ) - public int defaultInt; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1452935225 - ) - public int outputCount; - @ObfuscatedName("w") - public int[] keys; - @ObfuscatedName("g") - public int[] intVals; @ObfuscatedName("m") + @Export("outputType") + public char outputType; + @ObfuscatedName("z") + @Export("defaultStr") + public String defaultStr; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -25790237 + ) + @Export("defaultInt") + public int defaultInt; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1613773715 + ) + @Export("outputCount") + public int outputCount; + @ObfuscatedName("c") + @Export("keys") + public int[] keys; + @ObfuscatedName("u") + @Export("intVals") + public int[] intVals; + @ObfuscatedName("t") + @Export("strVals") public String[] strVals; static { @@ -46,11 +68,12 @@ public class EnumDefinition extends DualNode { this.outputCount = 0; // L: 17 } // L: 22 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-2086226438" + descriptor = "(Lkb;I)V", + garbageValue = "729247361" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 40 @@ -62,11 +85,12 @@ public class EnumDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;IB)V", - garbageValue = "57" + descriptor = "(Lkb;II)V", + garbageValue = "-2002314807" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 47 this.inputType = (char)var1.readUnsignedByte(); @@ -101,87 +125,43 @@ public class EnumDefinition extends DualNode { } // L: 70 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "1958366010" ) + @Export("size") public int size() { return this.outputCount; // L: 73 } - @ObfuscatedName("i") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)[B", - garbageValue = "-2060894177" + descriptor = "(II)I", + garbageValue = "22707007" ) - public static byte[] method4644(CharSequence var0) { - int var1 = var0.length(); // L: 84 - byte[] var2 = new byte[var1]; // L: 85 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 86 - char var4 = var0.charAt(var3); // L: 87 - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 88 - var2[var3] = (byte)var4; - } else if (var4 == 8364) { // L: 89 - var2[var3] = -128; - } else if (var4 == 8218) { // L: 90 - var2[var3] = -126; - } else if (var4 == 402) { // L: 91 - var2[var3] = -125; - } else if (var4 == 8222) { // L: 92 - var2[var3] = -124; - } else if (var4 == 8230) { // L: 93 - var2[var3] = -123; - } else if (var4 == 8224) { // L: 94 - var2[var3] = -122; - } else if (var4 == 8225) { // L: 95 - var2[var3] = -121; - } else if (var4 == 710) { // L: 96 - var2[var3] = -120; - } else if (var4 == 8240) { // L: 97 - var2[var3] = -119; - } else if (var4 == 352) { - var2[var3] = -118; // L: 98 - } else if (var4 == 8249) { // L: 99 - var2[var3] = -117; - } else if (var4 == 338) { // L: 100 - var2[var3] = -116; - } else if (var4 == 381) { // L: 101 - var2[var3] = -114; - } else if (var4 == 8216) { // L: 102 - var2[var3] = -111; - } else if (var4 == 8217) { // L: 103 - var2[var3] = -110; - } else if (var4 == 8220) { // L: 104 - var2[var3] = -109; - } else if (var4 == 8221) { // L: 105 - var2[var3] = -108; - } else if (var4 == 8226) { // L: 106 - var2[var3] = -107; - } else if (var4 == 8211) { // L: 107 - var2[var3] = -106; - } else if (var4 == 8212) { // L: 108 - var2[var3] = -105; - } else if (var4 == 732) { // L: 109 - var2[var3] = -104; - } else if (var4 == 8482) { // L: 110 - var2[var3] = -103; - } else if (var4 == 353) { // L: 111 - var2[var3] = -102; - } else if (var4 == 8250) { // L: 112 - var2[var3] = -101; - } else if (var4 == 339) { // L: 113 - var2[var3] = -100; - } else if (var4 == 382) { // L: 114 - var2[var3] = -98; - } else if (var4 == 376) { // L: 115 - var2[var3] = -97; - } else { - var2[var3] = 63; // L: 116 - } + public static int method4714(int var0) { + if (var0 > 0) { // L: 191 + return 1; + } else { + return var0 < 0 ? -1 : 0; // L: 192 193 } - - return var2; // L: 118 } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1488753124" + ) + static final void method4721(int var0) { + if (var0 >= 0) { // L: 7935 + int var1 = Client.menuArguments1[var0]; // L: 7936 + int var2 = Client.menuArguments2[var0]; // L: 7937 + int var3 = Client.menuOpcodes[var0]; // L: 7938 + int var4 = Client.menuIdentifiers[var0]; // L: 7939 + String var5 = Client.menuActions[var0]; // L: 7940 + String var6 = Client.menuTargets[var0]; // L: 7941 + Calendar.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7942 + } + } // L: 7943 } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index 69aff34129..7f0cc57b08 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -1,12 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("ga") +@Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") int rsOrdinal(); } diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index fded460308..88b1cb677c 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -1,30 +1,37 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("ev") +@Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lgp;" + ) + DualNode field1978; + @ObfuscatedName("b") + @Export("capacity") + int capacity; + @ObfuscatedName("l") + @Export("remainingCapacity") + int remainingCapacity; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + @Export("hashTable") + IterableNodeHashTable hashTable; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgs;" - ) - DualNode field1995; - @ObfuscatedName("k") - int capacity; - @ObfuscatedName("s") - int remainingCapacity; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - IterableNodeHashTable hashTable; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljt;" ) + @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1995 = new DualNode(); // L: 8 + this.field1978 = new DualNode(); // L: 8 this.deque = new IterableDualNodeQueue(); // L: 12 this.capacity = var1; // L: 15 this.remainingCapacity = var1; // L: 16 @@ -36,10 +43,11 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); // L: 19 } // L: 20 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(J)Lgs;" + descriptor = "(J)Lgp;" ) + @Export("get") public DualNode get(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23 if (var3 != null) { // L: 24 @@ -49,7 +57,8 @@ public final class EvictingDualNodeHashTable { return var3; // L: 28 } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 if (var3 != null) { // L: 33 @@ -60,16 +69,17 @@ public final class EvictingDualNodeHashTable { } // L: 38 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgs;J)V" + descriptor = "(Lgp;J)V" ) + @Export("put") public void put(DualNode var1, long var2) { if (this.remainingCapacity == 0) { // L: 41 DualNode var4 = this.deque.removeLast(); // L: 42 var4.remove(); // L: 43 var4.removeDual(); // L: 44 - if (var4 == this.field1995) { // L: 45 + if (var4 == this.field1978) { // L: 45 var4 = this.deque.removeLast(); // L: 46 var4.remove(); // L: 47 var4.removeDual(); // L: 48 @@ -82,11 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); // L: 53 } // L: 54 - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("clear") public void clear() { this.deque.clear(); // L: 57 this.hashTable.clear(); // L: 58 - this.field1995 = new DualNode(); // L: 59 + this.field1978 = new DualNode(); // L: 59 this.remainingCapacity = this.capacity; // L: 60 } // L: 61 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 6518f103bc..8db945504b 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -1,53 +1,75 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("eb") +@Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1856660121 + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "[Lle;" ) - public static int pcmSampleLength; - @ObfuscatedName("ha") - @ObfuscatedGetter( - intValue = 1637295417 + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Lid;" ) - static int cameraY; - @ObfuscatedName("k") + @Export("archive3") + static Archive archive3; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -364011515 + intValue = 875969351 ) + @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1271035903 + intValue = -440953057 ) + @Export("y") int y; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1616346001 + intValue = -1278044513 ) + @Export("z") int z; FaceNormal() { } // L: 8 - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILlz;Liw;B)V", - garbageValue = "81" + descriptor = "([I[II)V", + garbageValue = "-2056587398" ) - static void method3388(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 30 - var3.type = 1; // L: 31 - var3.key = (long)var0; // L: 32 - var3.archiveDisk = var1; // L: 33 - var3.archive = var2; // L: 34 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 35 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 36 - } // L: 37 + public static void method3392(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + Coord.ByteArrayPool_alternativeSizes = var0; // L: 25 + FloorDecoration.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 + ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 - WorldMapArea.method415(); // L: 38 - } // L: 39 + for (int var2 = 0; var2 < Coord.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 + ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 + } + + } else { + Coord.ByteArrayPool_alternativeSizes = null; + FloorDecoration.ByteArrayPool_altSizeArrayCounts = null; // L: 21 + ByteArrayPool.ByteArrayPool_arrays = null; // L: 22 + } + } // L: 23 31 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Liw;I)V", + garbageValue = "-1326300873" + ) + public static void method3393(AbstractArchive var0) { + class25.VarpDefinition_archive = var0; // L: 18 + VarpDefinition.VarpDefinition_fileCount = class25.VarpDefinition_archive.getGroupFileCount(16); // L: 19 + } // L: 20 } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index e23d9e1d2b..c153869d28 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -1,21 +1,21 @@ import java.io.File; import java.util.Hashtable; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fn") +@Implements("FileSystem") public class FileSystem { - @ObfuscatedName("rt") - @ObfuscatedGetter( - intValue = -929980525 - ) - static int field2099; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; static { @@ -23,118 +23,70 @@ public class FileSystem { FileSystem_cacheFiles = new Hashtable(16); } // L: 9 - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;IB)Z", - garbageValue = "1" + descriptor = "(Liw;Liw;I)V", + garbageValue = "1765921646" ) - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); // L: 368 - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { // L: 369 - if (var0.readBits(1) != 0) { // L: 370 - updateExternalPlayer(var0, var1); - } + public static void method3630(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; // L: 27 + KitDefinition.KitDefinition_modelsArchive = var1; // L: 28 + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 29 + } // L: 30 - var3 = var0.readBits(13); // L: 371 - var4 = var0.readBits(13); // L: 372 - boolean var12 = var0.readBits(1) == 1; // L: 373 - if (var12) { // L: 374 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { // L: 375 - throw new RuntimeException(); // L: 376 - } else { - Player var11 = Client.players[var1] = new Player(); // L: 378 - var11.index = var1; // L: 379 - if (Players.field1277[var1] != null) { // L: 380 - var11.read(Players.field1277[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; // L: 381 - var11.targetIndex = Players.Players_targetIndices[var1]; // L: 382 - var7 = Players.Players_regions[var1]; // L: 383 - var8 = var7 >> 28; // L: 384 - var9 = var7 >> 14 & 255; // L: 385 - var10 = var7 & 255; // L: 386 - var11.pathTraversed[0] = Players.field1284[var1]; // L: 387 - var11.plane = (byte)var8; // L: 388 - var11.resetPath((var9 << 13) + var3 - WorldMapManager.baseX, (var10 << 13) + var4 - WorldMapLabel.baseY); // L: 389 - var11.field660 = false; // L: 390 - return true; // L: 391 - } - } else if (var2 == 1) { // L: 393 - var3 = var0.readBits(2); // L: 394 - var4 = Players.Players_regions[var1]; // L: 395 - Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 396 - return false; // L: 397 - } else { - int var5; - int var6; - if (var2 == 2) { // L: 399 - var3 = var0.readBits(5); // L: 400 - var4 = var3 >> 3; // L: 401 - var5 = var3 & 7; // L: 402 - var6 = Players.Players_regions[var1]; // L: 403 - var7 = (var6 >> 28) + var4 & 3; // L: 404 - var8 = var6 >> 14 & 255; // L: 405 - var9 = var6 & 255; // L: 406 - if (var5 == 0) { // L: 407 - --var8; // L: 408 - --var9; // L: 409 - } - - if (var5 == 1) { // L: 411 - --var9; - } - - if (var5 == 2) { // L: 412 - ++var8; // L: 413 - --var9; // L: 414 - } - - if (var5 == 3) { // L: 416 - --var8; - } - - if (var5 == 4) { // L: 417 - ++var8; - } - - if (var5 == 5) { // L: 418 - --var8; // L: 419 - ++var9; // L: 420 - } - - if (var5 == 6) { // L: 422 - ++var9; - } - - if (var5 == 7) { // L: 423 - ++var8; // L: 424 - ++var9; // L: 425 - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 427 - return false; // L: 428 - } else { - var3 = var0.readBits(18); // L: 430 - var4 = var3 >> 16; // L: 431 - var5 = var3 >> 8 & 255; // L: 432 - var6 = var3 & 255; // L: 433 - var7 = Players.Players_regions[var1]; // L: 434 - var8 = (var7 >> 28) + var4 & 3; // L: 435 - var9 = var5 + (var7 >> 14) & 255; // L: 436 - var10 = var6 + var7 & 255; // L: 437 - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 438 - return false; // L: 439 - } - } + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Lcf;", + garbageValue = "1501989228" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? DefaultsGroup.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 } + + @ObfuscatedName("ic") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "77" + ) + static final int method3638() { + return Client.menuOptionsCount - 1; // L: 8952 + } + + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "(Lht;IIS)V", + garbageValue = "10290" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 9925 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 9926 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 9927 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 9928 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 9929 + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9930 + } + + if (var0.yAlignment == 0) { // L: 9931 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 9932 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 9933 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 9934 + } else if (var0.yAlignment == 4) { // L: 9935 + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 9936 + } + + } // L: 9937 } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index d7148cf6ad..66008c4515 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -1,34 +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("lm") +@ObfuscatedName("lu") +@Implements("FillMode") public enum FillMode implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Llu;" ) + @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Llu;" ) + @Export("GRADIENT") GRADIENT(1, 1), - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Llu;" ) + @Export("GRADIENT_ALPHA") GRADIENT_ALPHA(2, 2); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1262740687 + intValue = -142023791 ) + @Export("id") public final int id; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1489188623 + intValue = 2056260395 ) + @Export("index") final int index; FillMode(int var3, int var4) { @@ -36,11 +44,12 @@ public enum FillMode implements Enumerated { this.index = var4; // L: 20 } // L: 21 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.index; // L: 24 } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 2fb40b5603..f638474a90 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -1,161 +1,137 @@ +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("eu") +@ObfuscatedName("ek") +@Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("re") + @ObfuscatedName("c") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("gs") @ObfuscatedGetter( - intValue = -1689305311 + intValue = 1831338455 ) - static int field1640; + @Export("baseX") + static int baseX; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1613676277 + ) + @Export("tileHeight") + int tileHeight; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -339938865 + intValue = -191694913 ) - public static int canvasWidth; + @Export("x") + int x; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 489421685 + ) + @Export("y") + int y; + @ObfuscatedName("m") + @ObfuscatedGetter( + longValue = 2791850332732375269L + ) + @Export("tag") + public long tag; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lej;" ) + @Export("entity") public Entity entity; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -894788303 - ) - int tileHeight; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1021856255 - ) - int x; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1156042873 - ) - int y; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = -1933481833005826137L - ) - public long tag; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -124409527 + intValue = -1457303601 ) + @Export("flags") int flags; FloorDecoration() { - } // L: 11 + } - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Lct;II[I[II)V", - garbageValue = "1270252584" + descriptor = "(I)[Llb;", + garbageValue = "1849672417" ) - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { // L: 81 - int var5 = var1 - 1; // L: 82 - int var6 = var2 + 1; // L: 83 - int var7 = (var2 + var1) / 2; // L: 84 - World var8 = var0[var7]; // L: 85 - var0[var7] = var0[var1]; // L: 86 - var0[var1] = var8; // L: 87 + static PrivateChatMode[] method2989() { + return new PrivateChatMode[]{PrivateChatMode.field3826, PrivateChatMode.field3824, PrivateChatMode.field3827}; // L: 11 + } - while (var5 < var6) { // L: 88 - boolean var9 = true; // L: 89 - - int var10; - int var11; - int var12; - do { - --var6; // L: 91 - - for (var10 = 0; var10 < 4; ++var10) { // L: 92 - if (var3[var10] == 2) { // L: 95 - var11 = var0[var6].index; // L: 96 - var12 = var8.index; // L: 97 - } else if (var3[var10] == 1) { // L: 99 - var11 = var0[var6].population; // L: 100 - var12 = var8.population; // L: 101 - if (var11 == -1 && var4[var10] == 1) { // L: 102 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 103 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 105 - var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 - } else { - var11 = var0[var6].id; // L: 110 - var12 = var8.id; // L: 111 - } - - if (var11 != var12) { // L: 113 - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 - var9 = false; // L: 119 - } - break; - } - - if (var10 == 3) { // L: 114 - var9 = false; - } - } - } while(var9); - - var9 = true; // L: 124 - - do { - ++var5; // L: 126 - - for (var10 = 0; var10 < 4; ++var10) { // L: 127 - if (var3[var10] == 2) { // L: 130 - var11 = var0[var5].index; // L: 131 - var12 = var8.index; // L: 132 - } else if (var3[var10] == 1) { // L: 134 - var11 = var0[var5].population; // L: 135 - var12 = var8.population; // L: 136 - if (var11 == -1 && var4[var10] == 1) { // L: 137 - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { // L: 138 - var12 = 2001; - } - } else if (var3[var10] == 3) { // L: 140 - var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 - var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 - } else { - var11 = var0[var5].id; // L: 145 - var12 = var8.id; // L: 146 - } - - if (var12 != var11) { // L: 148 - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 - var9 = false; // L: 154 - } - break; - } - - if (var10 == 3) { // L: 149 - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { // L: 159 - World var13 = var0[var5]; // L: 160 - var0[var5] = var0[var6]; // L: 161 - var0[var6] = var13; // L: 162 - } - } - - sortWorlds(var0, var1, var6, var3, var4); // L: 165 - sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Liw;III)Llc;", + garbageValue = "1333431169" + ) + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 141 + boolean var3; + if (var4 == null) { // L: 142 + var3 = false; // L: 143 + } else { + class217.SpriteBuffer_decode(var4); // L: 146 + var3 = true; // L: 147 } - } // L: 168 + return !var3 ? null : class281.method5132(); // L: 149 150 + } + + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1780593024" + ) + static final void method2986() { + if (Client.logoutTimer > 0) { // L: 3026 + class89.logOut(); // L: 3027 + } else { + Client.timer.method5147(); // L: 3030 + BuddyRankComparator.updateGameState(40); // L: 3031 + MouseRecorder.field615 = Client.packetWriter.getSocket(); // L: 3032 + Client.packetWriter.removeSocket(); // L: 3033 + } + } // L: 3028 3034 + + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-584173376" + ) + static final void method2988() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7190 7191 7210 + if (var0.hitpoints > 0) { // L: 7192 + --var0.hitpoints; + } + + if (var0.hitpoints == 0) { // L: 7193 + if (var0.objectId < 0 || UrlRequest.method3437(var0.objectId, var0.field959)) { // L: 7194 + WorldMapIcon_0.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field963, var0.field959); // L: 7195 + var0.remove(); // L: 7196 + } + } else { + if (var0.delay > 0) { // L: 7200 + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || UrlRequest.method3437(var0.id, var0.field962))) { // L: 7201 7202 + WorldMapIcon_0.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field962); // L: 7203 + var0.delay = -1; // L: 7204 + if (var0.objectId == var0.id && var0.objectId == -1) { // L: 7205 + var0.remove(); + } else if (var0.id == var0.objectId && var0.field963 == var0.orientation && var0.field962 == var0.field959) { + var0.remove(); // L: 7206 + } + } + } + } + + } // L: 7212 } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 0302092e5a..e8168d192e 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -1,78 +1,99 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("jp") +@Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Liw;" ) + @Export("FloorOverlayDefinition_archive") + public static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("FloorOverlayDefinition_cached") static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1313207677 + intValue = -1626409717 ) + @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1768544221 - ) - public int texture; - @ObfuscatedName("i") - public boolean hideUnderlay; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1964387519 - ) - public int secondaryRgb; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1954941483 - ) - public int hue; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -935699783 - ) - public int saturation; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1596036719 - ) - public int lightness; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 45293449 + intValue = -1711745165 ) + @Export("texture") + public int texture; + @ObfuscatedName("z") + @Export("hideUnderlay") + public boolean hideUnderlay; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -245262637 + ) + @Export("secondaryRgb") + public int secondaryRgb; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -334470275 + ) + @Export("hue") + public int hue; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 530209803 + ) + @Export("saturation") + public int saturation; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1645062629 + ) + @Export("lightness") + public int lightness; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 390180503 + ) + @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1367236851 + intValue = 700927849 ) + @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1186195215 + intValue = 862539151 ) + @Export("secondaryLightness") public int secondaryLightness; static { - FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); + FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } FloorOverlayDefinition() { - this.primaryRgb = 0; - this.texture = -1; - this.hideUnderlay = true; - this.secondaryRgb = -1; + this.primaryRgb = 0; // L: 12 + this.texture = -1; // L: 13 + this.hideUnderlay = true; // L: 14 + this.secondaryRgb = -1; // L: 15 } // L: 23 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1294557825" + garbageValue = "-1333451124" ) + @Export("postDecode") void postDecode() { if (this.secondaryRgb != -1) { // L: 37 this.setHsl(this.secondaryRgb); // L: 38 @@ -84,11 +105,12 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); // L: 43 } // L: 44 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-1509952388" + descriptor = "(Lkb;IB)V", + garbageValue = "10" ) + @Export("decode") void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); // L: 48 @@ -100,11 +122,12 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;III)V", - garbageValue = "211427426" + descriptor = "(Lkb;III)V", + garbageValue = "1891819359" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { if (var2 == 1) { // L: 55 this.primaryRgb = var1.readMedium(); @@ -119,11 +142,12 @@ public class FloorOverlayDefinition extends DualNode { } // L: 61 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "304322495" + descriptor = "(IS)V", + garbageValue = "23572" ) + @Export("setHsl") void setHsl(int var1) { double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64 double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65 @@ -149,7 +173,7 @@ public class FloorOverlayDefinition extends DualNode { double var12 = 0.0D; // L: 73 double var14 = 0.0D; // L: 74 double var16 = (var10 + var8) / 2.0D; // L: 75 - if (var8 != var10) { // L: 76 + if (var10 != var8) { // L: 76 if (var16 < 0.5D) { // L: 77 var14 = (var10 - var8) / (var8 + var10); } @@ -161,15 +185,15 @@ public class FloorOverlayDefinition extends DualNode { if (var10 == var2) { // L: 79 var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { // L: 80 - var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 81 + var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var10 == var6) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81 } } var12 /= 6.0D; // L: 83 this.hue = (int)(256.0D * var12); // L: 84 - this.saturation = (int)(var14 * 256.0D); // L: 85 + this.saturation = (int)(256.0D * var14); // L: 85 this.lightness = (int)(var16 * 256.0D); // L: 86 if (this.saturation < 0) { // L: 87 this.saturation = 0; @@ -184,198 +208,4 @@ public class FloorOverlayDefinition extends DualNode { } } // L: 91 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-1598465666" - ) - public static int method4871(CharSequence var0) { - int var1 = var0.length(); // L: 9 - int var2 = 0; // L: 10 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 11 - char var4 = var0.charAt(var3); // L: 12 - if (var4 <= 127) { // L: 13 - ++var2; - } else if (var4 <= 2047) { // L: 14 - var2 += 2; - } else { - var2 += 3; // L: 15 - } - } - - return var2; // L: 17 - } - - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(ZLky;I)V", - garbageValue = "2034094426" - ) - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field771 = 0; // L: 6735 - Client.field702 = 0; // L: 6736 - PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 6738 - var2.importIndex(); // L: 6739 - int var3 = var2.readBits(8); // L: 6740 - int var4; - if (var3 < Client.npcCount) { // L: 6741 - for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 6742 - Client.field930[++Client.field771 - 1] = Client.npcIndices[var4]; - } - } - - if (var3 > Client.npcCount) { // L: 6744 - throw new RuntimeException(""); - } else { - Client.npcCount = 0; // L: 6745 - - for (var4 = 0; var4 < var3; ++var4) { // L: 6746 - int var5 = Client.npcIndices[var4]; // L: 6747 - NPC var6 = Client.npcs[var5]; // L: 6748 - int var7 = var2.readBits(1); // L: 6749 - if (var7 == 0) { // L: 6750 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6751 - var6.npcCycle = Client.cycle; // L: 6752 - } else { - int var8 = var2.readBits(2); // L: 6755 - if (var8 == 0) { // L: 6756 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6757 - var6.npcCycle = Client.cycle; // L: 6758 - Client.field721[++Client.field702 - 1] = var5; // L: 6759 - } else { - int var9; - int var10; - if (var8 == 1) { // L: 6762 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6763 - var6.npcCycle = Client.cycle; // L: 6764 - var9 = var2.readBits(3); // L: 6765 - var6.method2115(var9, (byte)1); // L: 6766 - var10 = var2.readBits(1); // L: 6767 - if (var10 == 1) { // L: 6768 - Client.field721[++Client.field702 - 1] = var5; - } - } else if (var8 == 2) { // L: 6771 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6772 - var6.npcCycle = Client.cycle; // L: 6773 - var9 = var2.readBits(3); // L: 6774 - var6.method2115(var9, (byte)2); // L: 6775 - var10 = var2.readBits(3); // L: 6776 - var6.method2115(var10, (byte)2); // L: 6777 - int var11 = var2.readBits(1); // L: 6778 - if (var11 == 1) { // L: 6779 - Client.field721[++Client.field702 - 1] = var5; - } - } else if (var8 == 3) { // L: 6782 - Client.field930[++Client.field771 - 1] = var5; // L: 6783 - } - } - } - } - - method4879(var0, var1); // L: 6788 - Archive.method4357(var1); // L: 6789 - - int var12; - for (var12 = 0; var12 < Client.field771; ++var12) { // L: 6790 - var3 = Client.field930[var12]; // L: 6791 - if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 6792 - Client.npcs[var3].definition = null; // L: 6793 - Client.npcs[var3] = null; // L: 6794 - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 6797 - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var12 = 0; var12 < Client.npcCount; ++var12) { // L: 6798 - if (Client.npcs[Client.npcIndices[var12]] == null) { // L: 6799 - throw new RuntimeException(var12 + "," + Client.npcCount); // L: 6800 - } - } - - } - } - } // L: 6803 - - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "(ZLky;B)V", - garbageValue = "46" - ) - static final void method4879(boolean var0, PacketBuffer var1) { - while (true) { - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 6807 - int var2 = var1.readBits(15); // L: 6808 - if (var2 != 32767) { // L: 6809 - boolean var3 = false; // L: 6810 - if (Client.npcs[var2] == null) { // L: 6811 - Client.npcs[var2] = new NPC(); // L: 6812 - var3 = true; // L: 6813 - } - - NPC var4 = Client.npcs[var2]; // L: 6815 - Client.npcIndices[++Client.npcCount - 1] = var2; // L: 6816 - var4.npcCycle = Client.cycle; // L: 6817 - int var5 = var1.readBits(1); // L: 6818 - if (var5 == 1) { // L: 6819 - Client.field721[++Client.field702 - 1] = var2; - } - - int var6; - if (var0) { // L: 6821 - var6 = var1.readBits(8); // L: 6822 - if (var6 > 127) { // L: 6823 - var6 -= 256; - } - } else { - var6 = var1.readBits(5); // L: 6826 - if (var6 > 15) { // L: 6827 - var6 -= 32; - } - } - - int var7 = var1.readBits(1); // L: 6829 - var4.definition = Skeleton.getNpcDefinition(var1.readBits(14)); // L: 6830 - int var8 = Client.defaultRotations[var1.readBits(3)]; // L: 6831 - if (var3) { // L: 6832 - var4.orientation = var4.rotation = var8; - } - - int var9; - if (var0) { // L: 6834 - var9 = var1.readBits(8); // L: 6835 - if (var9 > 127) { // L: 6836 - var9 -= 256; - } - } else { - var9 = var1.readBits(5); // L: 6839 - if (var9 > 15) { - var9 -= 32; // L: 6840 - } - } - - var4.field1014 = var4.definition.size; // L: 6842 - var4.field1025 = var4.definition.rotation; // L: 6843 - if (var4.field1025 == 0) { // L: 6844 - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; // L: 6845 - var4.walkBackSequence = var4.definition.walkBackSequence; // L: 6846 - var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 6847 - var4.walkRightSequence = var4.definition.walkRightSequence; // L: 6848 - var4.idleSequence = var4.definition.idleSequence; // L: 6849 - var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 6850 - var4.turnRightSequence = var4.definition.turnRightSequence; // L: 6851 - var4.method2121(WorldMapLabelSize.localPlayer.pathX[0] + var9, WorldMapLabelSize.localPlayer.pathY[0] + var6, var7 == 1); // L: 6852 - continue; // L: 6853 - } - } - - var1.exportIndex(); // L: 6854 - return; // L: 6855 - } - } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 91bc2f0037..13f5399ba4 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -1,163 +1,177 @@ +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("iu") +@ObfuscatedName("ia") +@Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) - public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("k") + @Export("FloorUnderlayDefinition_archive") + static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) - public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("s") + @Export("FloorUnderlayDefinition_cached") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1526550495 + intValue = -1168290687 ) + @Export("rgb") int rgb; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -196392257 + intValue = 1022846445 ) + @Export("hue") public int hue; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1341685519 + intValue = 1296043119 ) + @Export("saturation") public int saturation; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 57935727 + intValue = -834824709 ) + @Export("lightness") public int lightness; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1946992829 + intValue = -1129037543 ) + @Export("hueMultiplier") public int hueMultiplier; static { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - public FloorUnderlayDefinition() { + FloorUnderlayDefinition() { this.rgb = 0; // L: 12 - } + } // L: 18 - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-7" + descriptor = "(I)V", + garbageValue = "1295425125" ) - public void postDecode() { - this.setHsl(this.rgb); // L: 23 - } // L: 24 + @Export("postDecode") + void postDecode() { + this.setHsl(this.rgb); // L: 36 + } // L: 37 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-1970476156" + descriptor = "(Lkb;II)V", + garbageValue = "387811374" ) - public void decode(Buffer var1, int var2) { + @Export("decode") + void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 28 - if (var3 == 0) { // L: 29 - return; // L: 32 + int var3 = var1.readUnsignedByte(); // L: 41 + if (var3 == 0) { // L: 42 + return; // L: 45 } - this.decodeNext(var1, var3, var2); // L: 30 + this.decodeNext(var1, var3, var2); // L: 43 } } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkf;III)V", - garbageValue = "-789345955" + descriptor = "(Lkb;IIS)V", + garbageValue = "255" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 35 + if (var2 == 1) { // L: 48 this.rgb = var1.readMedium(); } - } // L: 37 + } // L: 50 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "39" + descriptor = "(II)V", + garbageValue = "1228051433" ) + @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 40 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 41 - double var6 = (double)(var1 & 255) / 256.0D; // L: 42 - double var8 = var2; // L: 43 - if (var4 < var2) { // L: 44 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 53 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 54 + double var6 = (double)(var1 & 255) / 256.0D; // L: 55 + double var8 = var2; // L: 56 + if (var4 < var2) { // L: 57 var8 = var4; } - if (var6 < var8) { // L: 45 + if (var6 < var8) { // L: 58 var8 = var6; } - double var10 = var2; // L: 46 - if (var4 > var2) { // L: 47 + double var10 = var2; // L: 59 + if (var4 > var2) { // L: 60 var10 = var4; } - if (var6 > var10) { // L: 48 + if (var6 > var10) { // L: 61 var10 = var6; } - double var12 = 0.0D; // L: 49 - double var14 = 0.0D; // L: 50 - double var16 = (var8 + var10) / 2.0D; // L: 51 - if (var10 != var8) { // L: 52 - if (var16 < 0.5D) { // L: 53 + double var12 = 0.0D; // L: 62 + double var14 = 0.0D; // L: 63 + double var16 = (var10 + var8) / 2.0D; // L: 64 + if (var8 != var10) { // L: 65 + if (var16 < 0.5D) { // L: 66 var14 = (var10 - var8) / (var10 + var8); } - if (var16 >= 0.5D) { // L: 54 + if (var16 >= 0.5D) { // L: 67 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { // L: 55 + if (var10 == var2) { // L: 68 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 56 - var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var4 == var10) { // L: 69 + var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 57 + var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 70 } } - var12 /= 6.0D; // L: 59 - this.saturation = (int)(var14 * 256.0D); // L: 60 - this.lightness = (int)(256.0D * var16); // L: 61 - if (this.saturation < 0) { // L: 62 + var12 /= 6.0D; // L: 72 + this.saturation = (int)(256.0D * var14); // L: 73 + this.lightness = (int)(256.0D * var16); // L: 74 + if (this.saturation < 0) { // L: 75 this.saturation = 0; - } else if (this.saturation > 255) { // L: 63 + } else if (this.saturation > 255) { // L: 76 this.saturation = 255; } - if (this.lightness < 0) { // L: 64 + if (this.lightness < 0) { // L: 77 this.lightness = 0; - } else if (this.lightness > 255) { // L: 65 + } else if (this.lightness > 255) { // L: 78 this.lightness = 255; } - if (var16 > 0.5D) { // L: 66 + if (var16 > 0.5D) { // L: 79 this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); } else { - this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 67 + this.hueMultiplier = (int)(var14 * var16 * 512.0D); // L: 80 } - if (this.hueMultiplier < 1) { // L: 68 + if (this.hueMultiplier < 1) { // L: 81 this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); // L: 69 - } // L: 70 + this.hue = (int)((double)this.hueMultiplier * var12); // L: 82 + } // L: 83 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 7e1f60ffb1..df7643c813 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -1,6 +1,9 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kr") +@ObfuscatedName("kq") +@Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { super(var1, var2, var3, var4, var5, var6, var7); // L: 7 @@ -10,7 +13,8 @@ public final class Font extends AbstractFont { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("z") + @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; // L: 15 int var8 = Rasterizer2D.Rasterizer2D_width - var4; // L: 16 @@ -51,7 +55,8 @@ public final class Font extends AbstractFont { } } // L: 44 - @ObfuscatedName("k") + @ObfuscatedName("b") + @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; // L: 47 int var9 = Rasterizer2D.Rasterizer2D_width - var4; // L: 48 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index eee64792e4..fd2dfed677 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,55 +1,67 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kz") +@ObfuscatedName("ko") +@Implements("FontName") public class FontName { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("FontName_plain11") + public static final FontName FontName_plain11; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("FontName_plain12") + public static final FontName FontName_plain12; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("FontName_bold12") + public static final FontName FontName_bold12; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("FontName_verdana11") + public static final FontName FontName_verdana11; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkz;" - ) - public static final FontName FontName_plain11; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - public static final FontName FontName_plain12; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - public static final FontName FontName_bold12; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - public static final FontName FontName_verdana11; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lko;" ) + @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lko;" ) + @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 334630663 + intValue = 218864089 ) - static int clientTickTimeIdx; - @ObfuscatedName("eo") + public static int field3694; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lgb;" ) - static Archive archive20; - @ObfuscatedName("gg") + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("ew") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llo;" ) - static Sprite redHintArrowSprite; - @ObfuscatedName("x") + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("k") + @Export("name") String name; static { @@ -65,55 +77,104 @@ public class FontName { this.name = var1; // L: 20 } // L: 21 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)[Lkz;", - garbageValue = "1417653903" + descriptor = "(B)[Lko;", + garbageValue = "-98" ) - public static FontName[] method5439() { - return new FontName[]{FontName_verdana13, FontName_verdana15, FontName_verdana11, FontName_plain12, FontName_plain11, FontName_bold12}; // L: 16 + public static FontName[] method5456() { + return new FontName[]{FontName_bold12, FontName_plain11, FontName_verdana11, FontName_verdana13, FontName_plain12, FontName_verdana15}; // L: 16 } - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Z", - garbageValue = "-1097380872" - ) - static boolean method5444(String var0, int var1) { - return WorldMapIcon_1.method380(var0, var1, "openjs"); // L: 57 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1161805725" - ) - public static String method5445(CharSequence var0) { - return ScriptEvent.method1236('*', var0.length()); // L: 179 - } - - @ObfuscatedName("fo") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1773491987" + garbageValue = "-1218729276" ) - static void setWindowedMode(int var0) { - Client.field890 = 0L; // L: 3866 - if (var0 >= 2) { // L: 3867 - Client.isResizable = true; + public static void method5459(int var0) { + if (class206.musicPlayerStatus != 0) { // L: 44 + class206.musicTrackVolume = var0; } else { - Client.isResizable = false; // L: 3868 + class13.midiPcmStream.setPcmStreamVolume(var0); // L: 45 } - if (class39.getWindowedMode() == 1) { // L: 3869 - class2.client.setMaxCanvasSize(765, 503); // L: 3870 - } else { - class2.client.setMaxCanvasSize(7680, 2160); // L: 3873 + } // L: 46 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "13921338" + ) + static int method5455(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3193 + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "18" + ) + static void method5458(int var0, String var1) { + int var2 = Players.Players_count; // L: 8749 + int[] var3 = Players.Players_indices; // L: 8750 + boolean var4 = false; // L: 8751 + Username var5 = new Username(var1, UserComparator4.loginType); // L: 8752 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 8753 + Player var7 = Client.players[var3[var6]]; // L: 8754 + if (var7 != null && var7 != PlayerType.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8755 + PacketBufferNode var8; + if (var0 == 1) { // L: 8756 + var8 = class4.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); // L: 8758 + var8.packetBuffer.writeByte(0); // L: 8759 + var8.packetBuffer.method5673(var3[var6]); // L: 8760 + Client.packetWriter.addNode(var8); // L: 8761 + } else if (var0 == 4) { // L: 8763 + var8 = class4.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); // L: 8765 + var8.packetBuffer.writeShort(var3[var6]); // L: 8766 + var8.packetBuffer.writeByte(0); // L: 8767 + Client.packetWriter.addNode(var8); // L: 8768 + } else if (var0 == 6) { // L: 8770 + var8 = class4.getPacketBufferNode(ClientPacket.field2323, Client.packetWriter.isaacCipher); // L: 8772 + var8.packetBuffer.writeShort(var3[var6]); // L: 8773 + var8.packetBuffer.writeIntME(0); // L: 8774 + Client.packetWriter.addNode(var8); // L: 8775 + } else if (var0 == 7) { // L: 8777 + var8 = class4.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 8779 + var8.packetBuffer.method5674(var3[var6]); // L: 8780 + var8.packetBuffer.writeIntME(0); // L: 8781 + Client.packetWriter.addNode(var8); // L: 8782 + } + + var4 = true; // L: 8784 + break; + } } - if (Client.gameState >= 25) { // L: 3875 - GrandExchangeEvent.method160(); + if (!var4) { // L: 8788 + DevicePcmPlayerProvider.addGameMessage(4, "", "Unable to find " + var1); } - } // L: 3876 + } // L: 8789 + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "67" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (ScriptFrame.loadInterface(var0)) { // L: 11056 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11057 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11058 + Widget var3 = var1[var2]; // L: 11059 + if (var3 != null) { // L: 11060 + var3.modelFrame = 0; // L: 11061 + var3.modelFrameCycle = 0; // L: 11062 + } + } + + } + } // L: 11064 } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 033374aa91..ca1e4897f4 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,24 +1,30 @@ import java.util.HashMap; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("kn") +@Implements("Fonts") public class Fonts { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lic;Lic;)V" + descriptor = "(Liw;Liw;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; // L: 14 @@ -26,11 +32,12 @@ public class Fonts { this.map = new HashMap(); // L: 16 } // L: 17 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Lkz;I)Ljava/util/HashMap;", - garbageValue = "376087905" + descriptor = "([Lko;I)Ljava/util/HashMap;", + garbageValue = "1654438568" ) + @Export("createMap") public HashMap createMap(FontName[] var1) { HashMap var2 = new HashMap(); // L: 20 FontName[] var3 = var1; // L: 22 @@ -40,7 +47,7 @@ public class Fonts { if (this.map.containsKey(var5)) { // L: 26 var2.put(var5, this.map.get(var5)); // L: 27 } else { - Font var6 = BufferedSink.method5983(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + Font var6 = TilePaint.method3210(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 if (var6 != null) { // L: 31 this.map.put(var5, var6); // L: 32 var2.put(var5, var6); // L: 33 @@ -50,4 +57,15 @@ public class Fonts { return var2; // L: 39 } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "-1606902213" + ) + static final void method5463(int var0, int var1, int var2, boolean var3) { + if (ScriptFrame.loadInterface(var0)) { // L: 9885 + SecureRandomFuture.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 9886 + } + } // L: 9887 } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index d49079bc00..644997e736 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,29 +1,28 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("ex") +@Implements("Frames") public class Frames extends DualNode { @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lak;" - ) - static WorldMapEvent worldMapEvent; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "[Les;" + descriptor = "[Ler;" ) + @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lic;Lic;IZ)V" + descriptor = "(Liw;Liw;IZ)V" ) Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { - NodeDeque var5 = new NodeDeque(); - int var6 = var1.getGroupFileCount(var3); - this.frames = new Animation[var6]; - int[] var7 = var1.getGroupFileIds(var3); + NodeDeque var5 = new NodeDeque(); // L: 35 + int var6 = var1.getGroupFileCount(var3); // L: 36 + this.frames = new Animation[var6]; // L: 37 + int[] var7 = var1.getGroupFileIds(var3); // L: 38 - for (int var8 = 0; var8 < var7.length; ++var8) { + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 39 byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 40 Skeleton var10 = null; // L: 41 int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 42 @@ -52,106 +51,83 @@ public class Frames extends DualNode { } // L: 60 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-615268512" + descriptor = "(IB)Z", + garbageValue = "-35" ) + @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; // L: 63 } - @ObfuscatedName("z") - public static final int method3395(double var0, double var2, double var4) { - double var6 = var4; // L: 9 - double var8 = var4; // L: 10 - double var10 = var4; // L: 11 - if (0.0D != var2) { // L: 12 - double var12; - if (var4 < 0.5D) { // L: 14 - var12 = (var2 + 1.0D) * var4; - } else { - var12 = var4 + var2 - var2 * var4; // L: 15 - } + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "([Lht;II)V", + garbageValue = "-1768141764" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11067 + Widget var3 = var0[var2]; // L: 11068 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !VertexNormal.isComponentHidden(var3))) { // L: 11069 11070 11071 + int var5; + if (var3.type == 0) { // L: 11072 + if (!var3.isIf3 && VertexNormal.isComponentHidden(var3) && var3 != GrandExchangeEvent.mousedOverWidgetIf1) { // L: 11073 + continue; + } - double var14 = var4 * 2.0D - var12; // L: 16 - double var16 = 0.3333333333333333D + var0; // L: 17 - if (var16 > 1.0D) { // L: 18 - --var16; - } + drawModelComponents(var0, var3.id); // L: 11074 + if (var3.children != null) { // L: 11075 + drawModelComponents(var3.children, var3.id); + } - double var20 = var0 - 0.3333333333333333D; // L: 20 - if (var20 < 0.0D) { // L: 21 - ++var20; - } + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11076 + if (var4 != null) { // L: 11077 + var5 = var4.group; // L: 11078 + if (ScriptFrame.loadInterface(var5)) { // L: 11080 + drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); // L: 11081 + } + } + } - if (var16 * 6.0D < 1.0D) { // L: 22 - var6 = var14 + 6.0D * (var12 - var14) * var16; - } else if (var16 * 2.0D < 1.0D) { // L: 23 - var6 = var12; - } else if (var16 * 3.0D < 2.0D) { // L: 24 - var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; - } else { - var6 = var14; // L: 25 - } + if (var3.type == 6) { // L: 11085 + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11086 + boolean var7 = BufferedNetSocket.runCs1(var3); // L: 11087 + if (var7) { // L: 11089 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 11090 + } - if (var0 * 6.0D < 1.0D) { // L: 26 - var8 = var14 + 6.0D * (var12 - var14) * var0; - } else if (2.0D * var0 < 1.0D) { // L: 27 - var8 = var12; - } else if (3.0D * var0 < 2.0D) { // L: 28 - var8 = (0.6666666666666666D - var0) * (var12 - var14) * 6.0D + var14; - } else { - var8 = var14; // L: 29 - } + if (var5 != -1) { // L: 11091 + SequenceDefinition var6 = class105.SequenceDefinition_get(var5); // L: 11092 - if (6.0D * var20 < 1.0D) { // L: 30 - var10 = var14 + (var12 - var14) * 6.0D * var20; - } else if (2.0D * var20 < 1.0D) { // L: 31 - var10 = var12; - } else if (3.0D * var20 < 2.0D) { // L: 32 - var10 = 6.0D * (0.6666666666666666D - var20) * (var12 - var14) + var14; - } else { - var10 = var14; // L: 33 + for (var3.modelFrameCycle += Client.field743; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3)) { // L: 11093 11094 11101 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11095 + ++var3.modelFrame; // L: 11096 + if (var3.modelFrame >= var6.frameIds.length) { // L: 11097 + var3.modelFrame -= var6.frameCount; // L: 11098 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11099 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field2734 != 0 && !var3.isIf3) { // L: 11105 + int var8 = var3.field2734 >> 16; // L: 11106 + var5 = var3.field2734 << 16 >> 16; // L: 11107 + var8 *= Client.field743; // L: 11108 + var5 *= Client.field743; // L: 11109 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11110 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11111 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 11112 + } + } } } - int var22 = (int)(var6 * 256.0D); // L: 35 - int var13 = (int)(256.0D * var8); // L: 36 - int var23 = (int)(var10 * 256.0D); // L: 37 - int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 - return var15; // L: 39 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-500804162" - ) - public static int getEntityIdUnderMouse(int var0) { - return UserComparator9.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 72 - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2077943773" - ) - static final void clanKickUser(String var0) { - if (Entity.clanChat != null) { // L: 10687 - PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); // L: 10688 - var1.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0)); // L: 10689 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 10690 - Client.packetWriter.addNode(var1); // L: 10691 - } - } // L: 10692 - - @ObfuscatedName("kz") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "127790133" - ) - static void method3393(int var0) { - Client.oculusOrbState = var0; // L: 10876 - } // L: 10877 + } // L: 11116 } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 8ac122fb25..c394cee23b 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -1,21 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("ki") +@Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("z") - boolean field3651; - @ObfuscatedName("k") - boolean field3652; + @ObfuscatedName("f") + boolean field3659; + @ObfuscatedName("b") + boolean field3660; Friend() { } // L: 9 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkc;I)I", - garbageValue = "1550059745" + descriptor = "(Lki;I)I", + garbageValue = "638196038" ) + @Export("compareToFriend") int compareToFriend(Friend var1) { if (super.world == Client.worldId && Client.worldId != var1.world) { // L: 12 return -1; @@ -25,24 +29,25 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field3651 && !var1.field3651) { // L: 16 + } else if (this.field3659 && !var1.field3659) { // L: 16 return -1; - } else if (!this.field3651 && var1.field3651) { // L: 17 + } else if (!this.field3659 && var1.field3659) { // L: 17 return 1; - } else if (this.field3652 && !var1.field3652) { // L: 18 + } else if (this.field3660 && !var1.field3660) { // L: 18 return -1; - } else if (!this.field3652 && var1.field3652) { // L: 19 + } else if (!this.field3660 && var1.field3660) { // L: 19 return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("ar") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljc;I)I", - garbageValue = "-243007320" + descriptor = "(Ljh;B)I", + garbageValue = "69" ) + @Export("compareTo_user") public int compareTo_user(User var1) { return this.compareToFriend((Friend)var1); // L: 29 } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 52faad3fe9..2a36d1a210 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -1,27 +1,34 @@ +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("kb") +@ObfuscatedName("kk") +@Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("s") + @ObfuscatedName("u") + public static short[] field3671; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1710257939 + intValue = 1131935431 ) - public int field3664; - @ObfuscatedName("t") + public int field3670; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkm;" ) + @Export("username") public Username username; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lku;I)V" + descriptor = "(Lkm;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3664 = (int)(PacketWriter.currentTimeMillis() / 1000L); // L: 106 + this.field3670 = (int)(User.currentTimeMillis() / 1000L); // L: 106 this.username = var1; // L: 107 this.world = (short)var2; // L: 108 } // L: 109 diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 1117c30f89..80f5d3d0ec 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,523 +1,535 @@ +import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cr") +@ObfuscatedName("cc") +@Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("t") + @ObfuscatedName("os") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lcz;" ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lmc;" + ) + @Export("loginType") final LoginType loginType; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkw;" + descriptor = "Lkd;" ) + @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lke;" ) + @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1061950327 + intValue = 1331025573 ) - int field1099; + int field1097; @ObfuscatedSignature( - descriptor = "(Lmu;)V" + descriptor = "(Lmc;)V" ) FriendSystem(LoginType var1) { - this.field1099 = 0; // L: 23 + this.field1097 = 0; // L: 23 this.loginType = var1; // L: 26 this.friendsList = new FriendsList(var1); // L: 27 this.ignoreList = new IgnoreList(var1); // L: 28 } // L: 29 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1895979589" + garbageValue = "366163976" ) - boolean method1972() { - return this.field1099 == 2; // L: 32 + boolean method1958() { + return this.field1097 == 2; // L: 32 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1001513486" + garbageValue = "1495060497" ) - final void method1919() { - this.field1099 = 1; - } + final void method1957() { + this.field1097 = 1; // L: 36 + } // L: 37 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;IS)V", - garbageValue = "-279" + descriptor = "(Lkb;II)V", + garbageValue = "-320273584" ) + @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); // L: 40 - this.field1099 = 2; // L: 41 + this.field1097 = 2; // L: 41 for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43 Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44 var4.clearIsFriend(); // L: 45 } - class89.method2127(); // L: 47 - if (Entity.clanChat != null) { // L: 48 - Entity.clanChat.clearFriends(); // L: 49 + Iterator var5 = Messages.Messages_hashTable.iterator(); // L: 48 + + while (var5.hasNext()) { + Message var6 = (Message)var5.next(); // L: 49 + var6.clearIsFromFriend(); // L: 51 } - } // L: 52 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 55 + DevicePcmPlayerProvider.clanChat.clearFriends(); // L: 56 + } - @ObfuscatedName("t") + } // L: 59 + + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1616251932" + garbageValue = "-1762300851" ) + @Export("processFriendUpdates") final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 55 - if ((long)var1.field3664 < PacketWriter.currentTimeMillis() / 1000L - 5L) { // L: 56 + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 62 + if ((long)var1.field3670 < User.currentTimeMillis() / 1000L - 5L) { if (var1.world > 0) { - WorldMapRectangle.addGameMessage(5, "", var1.username + " has logged in."); // L: 57 + DevicePcmPlayerProvider.addGameMessage(5, "", var1.username + " has logged in."); } - if (var1.world == 0) { // L: 58 - WorldMapRectangle.addGameMessage(5, "", var1.username + " has logged out."); + if (var1.world == 0) { + DevicePcmPlayerProvider.addGameMessage(5, "", var1.username + " has logged out."); } - var1.remove(); // L: 59 + var1.remove(); } } - } // L: 62 + } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "16776960" + garbageValue = "-710169059" ) + @Export("clear") final void clear() { - this.field1099 = 0; // L: 65 - this.friendsList.clear(); // L: 66 - this.ignoreList.clear(); // L: 67 - } // L: 68 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lku;ZB)Z", - garbageValue = "6" - ) - final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { // L: 71 - return false; - } else if (var1.equals(WorldMapLabelSize.localPlayer.username)) { // L: 72 - return true; - } else { - return this.friendsList.isFriended(var1, var2); // L: 73 - } + this.field1097 = 0; + this.friendsList.clear(); // L: 73 + this.ignoreList.clear(); // L: 74 } - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lku;B)Z", - garbageValue = "-12" - ) - final boolean isIgnored(Username var1) { - if (var1 == null) { // L: 78 - return false; - } else { - return this.ignoreList.contains(var1); // L: 79 - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "597249959" - ) - final void addFriend(String var1) { - if (var1 != null) { // L: 84 - Username var2 = new Username(var1, this.loginType); // L: 85 - if (var2.hasCleanName()) { // L: 86 - if (this.friendsListIsFull()) { // L: 87 - Object var10000 = null; // L: 89 - String var3 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - WorldMapRectangle.addGameMessage(30, "", var3); // L: 91 - } else if (WorldMapLabelSize.localPlayer.username.equals(var2)) { // L: 96 - WorldMapSection1.method649(); // L: 97 - } else if (this.isFriended(var2, false)) { // L: 100 - ModelData0.method3377(var1); // L: 101 - } else if (this.isIgnored(var2)) { // L: 104 - WorldMapRegion.method609(var1); // L: 105 - } else { - UserComparator9.method3492(var1); // L: 108 - } - } - } - } // L: 94 98 102 106 109 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "-12193" - ) - final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field888 != 1; // L: 141 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1984933223" - ) - final void addIgnore(String var1) { - if (var1 != null) { // L: 148 - Username var2 = new Username(var1, this.loginType); // L: 149 - if (var2.hasCleanName()) { // L: 150 - StringBuilder var10000; - String var4; - if (this.canAddIgnore()) { // L: 151 - var10000 = null; // L: 153 - var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - WorldMapRectangle.addGameMessage(30, "", var4); // L: 155 - } else if (WorldMapLabelSize.localPlayer.username.equals(var2)) { // L: 160 - var10000 = null; // L: 162 - var4 = "You can't add yourself to your own ignore list"; - WorldMapRectangle.addGameMessage(30, "", var4); // L: 164 - } else { - Object var10001; - if (this.isIgnored(var2)) { // L: 169 - var10000 = (new StringBuilder()).append(var1); // L: 171 - var10001 = null; - var4 = var10000.append(" is already on your ignore list").toString(); - WorldMapRectangle.addGameMessage(30, "", var4); // L: 173 - } else if (this.isFriended(var2, false)) { // L: 178 - var10000 = new StringBuilder(); - var10001 = null; // L: 180 - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var4 = var10000.append(" from your friend list first").toString(); - WorldMapRectangle.addGameMessage(30, "", var4); // L: 182 - } else { - PacketBufferNode var3 = Client.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); // L: 189 - var3.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var1)); // L: 190 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 191 - Client.packetWriter.addNode(var3); // L: 192 - } - } - } - } - } // L: 158 167 176 185 194 - @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "61" + descriptor = "(Lkm;ZI)Z", + garbageValue = "-1897160718" ) - final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field888 != 1; // L: 197 + @Export("isFriended") + final boolean isFriended(Username var1, boolean var2) { + if (var1 == null) { + return false; + } else if (var1.equals(PlayerType.localPlayer.username)) { // L: 79 + return true; + } else { + return this.friendsList.isFriended(var1, var2); // L: 80 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lkm;I)Z", + garbageValue = "1651377109" + ) + @Export("isIgnored") + final boolean isIgnored(Username var1) { + if (var1 == null) { // L: 85 + return false; + } else { + return this.ignoreList.contains(var1); // L: 86 + } } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1937520523" + garbageValue = "625813578" ) - final void removeFriend(String var1) { - if (var1 != null) { // L: 204 - Username var2 = new Username(var1, this.loginType); // L: 205 - if (var2.hasCleanName()) { // L: 206 - if (this.friendsList.removeByUsername(var2)) { // L: 207 - Client.field870 = Client.cycleCntr; // L: 209 - PacketBufferNode var3 = Client.getPacketBufferNode(ClientPacket.field2319, Client.packetWriter.isaacCipher); // L: 212 - var3.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var1)); // L: 213 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 214 - Client.packetWriter.addNode(var3); // L: 215 + @Export("addFriend") + final void addFriend(String var1) { + if (var1 != null) { // L: 91 + Username var2 = new Username(var1, this.loginType); // L: 92 + if (var2.hasCleanName()) { // L: 93 + if (this.friendsListIsFull()) { // L: 94 + Object var10000 = null; // L: 96 + String var3 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + DevicePcmPlayerProvider.addGameMessage(30, "", var3); // L: 98 + } else if (PlayerType.localPlayer.username.equals(var2)) { // L: 103 + MouseRecorder.method1286(); // L: 104 + } else if (this.isFriended(var2, false)) { // L: 107 + class60.method983(var1); // L: 108 + } else if (this.isIgnored(var2)) { // L: 111 + GrandExchangeOfferAgeComparator.method241(var1); // L: 112 + } else { + Canvas.method949(var1); // L: 115 } - - for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 218 - Player var4 = Client.players[Players.Players_indices[var5]]; // L: 219 - var4.clearIsFriend(); // L: 220 - } - - class89.method2127(); // L: 222 - if (Entity.clanChat != null) { // L: 223 - Entity.clanChat.clearFriends(); // L: 224 - } - } } - } // L: 227 + } // L: 101 105 109 113 116 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1768016322" + ) + @Export("friendsListIsFull") + final boolean friendsListIsFull() { + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field799 != 1; // L: 148 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-109423207" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 155 + Username var2 = new Username(var1, this.loginType); + if (var2.hasCleanName()) { + Object var10000; + String var3; + if (this.canAddIgnore()) { + var10000 = null; + var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + DevicePcmPlayerProvider.addGameMessage(30, "", var3); + } else if (PlayerType.localPlayer.username.equals(var2)) { + var10000 = null; // L: 169 + var3 = "You can't add yourself to your own ignore list"; + DevicePcmPlayerProvider.addGameMessage(30, "", var3); + } else if (this.isIgnored(var2)) { // L: 176 + class217.method4098(var1); + } else if (this.isFriended(var2, false)) { + WorldMapArea.method506(var1); // L: 181 + } else { + HealthBarUpdate.method1869(var1); // L: 184 + } + } + } + } // L: 174 182 185 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-34" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field799 != 1; // L: 210 + } @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1683783285" + garbageValue = "-1777583860" ) - final void removeIgnore(String var1) { - if (var1 != null) { // L: 230 - Username var2 = new Username(var1, this.loginType); // L: 231 - if (var2.hasCleanName()) { // L: 232 - if (this.ignoreList.removeByUsername(var2)) { // L: 233 - Client.field870 = Client.cycleCntr; // L: 235 - PacketBufferNode var3 = Client.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); // L: 238 - var3.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var1)); // L: 239 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 240 - Client.packetWriter.addNode(var3); // L: 241 + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { // L: 217 + Username var2 = new Username(var1, this.loginType); // L: 218 + if (var2.hasCleanName()) { // L: 219 + if (this.friendsList.removeByUsername(var2)) { // L: 220 + Client.field874 = Client.cycleCntr; // L: 222 + PacketBufferNode var3 = class4.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); // L: 225 + var3.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var1)); // L: 226 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 227 + Client.packetWriter.addNode(var3); // L: 228 + } + + for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 231 + Player var4 = Client.players[Players.Players_indices[var5]]; // L: 232 + var4.clearIsFriend(); // L: 233 + } + + Iterator var6 = Messages.Messages_hashTable.iterator(); // L: 236 + + while (var6.hasNext()) { + Message var7 = (Message)var6.next(); // L: 237 + var7.clearIsFromFriend(); // L: 239 + } + + if (DevicePcmPlayerProvider.clanChat != null) { // L: 243 + DevicePcmPlayerProvider.clanChat.clearFriends(); // L: 244 } - KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 243 } } - } // L: 244 + } // L: 247 - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lku;I)Z", - garbageValue = "-1919732460" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "66" ) + @Export("removeIgnore") + final void removeIgnore(String var1) { + if (var1 != null) { // L: 250 + Username var2 = new Username(var1, this.loginType); // L: 251 + if (var2.hasCleanName()) { // L: 252 + if (this.ignoreList.removeByUsername(var2)) { // L: 253 + Client.field874 = Client.cycleCntr; // L: 255 + PacketBufferNode var3 = class4.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); // L: 258 + var3.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var1)); // L: 259 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 260 + Client.packetWriter.addNode(var3); // L: 261 + } + + class52.FriendSystem_invalidateIgnoreds(); // L: 263 + } + } + } // L: 264 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lkm;I)Z", + garbageValue = "-1712856211" + ) + @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 256 - return var2 != null && var2.hasWorld(); // L: 257 + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 276 + return var2 != null && var2.hasWorld(); // L: 277 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Lie;", - garbageValue = "-2171031" + descriptor = "(III)V", + garbageValue = "-145581337" ) - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33 - if (var1 != null) { // L: 34 - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 35 - var1 = new KitDefinition(); // L: 36 - if (var2 != null) { // L: 37 - var1.decode(new Buffer(var2)); + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; // L: 63 + int[] var3 = new int[4]; // L: 64 + var2[0] = var0; // L: 65 + var3[0] = var1; // L: 66 + int var4 = 1; // L: 67 + + for (int var5 = 0; var5 < 4; ++var5) { // L: 68 + if (World.World_sortOption1[var5] != var0) { // L: 69 + var2[var4] = World.World_sortOption1[var5]; // L: 70 + var3[var4] = World.World_sortOption2[var5]; // L: 71 + ++var4; // L: 72 } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 } - } - @ObfuscatedName("t") + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + ModeWhere.sortWorlds(DefaultsGroup.World_worlds, 0, DefaultsGroup.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIILgk;Lft;B)Z", - garbageValue = "6" + descriptor = "(B)V", + garbageValue = "1" ) - static final boolean method1976(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; // L: 308 - int var6 = var1; // L: 309 - byte var7 = 64; // L: 310 - byte var8 = 64; // L: 311 - int var9 = var0 - var7; // L: 312 - int var10 = var1 - var8; // L: 313 - class182.directions[var7][var8] = 99; // L: 314 - class182.distances[var7][var8] = 0; // L: 315 - byte var11 = 0; // L: 316 - int var12 = 0; // L: 317 - class182.bufferX[var11] = var0; // L: 318 - int var20 = var11 + 1; - class182.bufferY[var11] = var1; // L: 319 - int[][] var13 = var4.flags; // L: 320 + public static void method2017() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 156 + ++KeyHandler.KeyHandler_idleCycles; // L: 157 + KeyHandler.field415 = KeyHandler.field428; // L: 158 + KeyHandler.field427 = 0; // L: 159 + int var1; + if (KeyHandler.field423 < 0) { // L: 160 + for (var1 = 0; var1 < 112; ++var1) { // L: 161 + KeyHandler.KeyHandler_pressedKeys[var1] = false; + } - while (true) { - label311: - while (true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label288: - do { - if (var20 == var12) { // L: 321 - class182.field2135 = var5; // L: 440 - class182.field2136 = var6; // L: 441 - return false; // L: 442 - } + KeyHandler.field423 = KeyHandler.field422; // L: 162 + } else { + while (KeyHandler.field422 != KeyHandler.field423) { // L: 165 + var1 = KeyHandler.field435[KeyHandler.field422]; // L: 166 + KeyHandler.field422 = KeyHandler.field422 + 1 & 127; // L: 167 + if (var1 < 0) { // L: 168 + KeyHandler.KeyHandler_pressedKeys[~var1] = false; + } else { + if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field427 < KeyHandler.field430.length - 1) { // L: 170 + KeyHandler.field430[++KeyHandler.field427 - 1] = var1; // L: 171 + } - var5 = class182.bufferX[var12]; // L: 322 - var6 = class182.bufferY[var12]; // L: 323 - var12 = var12 + 1 & 4095; // L: 324 - var18 = var5 - var9; // L: 325 - var19 = var6 - var10; // L: 326 - var14 = var5 - var4.xInset; // L: 327 - var15 = var6 - var4.yInset; // L: 328 - if (var3.hasArrived(var2, var5, var6, var4)) { // L: 329 - class182.field2135 = var5; // L: 330 - class182.field2136 = var6; // L: 331 - return true; // L: 332 - } - - var16 = class182.distances[var18][var19] + 1; // L: 334 - if (var18 > 0 && class182.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 335 336 337 338 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5 - 1; // L: 342 - class182.bufferY[var20] = var6; // L: 343 - var20 = var20 + 1 & 4095; // L: 344 - class182.directions[var18 - 1][var19] = 2; // L: 345 - class182.distances[var18 - 1][var19] = var16; // L: 346 - break; - } - - if ((var13[var14 - 1][var17 + var15] & 19136830) != 0) { // L: 340 - break; - } - - ++var17; // L: 339 - } - } - - if (var18 < 128 - var2 && class182.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 348 349 350 351 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5 + 1; // L: 355 - class182.bufferY[var20] = var6; // L: 356 - var20 = var20 + 1 & 4095; // L: 357 - class182.directions[var18 + 1][var19] = 8; // L: 358 - class182.distances[var18 + 1][var19] = var16; // L: 359 - break; - } - - if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 353 - break; - } - - ++var17; // L: 352 - } - } - - if (var19 > 0 && class182.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 361 362 363 364 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5; // L: 368 - class182.bufferY[var20] = var6 - 1; // L: 369 - var20 = var20 + 1 & 4095; // L: 370 - class182.directions[var18][var19 - 1] = 1; // L: 371 - class182.distances[var18][var19 - 1] = var16; // L: 372 - break; - } - - if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 366 - break; - } - - ++var17; // L: 365 - } - } - - if (var19 < 128 - var2 && class182.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 374 375 376 377 - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5; // L: 381 - class182.bufferY[var20] = var6 + 1; // L: 382 - var20 = var20 + 1 & 4095; // L: 383 - class182.directions[var18][var19 + 1] = 4; // L: 384 - class182.distances[var18][var19 + 1] = var16; // L: 385 - break; - } - - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { // L: 379 - break; - } - - ++var17; // L: 378 - } - } - - if (var18 > 0 && var19 > 0 && class182.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 387 388 389 - var17 = 1; - - while (true) { - if (var17 >= var2) { - class182.bufferX[var20] = var5 - 1; // L: 394 - class182.bufferY[var20] = var6 - 1; // L: 395 - var20 = var20 + 1 & 4095; // L: 396 - class182.directions[var18 - 1][var19 - 1] = 3; // L: 397 - class182.distances[var18 - 1][var19 - 1] = var16; // L: 398 - break; - } - - if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 391 392 - break; - } - - ++var17; // L: 390 - } - } - - if (var18 < 128 - var2 && var19 > 0 && class182.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 400 401 402 - var17 = 1; - - while (true) { - if (var17 >= var2) { - class182.bufferX[var20] = var5 + 1; // L: 407 - class182.bufferY[var20] = var6 - 1; // L: 408 - var20 = var20 + 1 & 4095; // L: 409 - class182.directions[var18 + 1][var19 - 1] = 9; // L: 410 - class182.distances[var18 + 1][var19 - 1] = var16; // L: 411 - break; - } - - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 404 405 - break; - } - - ++var17; // L: 403 - } - } - - if (var18 > 0 && var19 < 128 - var2 && class182.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 413 414 415 - for (var17 = 1; var17 < var2; ++var17) { // L: 416 - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 417 418 - continue label288; - } - } - - class182.bufferX[var20] = var5 - 1; // L: 420 - class182.bufferY[var20] = var6 + 1; // L: 421 - var20 = var20 + 1 & 4095; // L: 422 - class182.directions[var18 - 1][var19 + 1] = 6; // L: 423 - class182.distances[var18 - 1][var19 + 1] = var16; // L: 424 - } - } while(var18 >= 128 - var2); // L: 426 - } while(var19 >= 128 - var2); - } while(class182.directions[var18 + 1][var19 + 1] != 0); // L: 427 - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 428 - - for (var17 = 1; var17 < var2; ++var17) { // L: 429 - if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 430 431 - continue label311; + KeyHandler.KeyHandler_pressedKeys[var1] = true; // L: 173 } } + } - class182.bufferX[var20] = var5 + 1; // L: 433 - class182.bufferY[var20] = var6 + 1; // L: 434 - var20 = var20 + 1 & 4095; // L: 435 - class182.directions[var18 + 1][var19 + 1] = 12; // L: 436 - class182.distances[var18 + 1][var19 + 1] = var16; // L: 437 + if (KeyHandler.field427 > 0) { // L: 177 + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field428 = KeyHandler.field413; // L: 178 + } + } // L: 180 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(ILco;ZB)I", + garbageValue = "104" + ) + static int method2018(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 772 + Widget var4; + if (var0 >= 2000) { // L: 774 + var0 -= 1000; // L: 775 + var4 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 776 + var3 = false; // L: 777 + } else { + var4 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 779 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 780 + var11 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] - 1; // L: 781 + if (var11 >= 0 && var11 <= 9) { // L: 782 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]); // L: 786 + return 1; // L: 787 + } else { + --UrlRequester.Interpreter_stringStackSize; // L: 783 + return 1; // L: 784 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 789 + MilliClock.Interpreter_intStackSize -= 2; // L: 790 + var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 791 + var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 792 + var4.parent = ItemContainer.getWidgetChild(var11, var6); // L: 793 + return 1; // L: 794 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 796 + var4.isScrollBar = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 797 + return 1; // L: 798 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 800 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 801 + return 1; // L: 802 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 804 + var4.dragThreshold = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 805 + return 1; // L: 806 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 808 + var4.dataText = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 809 + return 1; // L: 810 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 812 + var4.spellActionName = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 813 + return 1; // L: 814 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 816 + var4.actions = null; // L: 817 + return 1; // L: 818 + } else if (var0 == 1308) { // L: 820 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 821 + return 1; // L: 822 + } else if (var0 == 1309) { // L: 824 + --MilliClock.Interpreter_intStackSize; // L: 825 + return 1; // L: 826 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 828 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 858 + MilliClock.Interpreter_intStackSize -= 2; // L: 859 + var5 = 10; // L: 860 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]}; // L: 861 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]}; // L: 862 + ChatChannel.Widget_setKey(var4, var5, var8, var9); // L: 863 + return 1; // L: 864 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 866 + MilliClock.Interpreter_intStackSize -= 3; // L: 867 + var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] - 1; // L: 868 + var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 869 + var7 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 870 + if (var11 >= 0 && var11 <= 9) { // L: 871 + WorldMapIcon_1.Widget_setKeyRate(var4, var11, var6, var7); // L: 874 + return 1; // L: 875 + } else { + throw new RuntimeException(); // L: 872 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 877 + var5 = 10; // L: 878 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 879 + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 880 + WorldMapIcon_1.Widget_setKeyRate(var4, var5, var6, var7); // L: 881 + return 1; // L: 882 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 884 + --MilliClock.Interpreter_intStackSize; // L: 885 + var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] - 1; // L: 886 + if (var11 >= 0 && var11 <= 9) { // L: 887 + MusicPatchNode2.Widget_setKeyIgnoreHeld(var4, var11); // L: 890 + return 1; // L: 891 + } else { + throw new RuntimeException(); // L: 888 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 893 + var5 = 10; // L: 894 + MusicPatchNode2.Widget_setKeyIgnoreHeld(var4, var5); // L: 895 + return 1; // L: 896 + } else { + return 2; // L: 898 + } + } else { + byte[] var10 = null; // L: 829 + var8 = null; // L: 830 + if (var3) { // L: 831 + MilliClock.Interpreter_intStackSize -= 10; // L: 832 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + MilliClock.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 834 835 + } + + if (var7 > 0) { // L: 837 + var10 = new byte[var7 / 2]; // L: 838 + var8 = new byte[var7 / 2]; // L: 839 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 840 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + MilliClock.Interpreter_intStackSize]; // L: 841 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + MilliClock.Interpreter_intStackSize + 1]; // L: 842 + } + } + } else { + MilliClock.Interpreter_intStackSize -= 2; // L: 847 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]}; // L: 848 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]}; // L: 849 + } + + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] - 1; // L: 851 + if (var7 >= 0 && var7 <= 9) { // L: 852 + ChatChannel.Widget_setKey(var4, var7, var10, var8); // L: 855 + return 1; // L: 856 + } else { + throw new RuntimeException(); // L: 853 + } + } } } } + + @ObfuscatedName("fi") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1364904686" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (class23.pcmPlayer1 != null) { // L: 3491 + class23.pcmPlayer1.run(); + } + + if (class195.pcmPlayer0 != null) { // L: 3492 + class195.pcmPlayer0.run(); + } + + } // L: 3493 } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 84d59e03d2..f5f7960a7f 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -1,58 +1,66 @@ +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("kw") +@ObfuscatedName("kd") +@Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) + @Export("loginType") final LoginType loginType; - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1472429845 + intValue = -1451394125 ) - int field3641; - @ObfuscatedName("n") + int field3649; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Ljb;" + descriptor = "Ljj;" ) + @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lmu;)V" + descriptor = "(Lmc;)V" ) public FriendsList(LoginType var1) { super(400); // L: 17 - this.field3641 = 1; // L: 13 + this.field3649 = 1; // L: 13 this.friendLoginUpdates = new LinkDeque(); // L: 14 this.loginType = var1; // L: 18 } // L: 19 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Ljc;", - garbageValue = "35" + descriptor = "(I)Ljh;", + garbageValue = "-1664145399" ) + @Export("newInstance") User newInstance() { return new Friend(); // L: 22 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)[Ljc;", - garbageValue = "-19" + descriptor = "(IB)[Ljh;", + garbageValue = "-35" ) + @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; // L: 26 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lku;ZI)Z", - garbageValue = "-1059654626" + descriptor = "(Lkm;ZB)Z", + garbageValue = "36" ) + @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { Friend var3 = (Friend)this.getByUsername(var1); // L: 30 if (var3 == null) { @@ -62,11 +70,12 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("o") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-233603151" + descriptor = "(Lkb;II)V", + garbageValue = "1702528493" ) + @Export("read") public void read(Buffer var1, int var2) { while (true) { if (var1.offset < var2) { // L: 37 @@ -89,7 +98,7 @@ public class FriendsList extends UserList { Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 53 if (var3) { // L: 54 Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 55 - if (var12 != null && var12 != var11) { // L: 56 + if (var12 != null && var11 != var12) { // L: 56 if (var11 != null) { // L: 57 this.remove(var12); // L: 58 } else { @@ -128,17 +137,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { // L: 88 - var11.int2 = ++this.field3641 - 1; // L: 89 + var11.int2 = ++this.field3649 - 1; // L: 89 if (var11.world == -1 && var6 == 0) { // L: 90 - var11.int2 = -(var11.int2 * 1706616033) * -224698591; + var11.int2 = -(var11.int2 * 325522823) * -152395721; } var11.world = var6; // L: 91 } var11.rank = var7; // L: 93 - var11.field3651 = var9; // L: 94 - var11.field3652 = var10; // L: 95 + var11.field3659 = var9; // L: 94 + var11.field3660 = var10; // L: 95 continue; // L: 96 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 0ec1008077..5138e8869a 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,16 +1,14 @@ import java.util.zip.Inflater; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("mw") +@Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -198974001 - ) - public static int idxCount; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("inflater") Inflater inflater; @ObfuscatedSignature( @@ -24,15 +22,16 @@ public class GZipDecompressor { this(-1, 1000000, 1000000); // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;[BI)V", - garbageValue = "-322147255" + descriptor = "(Lkb;[BI)V", + garbageValue = "118989570" ) + @Export("decompress") public void decompress(Buffer var1, byte[] var2) { if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 - if (this.inflater == null) { // L: 17 - this.inflater = new Inflater(true); + if (this.inflater == null) { + this.inflater = new Inflater(true); // L: 17 } try { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index b5cb53ec76..7e160aab69 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -1,37 +1,57 @@ +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("ij") +@ObfuscatedName("io") +@Implements("GameBuild") public class GameBuild { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Lio;" ) - static final GameBuild LIVE; - @ObfuscatedName("k") + @Export("LIVE") + public static final GameBuild LIVE; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Lio;" ) - static final GameBuild BUILDLIVE; - @ObfuscatedName("s") + @Export("BUILDLIVE") + public static final GameBuild BUILDLIVE; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Lio;" ) - static final GameBuild RC; + @Export("RC") + public static final GameBuild RC; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lio;" + ) + @Export("WIP") + public static final GameBuild WIP; @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lij;" + descriptor = "Liw;" ) - static final GameBuild WIP; - @ObfuscatedName("i") + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("z") + @Export("name") public final String name; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1493317811 + intValue = 1749368073 ) - final int buildId; + @Export("buildId") + public final int buildId; static { LIVE = new GameBuild("LIVE", 0); // L: 5 @@ -41,204 +61,7 @@ public class GameBuild { } GameBuild(String var1, int var2) { - this.name = var1; // L: 17 - this.buildId = var2; // L: 18 - } // L: 19 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lic;III)[Llp;", - garbageValue = "-1533970303" - ) - public static Sprite[] method4214(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); // L: 55 - boolean var3; - if (var4 == null) { // L: 56 - var3 = false; // L: 57 - } else { - Occluder.SpriteBuffer_decode(var4); // L: 60 - var3 = true; // L: 61 - } - - if (!var3) { // L: 63 - return null; - } else { - Sprite[] var5 = new Sprite[class335.SpriteBuffer_spriteCount]; // L: 66 - - for (int var6 = 0; var6 < class335.SpriteBuffer_spriteCount; ++var6) { // L: 67 - Sprite var7 = var5[var6] = new Sprite(); // L: 68 - var7.width = class335.SpriteBuffer_spriteWidth; // L: 69 - var7.height = class335.SpriteBuffer_spriteHeight; // L: 70 - var7.xOffset = Username.SpriteBuffer_xOffsets[var6]; // L: 71 - var7.yOffset = class335.SpriteBuffer_yOffsets[var6]; // L: 72 - var7.subWidth = class335.SpriteBuffer_spriteWidths[var6]; // L: 73 - var7.subHeight = class335.SpriteBuffer_spriteHeights[var6]; // L: 74 - int var8 = var7.subWidth * var7.subHeight; // L: 75 - byte[] var9 = class92.SpriteBuffer_pixels[var6]; // L: 76 - var7.pixels = new int[var8]; // L: 77 - - for (int var10 = 0; var10 < var8; ++var10) { // L: 78 - var7.pixels[var10] = TaskHandler.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - } - - Username.SpriteBuffer_xOffsets = null; // L: 81 - class335.SpriteBuffer_yOffsets = null; // L: 82 - class335.SpriteBuffer_spriteWidths = null; // L: 83 - class335.SpriteBuffer_spriteHeights = null; // L: 84 - TaskHandler.SpriteBuffer_spritePalette = null; // L: 85 - class92.SpriteBuffer_pixels = null; // L: 86 - return var5; // L: 90 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1136402672" - ) - static int method4218(int var0, Script var1, boolean var2) { - int var3 = -1; // L: 497 - Widget var4; - if (var0 >= 2000) { // L: 499 - var0 -= 1000; // L: 500 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 501 - var4 = TileItem.getWidget(var3); // L: 502 - } else { - var4 = var2 ? Canvas.field438 : class3.field12; // L: 504 - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 505 - Interpreter.Interpreter_intStackSize -= 4; // L: 506 - var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 507 - var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 508 - var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 509 - var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 510 - class52.invalidateWidget(var4); // L: 511 - class2.client.alignWidget(var4); // L: 512 - if (var3 != -1 && var4.type == 0) { // L: 513 - class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 514 - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 516 - Interpreter.Interpreter_intStackSize -= 4; // L: 517 - var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 518 - var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 519 - var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 520 - var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 521 - class52.invalidateWidget(var4); // L: 522 - class2.client.alignWidget(var4); // L: 523 - if (var3 != -1 && var4.type == 0) { // L: 524 - class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 525 - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 527 - boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 528 - if (var5 != var4.isHidden) { // L: 529 - var4.isHidden = var5; // L: 530 - class52.invalidateWidget(var4); // L: 531 - } - - return 1; // L: 533 - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 535 - var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 536 - return 1; // L: 537 - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 539 - var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 540 - return 1; // L: 541 - } else { - return 2; // L: 543 - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lbw;B)V", - garbageValue = "30" - ) - static void method4217(GameShell var0) { - while (class60.isKeyDown()) { // L: 1647 - if (PlayerAppearance.field2581 == 13) { // L: 1648 - PacketBufferNode.method3726(); // L: 1649 - return; // L: 1650 - } - - if (PlayerAppearance.field2581 == 96) { // L: 1652 - if (Login.worldSelectPage > 0 && WorldMapIcon_0.worldSelectLeftSprite != null) { // L: 1653 - --Login.worldSelectPage; // L: 1654 - } - } else if (PlayerAppearance.field2581 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && ArchiveDiskActionHandler.worldSelectRightSprite != null) { // L: 1657 1658 - ++Login.worldSelectPage; // L: 1659 - } - } - - if (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1663 - int var1 = Login.xPadding + 280; // L: 1664 - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1665 - AbstractWorldMapData.changeWorldSelectSorting(0, 0); // L: 1666 - return; // L: 1667 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1669 - AbstractWorldMapData.changeWorldSelectSorting(0, 1); // L: 1670 - return; // L: 1671 - } - - int var2 = Login.xPadding + 390; // L: 1673 - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1674 - AbstractWorldMapData.changeWorldSelectSorting(1, 0); // L: 1675 - return; // L: 1676 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1678 - AbstractWorldMapData.changeWorldSelectSorting(1, 1); // L: 1679 - return; // L: 1680 - } - - int var3 = Login.xPadding + 500; // L: 1682 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1683 - AbstractWorldMapData.changeWorldSelectSorting(2, 0); // L: 1684 - return; // L: 1685 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1687 - AbstractWorldMapData.changeWorldSelectSorting(2, 1); // L: 1688 - return; // L: 1689 - } - - int var4 = Login.xPadding + 610; // L: 1691 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1692 - AbstractWorldMapData.changeWorldSelectSorting(3, 0); // L: 1693 - return; // L: 1694 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1696 - AbstractWorldMapData.changeWorldSelectSorting(3, 1); // L: 1697 - return; // L: 1698 - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1700 - PacketBufferNode.method3726(); // L: 1701 - return; // L: 1702 - } - - if (Login.hoveredWorldIndex != -1) { // L: 1704 - World var5 = AbstractByteArrayCopier.World_worlds[Login.hoveredWorldIndex]; // L: 1705 - Canvas.changeWorld(var5); // L: 1706 - PacketBufferNode.method3726(); // L: 1707 - return; // L: 1708 - } - - if (Login.worldSelectPage > 0 && WorldMapIcon_0.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= WorldMapIcon_0.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) { // L: 1710 - --Login.worldSelectPage; // L: 1711 - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && ArchiveDiskActionHandler.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= FloorDecoration.canvasWidth - ArchiveDiskActionHandler.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= FloorDecoration.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) { // L: 1713 - ++Login.worldSelectPage; // L: 1714 - } - } - - } // L: 1717 + this.name = var1; // L: 13 + this.buildId = var2; // L: 14 + } // L: 15 } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 94f760240b..837f68c21a 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -1,78 +1,100 @@ +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("ed") +@ObfuscatedName("el") +@Implements("GameObject") public final class GameObject { - @ObfuscatedName("z") + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "[Lle;" ) - public Entity entity; - @ObfuscatedName("k") + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1221048069 + intValue = -1412668883 ) + @Export("plane") int plane; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -530812325 + intValue = -1556347637 ) + @Export("height") int height; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1973574069 + intValue = 954361615 ) + @Export("centerX") int centerX; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 589322861 - ) - int centerY; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 2067900831 - ) - int orientation; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -37489551 - ) - int startX; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 694891885 - ) - int endX; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 977899527 - ) - int startY; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 523071703 + intValue = -1596359689 ) + @Export("orientation") + int orientation; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lej;" + ) + @Export("entity") + public Entity entity; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1994666041 + ) + @Export("centerY") + int centerY; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 207668277 + ) + @Export("startX") + int startX; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1940452637 + ) + @Export("endX") + int endX; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1266358135 + ) + @Export("startY") + int startY; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1643778515 + ) + @Export("endY") int endY; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 609082727 + ) + int field1962; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -404331619 + ) + @Export("lastDrawn") + int lastDrawn; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1389208075 - ) - int field1974; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 2140125731 - ) - int lastDrawn; - @ObfuscatedName("h") - @ObfuscatedGetter( - longValue = 6418610507484255719L + longValue = -2637081015005136759L ) + @Export("tag") public long tag; - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1693237637 + intValue = -735597717 ) + @Export("flags") int flags; GameObject() { @@ -80,37 +102,93 @@ public final class GameObject { this.flags = 0; // L: 17 } // L: 19 - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "723631912" - ) - public static void method3411() { - if (NetCache.NetCache_socket != null) { // L: 319 - NetCache.NetCache_socket.close(); - } - - } // L: 320 - @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1910859364" + descriptor = "(II)Z", + garbageValue = "1929394434" ) - public static void method3412() { - ItemDefinition.ItemDefinition_cached.clear(); // L: 551 - ItemDefinition.ItemDefinition_cachedModels.clear(); // L: 552 - ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 553 - } // L: 554 + public static boolean method3416(int var0) { + return var0 >= WorldMapDecorationType.field2766.id && var0 <= WorldMapDecorationType.field2767.id; // L: 46 + } - @ObfuscatedName("il") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", - garbageValue = "-58" + descriptor = "(Lcs;I)V", + garbageValue = "-755652962" ) - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (WorldMapSprite.loadInterface(var0)) { // L: 9643 - WorldMapSection1.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 9644 + static final void method3415(Actor var0) { + if (var0.field1028 != 0) { // L: 4120 + if (var0.targetIndex != -1) { // L: 4121 + Object var1 = null; // L: 4122 + if (var0.targetIndex < 32768) { // L: 4123 + var1 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 4124 + var1 = Client.players[var0.targetIndex - 32768]; + } + + if (var1 != null) { // L: 4125 + int var2 = var0.x - ((Actor)var1).x; // L: 4126 + int var3 = var0.y - ((Actor)var1).y; // L: 4127 + if (var2 != 0 || var3 != 0) { // L: 4128 + var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 4130 + var0.targetIndex = -1; // L: 4131 + var0.false0 = false; // L: 4132 + } + } + + if (var0.field1003 != -1 && (var0.pathLength == 0 || var0.field978 > 0)) { // L: 4135 + var0.orientation = var0.field1003; // L: 4136 + var0.field1003 = -1; // L: 4137 + } + + int var4 = var0.orientation - var0.rotation & 2047; // L: 4139 + if (var4 == 0 && var0.false0) { // L: 4140 + var0.targetIndex = -1; // L: 4141 + var0.false0 = false; // L: 4142 + } + + if (var4 != 0) { // L: 4144 + ++var0.field1027; // L: 4145 + boolean var6; + if (var4 > 1024) { // L: 4146 + var0.rotation -= var0.field1028; // L: 4147 + var6 = true; // L: 4148 + if (var4 < var0.field1028 || var4 > 2048 - var0.field1028) { // L: 4149 + var0.rotation = var0.orientation; // L: 4150 + var6 = false; // L: 4151 + } + + if (var0.idleSequence == var0.movementSequence && (var0.field1027 > 25 || var6)) { // L: 4153 + if (var0.turnLeftSequence != -1) { // L: 4154 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4155 + } + } + } else { + var0.rotation += var0.field1028; // L: 4159 + var6 = true; // L: 4160 + if (var4 < var0.field1028 || var4 > 2048 - var0.field1028) { // L: 4161 + var0.rotation = var0.orientation; // L: 4162 + var6 = false; // L: 4163 + } + + if (var0.idleSequence == var0.movementSequence && (var0.field1027 > 25 || var6)) { // L: 4165 + if (var0.turnRightSequence != -1) { // L: 4166 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 4167 + } + } + } + + var0.rotation &= 2047; // L: 4171 + } else { + var0.field1027 = 0; // L: 4173 + } + } - } // L: 9645 + } // L: 4174 } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 11d704db97..2effb30caf 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -18,157 +18,194 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; 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("bw") +@ObfuscatedName("ba") +@Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lfo;" - ) - protected static TaskHandler taskHandler; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lbw;" - ) - static GameShell gameShell; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -823733869 - ) - static int GameShell_redundantStartThreadCount; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = 5260130147769638647L - ) - static long stopTimeMs; - @ObfuscatedName("i") - static boolean isKilled; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -551512965 - ) - static int cycleDurationMillis; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1340319367 - ) - static int fiveOrOne; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 253564767 - ) - protected static int fps; - @ObfuscatedName("q") - static long[] graphicsTickTimes; @ObfuscatedName("f") - static long[] clientTickTimes; + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + @Export("taskHandler") + protected static TaskHandler taskHandler; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lba;" + ) + @Export("gameShell") + static GameShell gameShell; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -744176475 + intValue = -1935036079 ) - public static int canvasHeight; - @ObfuscatedName("ar") + @Export("GameShell_redundantStartThreadCount") + static int GameShell_redundantStartThreadCount; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1469478575 + longValue = -3572078124580925775L ) - static int field477; - @ObfuscatedName("ad") + @Export("stopTimeMs") + static long stopTimeMs; + @ObfuscatedName("z") + @Export("isKilled") + static boolean isKilled; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -2072686187 + ) + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1928791623 + ) + @Export("cycleDurationMillis") + static int cycleDurationMillis; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1333363833 + ) + @Export("fiveOrOne") + static int fiveOrOne; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1701309635 + ) + @Export("fps") + protected static int fps; + @ObfuscatedName("n") + @Export("graphicsTickTimes") + static long[] graphicsTickTimes; + @ObfuscatedName("r") + @Export("clientTickTimes") + static long[] clientTickTimes; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = 1541130703 + ) + static int field495; + @ObfuscatedName("aa") + @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("ai") - protected static boolean hasFocus; @ObfuscatedName("aj") @ObfuscatedGetter( - longValue = 5656541566078499911L + longValue = 5754023503736299787L ) + @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - longValue = -6735850027157901575L + longValue = -7246664469956592727L ) + @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("o") + @ObfuscatedName("gk") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("gc") + @ObfuscatedGetter( + intValue = 1206716707 + ) + static int field466; + @ObfuscatedName("q") + @Export("hasErrored") boolean hasErrored; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -666140821 + intValue = -1942490897 ) + @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("r") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 528808707 + intValue = -12097029 ) + @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 2020225171 + intValue = -56321895 ) + @Export("canvasX") int canvasX; - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1122384321 + intValue = 314779351 ) + @Export("canvasY") int canvasY; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 236351201 + intValue = -1023535157 ) - int field475; + int field482; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1328280729 + intValue = -1830509 ) - int field476; - @ObfuscatedName("ag") + int field483; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1655899873 + intValue = 1518889003 ) + @Export("maxCanvasWidth") int maxCanvasWidth; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1639831573 + intValue = -963306765 ) + @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("am") + @ObfuscatedName("ar") + @Export("frame") Frame frame; - @ObfuscatedName("ap") + @ObfuscatedName("ay") + @Export("canvas") java.awt.Canvas canvas; + @ObfuscatedName("ah") + volatile boolean field488; @ObfuscatedName("au") - volatile boolean field481; - @ObfuscatedName("at") + @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("aq") + @ObfuscatedName("ai") + @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("al") - @ObfuscatedGetter( - longValue = 158421572570045259L - ) - volatile long field485; @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lbc;" + @ObfuscatedGetter( + longValue = 641067398817964123L ) + volatile long field492; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lbf;" + ) + @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("as") + @ObfuscatedName("an") + @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("az") + @ObfuscatedName("am") + @Export("eventQueue") final EventQueue eventQueue; static { - gameShell = null; // L: 41 - GameShell_redundantStartThreadCount = 0; // L: 43 + gameShell = null; + GameShell_redundantStartThreadCount = 0; stopTimeMs = 0L; // L: 44 - isKilled = false; // L: 45 - cycleDurationMillis = 20; - fiveOrOne = 1; + isKilled = false; + cycleDurationMillis = 20; // L: 48 + fiveOrOne = 1; // L: 49 fps = 0; // L: 50 graphicsTickTimes = new long[32]; // L: 53 clientTickTimes = new long[32]; // L: 55 - field477 = 500; // L: 73 - volatileFocus = true; - garbageCollectorLastCollectionTime = -1L; + field495 = 500; // L: 73 + volatileFocus = true; // L: 82 + garbageCollectorLastCollectionTime = -1L; // L: 85 garbageCollectorLastCheckTimeMs = -1L; // L: 86 } @@ -176,10 +213,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.hasErrored = false; // L: 46 this.canvasX = 0; // L: 59 this.canvasY = 0; // L: 60 - this.field481 = true; // L: 71 + this.field488 = true; // L: 71 this.resizeCanvasNextFrame = false; // L: 74 this.isCanvasInvalid = false; // L: 75 - this.field485 = 0L; // L: 76 + this.field492 = 0L; // L: 76 EventQueue var1 = null; // L: 89 try { @@ -189,32 +226,34 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.eventQueue = var1; // L: 94 DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95 - class300.pcmPlayerProvider = var2; // L: 97 + class69.pcmPlayerProvider = var2; // L: 97 } // L: 99 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2029851592" + descriptor = "(IIS)V", + garbageValue = "8156" ) + @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 - this.method991(); + this.method1023(); } this.maxCanvasWidth = var1; // L: 103 this.maxCanvasHeight = var2; // L: 104 } // L: 105 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "-1294823568" + garbageValue = "1268616662" ) + @Export("post") final void post(Object var1) { if (this.eventQueue != null) { // L: 108 for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 - class227.sleepExact(1L); + WorldMapSection3.sleepExact(1L); } if (var1 != null) { @@ -224,11 +263,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } // L: 111 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Lfd;", - garbageValue = "51" + descriptor = "(I)Lfq;", + garbageValue = "1414879636" ) + @Export("mouseWheel") protected MouseWheel mouseWheel() { if (this.mouseWheelHandler == null) { // L: 114 this.mouseWheelHandler = new MouseWheelHandler(); // L: 115 @@ -238,264 +278,276 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return this.mouseWheelHandler; // L: 118 } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-726775332" + garbageValue = "-2067503658" ) + @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 } // L: 123 - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "783743664" + garbageValue = "1423011731" ) + @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 } // L: 127 - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-47" + garbageValue = "45" ) + @Export("setUpKeyboard") protected final void setUpKeyboard() { - class8.method105(); // L: 130 - java.awt.Canvas var1 = this.canvas; // L: 131 - var1.setFocusTraversalKeysEnabled(false); // L: 133 - var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 134 - var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 135 - } // L: 137 + GrandExchangeOfferNameComparator.method228(); // L: 130 + VertexNormal.method3136(this.canvas); // L: 131 + } // L: 132 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "15264" + descriptor = "(I)V", + garbageValue = "932982288" ) + @Export("setUpMouse") protected final void setUpMouse() { - GrandExchangeOfferAgeComparator.method242(this.canvas); // L: 140 - } // L: 141 + TextureProvider.method2899(this.canvas); // L: 135 + } // L: 136 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-60" + ) + @Export("resizeCanvas") + final void resizeCanvas() { + Container var1 = this.container(); // L: 139 + if (var1 != null) { // L: 140 + Bounds var2 = this.getFrameContentBounds(); // L: 141 + this.contentWidth = Math.max(var2.highX, this.field482); // L: 142 + this.contentHeight = Math.max(var2.highY, this.field483); // L: 143 + if (this.contentWidth <= 0) { // L: 144 + this.contentWidth = 1; + } + + if (this.contentHeight <= 0) { // L: 145 + this.contentHeight = 1; + } + + ItemContainer.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 146 + HealthBar.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 147 + this.canvasX = (this.contentWidth - ItemContainer.canvasWidth) / 2; // L: 148 + this.canvasY = 0; // L: 149 + this.canvas.setSize(ItemContainer.canvasWidth, HealthBar.canvasHeight); // L: 150 + class22.rasterProvider = new RasterProvider(ItemContainer.canvasWidth, HealthBar.canvasHeight, this.canvas); // L: 151 + if (var1 == this.frame) { // L: 152 + Insets var3 = this.frame.getInsets(); // L: 153 + this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); // L: 154 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 156 + } + + this.field488 = true; // L: 157 + this.resizeGame(); // L: 158 + } + } // L: 159 @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "185905257" - ) - final void resizeCanvas() { - Container var1 = this.container(); // L: 144 - if (var1 != null) { // L: 145 - Bounds var2 = this.getFrameContentBounds(); // L: 146 - this.contentWidth = Math.max(var2.highX, this.field475); // L: 147 - this.contentHeight = Math.max(var2.highY, this.field476); // L: 148 - if (this.contentWidth <= 0) { // L: 149 - this.contentWidth = 1; - } - - if (this.contentHeight <= 0) { // L: 150 - this.contentHeight = 1; - } - - FloorDecoration.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 151 - canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 152 - this.canvasX = (this.contentWidth - FloorDecoration.canvasWidth) / 2; // L: 153 - this.canvasY = 0; // L: 154 - this.canvas.setSize(FloorDecoration.canvasWidth, canvasHeight); // L: 155 - WorldMapSprite.rasterProvider = new RasterProvider(FloorDecoration.canvasWidth, canvasHeight, this.canvas); // L: 156 - if (var1 == this.frame) { // L: 157 - Insets var3 = this.frame.getInsets(); // L: 158 - this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); // L: 159 - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 161 - } - - this.field481 = true; // L: 162 - this.resizeGame(); // L: 163 - } - } // L: 164 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "912814062" + garbageValue = "-1977357922" ) + @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1351857768" + garbageValue = "-2136821254" ) + @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 169 - int var2 = this.canvasY; // L: 170 - int var3 = this.contentWidth - FloorDecoration.canvasWidth - var1; // L: 171 - int var4 = this.contentHeight - canvasHeight - var2; // L: 172 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 173 + int var1 = this.canvasX; // L: 164 + int var2 = this.canvasY; // L: 165 + int var3 = this.contentWidth - ItemContainer.canvasWidth - var1; // L: 166 + int var4 = this.contentHeight - HealthBar.canvasHeight - var2; // L: 167 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 168 try { - Container var5 = this.container(); // L: 175 - int var6 = 0; // L: 176 - int var7 = 0; // L: 177 - if (var5 == this.frame) { // L: 178 - Insets var8 = this.frame.getInsets(); // L: 179 - var6 = var8.left; // L: 180 - var7 = var8.top; // L: 181 + Container var5 = this.container(); // L: 170 + int var6 = 0; // L: 171 + int var7 = 0; // L: 172 + if (var5 == this.frame) { // L: 173 + Insets var8 = this.frame.getInsets(); // L: 174 + var6 = var8.left; // L: 175 + var7 = var8.top; // L: 176 } - Graphics var10 = var5.getGraphics(); // L: 183 - var10.setColor(Color.black); // L: 184 + Graphics var10 = var5.getGraphics(); // L: 178 + var10.setColor(Color.black); // L: 179 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 185 + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 180 } - if (var2 > 0) { // L: 186 + if (var2 > 0) { // L: 181 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 187 + if (var3 > 0) { // L: 182 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 188 + if (var4 > 0) { // L: 183 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 190 + } catch (Exception var9) { // L: 185 } } - } // L: 192 + } // L: 187 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1486323299" + garbageValue = "-1457891067" ) + @Export("replaceCanvas") final void replaceCanvas() { - class182.method3683(this.canvas); // L: 195 - WorldMapAreaData.method751(this.canvas); // L: 196 - if (this.mouseWheelHandler != null) { // L: 197 - this.mouseWheelHandler.removeFrom(this.canvas); + java.awt.Canvas var1 = this.canvas; // L: 190 + var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 192 + var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 193 + KeyHandler.field423 = -1; // L: 194 + java.awt.Canvas var2 = this.canvas; // L: 196 + var2.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 198 + var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 199 + var2.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 200 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 201 + if (this.mouseWheelHandler != null) { + this.mouseWheelHandler.removeFrom(this.canvas); // L: 203 } - this.addCanvas(); // L: 198 - java.awt.Canvas var1 = this.canvas; // L: 199 - var1.setFocusTraversalKeysEnabled(false); // L: 201 - var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 202 - var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 203 - GrandExchangeOfferAgeComparator.method242(this.canvas); // L: 205 - if (this.mouseWheelHandler != null) { // L: 206 + this.addCanvas(); // L: 204 + VertexNormal.method3136(this.canvas); // L: 205 + TextureProvider.method2899(this.canvas); // L: 206 + if (this.mouseWheelHandler != null) { // L: 207 this.mouseWheelHandler.addTo(this.canvas); } - this.method991(); // L: 207 - } // L: 208 + this.method1023(); // L: 208 + } // L: 209 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-922388983" + garbageValue = "1788157665" ) + @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameShell != null) { // L: 212 - ++GameShell_redundantStartThreadCount; // L: 213 - if (GameShell_redundantStartThreadCount >= 3) { // L: 214 - this.error("alreadyloaded"); // L: 215 - return; // L: 216 + if (gameShell != null) { // L: 213 + ++GameShell_redundantStartThreadCount; // L: 214 + if (GameShell_redundantStartThreadCount >= 3) { // L: 215 + this.error("alreadyloaded"); // L: 216 + return; // L: 217 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 218 - return; // L: 219 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 219 + return; // L: 220 } - gameShell = this; // L: 221 - FloorDecoration.canvasWidth = var1; // L: 222 - canvasHeight = var2; // L: 223 - ObjectDefinition.RunException_revision = var3; // L: 224 - RunException.RunException_applet = this; // L: 225 - if (taskHandler == null) { // L: 226 + gameShell = this; // L: 222 + ItemContainer.canvasWidth = var1; // L: 223 + HealthBar.canvasHeight = var2; // L: 224 + RunException.RunException_revision = var3; // L: 225 + RunException.RunException_applet = this; // L: 226 + if (taskHandler == null) { // L: 227 taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); // L: 227 - } catch (Exception var5) { // L: 229 - Decimator.RunException_sendStackTrace((String)null, var5); // L: 230 - this.error("crash"); // L: 231 + taskHandler.newThreadTask(this, 1); // L: 228 + } catch (Exception var5) { // L: 230 + PacketWriter.RunException_sendStackTrace((String)null, var5); // L: 231 + this.error("crash"); // L: 232 } - } // L: 233 + } // L: 234 - @ObfuscatedName("c") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1659845190" + garbageValue = "1769153010" ) + @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 236 - if (this.canvas != null) { // L: 237 - this.canvas.removeFocusListener(this); // L: 238 - var1.remove(this.canvas); // L: 239 + Container var1 = this.container(); // L: 237 + if (this.canvas != null) { // L: 238 + this.canvas.removeFocusListener(this); // L: 239 + var1.remove(this.canvas); // L: 240 } - FloorDecoration.canvasWidth = Math.max(var1.getWidth(), this.field475); // L: 241 - canvasHeight = Math.max(var1.getHeight(), this.field476); // L: 242 + ItemContainer.canvasWidth = Math.max(var1.getWidth(), this.field482); // L: 242 + HealthBar.canvasHeight = Math.max(var1.getHeight(), this.field483); // L: 243 Insets var2; - if (this.frame != null) { // L: 243 - var2 = this.frame.getInsets(); // L: 244 - FloorDecoration.canvasWidth -= var2.left + var2.right; // L: 245 - canvasHeight -= var2.bottom + var2.top; // L: 246 + if (this.frame != null) { // L: 244 + var2 = this.frame.getInsets(); // L: 245 + ItemContainer.canvasWidth -= var2.left + var2.right; // L: 246 + HealthBar.canvasHeight -= var2.bottom + var2.top; // L: 247 } - this.canvas = new Canvas(this); // L: 248 - var1.setBackground(Color.BLACK); // L: 249 - var1.setLayout((LayoutManager)null); // L: 250 - var1.add(this.canvas); // L: 251 - this.canvas.setSize(FloorDecoration.canvasWidth, canvasHeight); // L: 252 - this.canvas.setVisible(true); // L: 253 - this.canvas.setBackground(Color.BLACK); // L: 254 - if (var1 == this.frame) { // L: 255 - var2 = this.frame.getInsets(); // L: 256 - this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 257 + this.canvas = new Canvas(this); // L: 249 + var1.setBackground(Color.BLACK); // L: 250 + var1.setLayout((LayoutManager)null); // L: 251 + var1.add(this.canvas); // L: 252 + this.canvas.setSize(ItemContainer.canvasWidth, HealthBar.canvasHeight); // L: 253 + this.canvas.setVisible(true); // L: 254 + this.canvas.setBackground(Color.BLACK); // L: 255 + if (var1 == this.frame) { // L: 256 + var2 = this.frame.getInsets(); // L: 257 + this.canvas.setLocation(var2.left + this.canvasX, this.canvasY + var2.top); // L: 258 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 259 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 260 } - this.canvas.addFocusListener(this); // L: 260 - this.canvas.requestFocus(); // L: 261 - this.field481 = true; // L: 262 - if (WorldMapSprite.rasterProvider != null && FloorDecoration.canvasWidth == WorldMapSprite.rasterProvider.width && canvasHeight == WorldMapSprite.rasterProvider.height) { // L: 263 - ((RasterProvider)WorldMapSprite.rasterProvider).setComponent(this.canvas); // L: 264 - WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 265 + this.canvas.addFocusListener(this); // L: 261 + this.canvas.requestFocus(); // L: 262 + this.field488 = true; // L: 263 + if (class22.rasterProvider != null && ItemContainer.canvasWidth == class22.rasterProvider.width && HealthBar.canvasHeight == class22.rasterProvider.height) { // L: 264 + ((RasterProvider)class22.rasterProvider).setComponent(this.canvas); // L: 265 + class22.rasterProvider.drawFull(0, 0); // L: 266 } else { - WorldMapSprite.rasterProvider = new RasterProvider(FloorDecoration.canvasWidth, canvasHeight, this.canvas); // L: 268 + class22.rasterProvider = new RasterProvider(ItemContainer.canvasWidth, HealthBar.canvasHeight, this.canvas); } - this.isCanvasInvalid = false; // L: 270 - this.field485 = PacketWriter.currentTimeMillis(); // L: 271 - } // L: 272 + this.isCanvasInvalid = false; + this.field492 = User.currentTimeMillis(); + } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "395568671" + descriptor = "(B)Z", + garbageValue = "-25" ) + @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 275 - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 276 - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 277 - if (var1.endsWith("127.0.0.1")) { // L: 278 + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 276 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 277 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 278 + if (var1.endsWith("127.0.0.1")) { // L: 279 return true; } else { while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); // L: 279 + var1 = var1.substring(0, var1.length() - 1); // L: 280 } - if (var1.endsWith("192.168.1.")) { // L: 280 + if (var1.endsWith("192.168.1.")) { // L: 281 return true; } else { - this.error("invalidhost"); // L: 281 - return false; // L: 282 + this.error("invalidhost"); // L: 282 + return false; // L: 283 } } } else { @@ -506,450 +558,447 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("r") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-152433822" + garbageValue = "-840084713" ) + @Export("clientTick") void clientTick() { - long var1 = PacketWriter.currentTimeMillis(); // L: 326 - long var3 = clientTickTimes[FontName.clientTickTimeIdx]; // L: 327 - clientTickTimes[FontName.clientTickTimeIdx] = var1; // L: 328 - FontName.clientTickTimeIdx = FontName.clientTickTimeIdx + 1 & 31; // L: 329 - if (var3 != 0L && var1 > var3) { // L: 330 + long var1 = User.currentTimeMillis(); // L: 327 + long var3 = clientTickTimes[class7.clientTickTimeIdx]; // L: 328 + clientTickTimes[class7.clientTickTimeIdx] = var1; // L: 329 + class7.clientTickTimeIdx = class7.clientTickTimeIdx + 1 & 31; // L: 330 + if (var3 != 0L && var1 > var3) { // L: 331 } - synchronized(this) { // L: 331 - hasFocus = volatileFocus; // L: 332 - } // L: 333 + synchronized(this) { // L: 332 + class8.hasFocus = volatileFocus; // L: 333 + } // L: 334 - this.doCycle(); // L: 334 - } // L: 335 + this.doCycle(); // L: 335 + } // L: 336 - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1567053941" + descriptor = "(B)V", + garbageValue = "0" ) + @Export("graphicsTick") void graphicsTick() { - Container var1 = this.container(); // L: 338 - long var2 = PacketWriter.currentTimeMillis(); // L: 339 - long var4 = graphicsTickTimes[BoundaryObject.graphicsTickTimeIdx]; // L: 340 - graphicsTickTimes[BoundaryObject.graphicsTickTimeIdx] = var2; // L: 341 - BoundaryObject.graphicsTickTimeIdx = BoundaryObject.graphicsTickTimeIdx + 1 & 31; // L: 342 - if (var4 != 0L && var2 > var4) { // L: 343 - int var6 = (int)(var2 - var4); // L: 344 - fps = ((var6 >> 1) + 32000) / var6; // L: 345 + Container var1 = this.container(); // L: 339 + long var2 = User.currentTimeMillis(); // L: 340 + long var4 = graphicsTickTimes[GraphicsDefaults.graphicsTickTimeIdx]; // L: 341 + graphicsTickTimes[GraphicsDefaults.graphicsTickTimeIdx] = var2; // L: 342 + GraphicsDefaults.graphicsTickTimeIdx = GraphicsDefaults.graphicsTickTimeIdx + 1 & 31; // L: 343 + if (0L != var4 && var2 > var4) { // L: 344 + int var6 = (int)(var2 - var4); // L: 345 + fps = ((var6 >> 1) + 32000) / var6; // L: 346 } - if (++field477 - 1 > 50) { // L: 347 - field477 -= 50; // L: 348 - this.field481 = true; // L: 349 - this.canvas.setSize(FloorDecoration.canvasWidth, canvasHeight); // L: 350 - this.canvas.setVisible(true); // L: 351 - if (var1 == this.frame) { // L: 352 - Insets var7 = this.frame.getInsets(); // L: 353 - this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 354 + if (++field495 - 1 > 50) { // L: 348 + field495 -= 50; // L: 349 + this.field488 = true; // L: 350 + this.canvas.setSize(ItemContainer.canvasWidth, HealthBar.canvasHeight); // L: 351 + this.canvas.setVisible(true); // L: 352 + if (var1 == this.frame) { // L: 353 + Insets var7 = this.frame.getInsets(); // L: 354 + this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); // L: 355 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 356 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 357 } } - if (this.isCanvasInvalid) { // L: 358 + if (this.isCanvasInvalid) { // L: 359 this.replaceCanvas(); } - this.method990(); // L: 359 - this.draw(this.field481); // L: 360 - if (this.field481) { // L: 361 + this.method1022(); // L: 360 + this.draw(this.field488); // L: 361 + if (this.field488) { // L: 362 this.clearBackground(); } - this.field481 = false; // L: 362 - } // L: 363 + this.field488 = false; // L: 363 + } // L: 364 - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "428970843" + garbageValue = "-1244527776" ) - final void method990() { - Bounds var1 = this.getFrameContentBounds(); // L: 366 - if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 367 - this.resizeCanvas(); // L: 368 - this.resizeCanvasNextFrame = false; // L: 369 + final void method1022() { + Bounds var1 = this.getFrameContentBounds(); // L: 367 + if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 368 + this.resizeCanvas(); // L: 369 + this.resizeCanvasNextFrame = false; // L: 370 } - } // L: 371 + } // L: 372 - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-650969456" + descriptor = "(B)V", + garbageValue = "48" ) - final void method991() { - this.resizeCanvasNextFrame = true; // L: 374 - } // L: 375 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-181155812" - ) - final synchronized void kill() { - if (!isKilled) { // L: 378 - isKilled = true; // L: 379 - - try { - this.canvas.removeFocusListener(this); // L: 381 - } catch (Exception var5) { // L: 383 - } - - try { - this.kill0(); // L: 385 - } catch (Exception var4) { // L: 387 - } - - if (this.frame != null) { // L: 388 - try { - System.exit(0); // L: 390 - } catch (Throwable var3) { // L: 392 - } - } - - if (taskHandler != null) { // L: 394 - try { - taskHandler.close(); // L: 396 - } catch (Exception var2) { // L: 398 - } - } - - this.vmethod1761(); // L: 400 - } - } // L: 401 + final void method1023() { + this.resizeCanvasNextFrame = true; // L: 375 + } // L: 376 @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1974240025" + garbageValue = "-2057674106" ) - protected abstract void setUp(); + @Export("kill") + final synchronized void kill() { + if (!isKilled) { // L: 379 + isKilled = true; // L: 380 - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-720509728" - ) - protected abstract void doCycle(); + try { + this.canvas.removeFocusListener(this); // L: 382 + } catch (Exception var5) { // L: 384 + } - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-63" - ) - protected abstract void draw(boolean var1); + try { + this.kill0(); // L: 386 + } catch (Exception var4) { // L: 388 + } - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-645621446" - ) - protected abstract void kill0(); + if (this.frame != null) { // L: 389 + try { + System.exit(0); // L: 391 + } catch (Throwable var3) { // L: 393 + } + } + + if (taskHandler != null) { // L: 395 + try { + taskHandler.close(); // L: 397 + } catch (Exception var2) { // L: 399 + } + } + + this.vmethod1384(); // L: 401 + } + } // L: 402 @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZI)V", - garbageValue = "577795912" + descriptor = "(I)V", + garbageValue = "1060461771" ) - protected final void drawInitial(int var1, String var2, boolean var3) { - try { - Graphics var4 = this.canvas.getGraphics(); // L: 468 - if (class278.fontHelvetica13 == null) { // L: 469 - class278.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 470 - ApproximateRouteStrategy.loginScreenFontMetrics = this.canvas.getFontMetrics(class278.fontHelvetica13); // L: 471 - } - - if (var3) { // L: 473 - var4.setColor(Color.black); // L: 474 - var4.fillRect(0, 0, FloorDecoration.canvasWidth, canvasHeight); // L: 475 - } - - Color var5 = new Color(140, 17, 17); // L: 477 - - try { - if (PacketBuffer.field3725 == null) { // L: 479 - PacketBuffer.field3725 = this.canvas.createImage(304, 34); - } - - Graphics var6 = PacketBuffer.field3725.getGraphics(); // L: 480 - var6.setColor(var5); // L: 481 - var6.drawRect(0, 0, 303, 33); // L: 482 - var6.fillRect(2, 2, var1 * 3, 30); // L: 483 - var6.setColor(Color.black); // L: 484 - var6.drawRect(1, 1, 301, 31); // L: 485 - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 486 - var6.setFont(class278.fontHelvetica13); // L: 487 - var6.setColor(Color.white); // L: 488 - var6.drawString(var2, (304 - ApproximateRouteStrategy.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 489 - var4.drawImage(PacketBuffer.field3725, FloorDecoration.canvasWidth / 2 - 152, canvasHeight / 2 - 18, (ImageObserver)null); // L: 490 - } catch (Exception var9) { // L: 492 - int var7 = FloorDecoration.canvasWidth / 2 - 152; // L: 493 - int var8 = canvasHeight / 2 - 18; // L: 494 - var4.setColor(var5); // L: 495 - var4.drawRect(var7, var8, 303, 33); // L: 496 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 497 - var4.setColor(Color.black); // L: 498 - var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 499 - var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 500 - var4.setFont(class278.fontHelvetica13); // L: 501 - var4.setColor(Color.white); // L: 502 - var4.drawString(var2, var7 + (304 - ApproximateRouteStrategy.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 503 - } - } catch (Exception var10) { // L: 506 - this.canvas.repaint(); // L: 507 - } - - } // L: 509 - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "15" - ) - protected final void method1002() { - PacketBuffer.field3725 = null; // L: 512 - class278.fontHelvetica13 = null; // L: 513 - ApproximateRouteStrategy.loginScreenFontMetrics = null; // L: 514 - } // L: 515 - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1560488333" - ) - protected void error(String var1) { - if (!this.hasErrored) { // L: 518 - this.hasErrored = true; // L: 519 - System.out.println("error_game_" + var1); // L: 520 - - try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 522 - } catch (Exception var3) { // L: 524 - } - - } - } // L: 525 - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "1926936525" - ) - Container container() { - return (Container)(this.frame != null ? this.frame : this); // L: 528 - } + @Export("setUp") + protected abstract void setUp(); @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)Llr;", - garbageValue = "-1116469540" + descriptor = "(I)V", + garbageValue = "1100660042" ) - Bounds getFrameContentBounds() { - Container var1 = this.container(); // L: 533 - int var2 = Math.max(var1.getWidth(), this.field475); // L: 534 - int var3 = Math.max(var1.getHeight(), this.field476); // L: 535 - if (this.frame != null) { // L: 536 - Insets var4 = this.frame.getInsets(); // L: 537 - var2 -= var4.right + var4.left; // L: 538 - var3 -= var4.top + var4.bottom; // L: 539 - } + @Export("doCycle") + protected abstract void doCycle(); - return new Bounds(var2, var3); // L: 541 - } - - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" + descriptor = "(ZI)V", + garbageValue = "-1812204618" ) - protected final boolean hasFrame() { - return this.frame != null; // L: 545 - } + @Export("draw") + protected abstract void draw(boolean var1); - @ObfuscatedName("ay") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "28" + garbageValue = "118" ) - protected abstract void vmethod1761(); + @Export("kill0") + protected abstract void kill0(); - public final void destroy() { - if (this == gameShell && !isKilled) { // L: 421 - stopTimeMs = PacketWriter.currentTimeMillis(); // L: 422 - class227.sleepExact(5000L); // L: 423 - this.kill(); // L: 424 + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;ZB)V", + garbageValue = "45" + ) + @Export("drawInitial") + protected final void drawInitial(int var1, String var2, boolean var3) { + try { + Graphics var4 = this.canvas.getGraphics(); // L: 469 + if (ViewportMouse.fontHelvetica13 == null) { // L: 470 + ViewportMouse.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 471 + class52.loginScreenFontMetrics = this.canvas.getFontMetrics(ViewportMouse.fontHelvetica13); // L: 472 + } + + if (var3) { // L: 474 + var4.setColor(Color.black); // L: 475 + var4.fillRect(0, 0, ItemContainer.canvasWidth, HealthBar.canvasHeight); // L: 476 + } + + Color var5 = new Color(140, 17, 17); // L: 478 + + try { + if (class231.field2779 == null) { // L: 480 + class231.field2779 = this.canvas.createImage(304, 34); + } + + Graphics var6 = class231.field2779.getGraphics(); // L: 481 + var6.setColor(var5); // L: 482 + var6.drawRect(0, 0, 303, 33); // L: 483 + var6.fillRect(2, 2, var1 * 3, 30); // L: 484 + var6.setColor(Color.black); // L: 485 + var6.drawRect(1, 1, 301, 31); // L: 486 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 487 + var6.setFont(ViewportMouse.fontHelvetica13); // L: 488 + var6.setColor(Color.white); // L: 489 + var6.drawString(var2, (304 - class52.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 490 + var4.drawImage(class231.field2779, ItemContainer.canvasWidth / 2 - 152, HealthBar.canvasHeight / 2 - 18, (ImageObserver)null); // L: 491 + } catch (Exception var9) { // L: 493 + int var7 = ItemContainer.canvasWidth / 2 - 152; // L: 494 + int var8 = HealthBar.canvasHeight / 2 - 18; // L: 495 + var4.setColor(var5); // L: 496 + var4.drawRect(var7, var8, 303, 33); // L: 497 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 498 + var4.setColor(Color.black); // L: 499 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 500 + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 501 + var4.setFont(ViewportMouse.fontHelvetica13); // L: 502 + var4.setColor(Color.white); // L: 503 + var4.drawString(var2, var7 + (304 - class52.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 504 + } + } catch (Exception var10) { // L: 507 + this.canvas.repaint(); // L: 508 } - } // L: 425 + + } // L: 510 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "32" + ) + protected final void method1112() { + class231.field2779 = null; // L: 513 + ViewportMouse.fontHelvetica13 = null; // L: 514 + class52.loginScreenFontMetrics = null; // L: 515 + } // L: 516 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1007402931" + ) + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { // L: 519 + this.hasErrored = true; // L: 520 + System.out.println("error_game_" + var1); // L: 521 + + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 523 + } catch (Exception var3) { // L: 525 + } + + } + } // L: 526 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(B)Ljava/awt/Container;", + garbageValue = "1" + ) + @Export("container") + Container container() { + return (Container)(this.frame != null ? this.frame : this); // L: 529 + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(B)Llw;", + garbageValue = "-50" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); // L: 534 + int var2 = Math.max(var1.getWidth(), this.field482); // L: 535 + int var3 = Math.max(var1.getHeight(), this.field483); // L: 536 + if (this.frame != null) { // L: 537 + Insets var4 = this.frame.getInsets(); // L: 538 + var2 -= var4.left + var4.right; // L: 539 + var3 -= var4.top + var4.bottom; // L: 540 + } + + return new Bounds(var2, var3); // L: 542 + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1525003630" + ) + @Export("hasFrame") + protected final boolean hasFrame() { + return this.frame != null; // L: 546 + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-51" + ) + protected abstract void vmethod1384(); public final synchronized void paint(Graphics var1) { - if (this == gameShell && !isKilled) { // L: 432 - this.field481 = true; // L: 433 - if (PacketWriter.currentTimeMillis() - this.field485 > 1000L) { // L: 434 - Rectangle var2 = var1.getClipBounds(); // L: 435 - if (var2 == null || var2.width >= FloorDecoration.canvasWidth && var2.height >= canvasHeight) { - this.isCanvasInvalid = true; // L: 436 + if (this == gameShell && !isKilled) { // L: 433 + this.field488 = true; // L: 434 + if (User.currentTimeMillis() - this.field492 > 1000L) { // L: 435 + Rectangle var2 = var1.getClipBounds(); // L: 436 + if (var2 == null || var2.width >= ItemContainer.canvasWidth && var2.height >= HealthBar.canvasHeight) { + this.isCanvasInvalid = true; // L: 437 } } } - } // L: 438 + } // L: 439 - public final void windowClosed(WindowEvent var1) { - } // L: 450 - - public final void start() { - if (this == gameShell && !isKilled) { // L: 411 - stopTimeMs = 0L; // L: 412 + public final void destroy() { + if (this == gameShell && !isKilled) { // L: 422 + stopTimeMs = User.currentTimeMillis(); // L: 423 + WorldMapSection3.sleepExact(5000L); // L: 424 + this.kill(); // L: 425 } - } // L: 413 - - public final void update(Graphics var1) { - this.paint(var1); // L: 428 - } // L: 429 - - public final void focusLost(FocusEvent var1) { - volatileFocus = false; // L: 446 - } // L: 447 - - public final void windowClosing(WindowEvent var1) { - this.destroy(); // L: 453 - } // L: 454 - - public final void windowDeactivated(WindowEvent var1) { - } // L: 456 - - public final void windowDeiconified(WindowEvent var1) { - } // L: 457 - - public final void windowIconified(WindowEvent var1) { - } // L: 458 - - public final void windowOpened(WindowEvent var1) { - } // L: 459 - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 441 - this.field481 = true; // L: 442 - } // L: 443 + } // L: 426 public void run() { try { - if (TaskHandler.javaVendor != null) { // L: 287 - String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 288 - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 289 - String var2 = TaskHandler.javaVersion; // L: 290 - if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 291 - this.error("wrongjava"); // L: 292 - return; // L: 293 + if (TaskHandler.javaVendor != null) { // L: 288 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 289 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 290 + String var2 = TaskHandler.javaVersion; // L: 291 + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 292 + this.error("wrongjava"); // L: 293 + return; // L: 294 } - if (var2.startsWith("1.6.0_")) { // L: 295 + if (var2.startsWith("1.6.0_")) { // L: 296 int var3; - for (var3 = 6; var3 < var2.length() && class1.isDigit(var2.charAt(var3)); ++var3) { // L: 296 297 + for (var3 = 6; var3 < var2.length() && class1.isDigit(var2.charAt(var3)); ++var3) { // L: 297 298 } - String var4 = var2.substring(6, var3); // L: 298 - if (World.isNumber(var4) && GrandExchangeOfferTotalQuantityComparator.parseInt(var4) < 10) { // L: 299 - this.error("wrongjava"); // L: 300 - return; // L: 301 + String var4 = var2.substring(6, var3); // L: 299 + if (class195.isNumber(var4) && ObjectSound.parseInt(var4) < 10) { // L: 300 + this.error("wrongjava"); // L: 301 + return; // L: 302 } } - fiveOrOne = 5; // L: 304 + fiveOrOne = 5; // L: 305 } } - this.setFocusCycleRoot(true); // L: 307 - this.addCanvas(); // L: 308 - this.setUp(); // L: 309 - AbstractWorldMapIcon.clock = ModeWhere.method3761(); // L: 310 + this.setFocusCycleRoot(true); // L: 308 + this.addCanvas(); // L: 309 + this.setUp(); // L: 310 + UserComparator3.clock = Actor.method1864(); // L: 311 - while (stopTimeMs == 0L || PacketWriter.currentTimeMillis() < stopTimeMs) { // L: 311 - class58.gameCyclesToDo = AbstractWorldMapIcon.clock.wait(cycleDurationMillis, fiveOrOne); // L: 312 + while (0L == stopTimeMs || User.currentTimeMillis() < stopTimeMs) { // L: 312 + gameCyclesToDo = UserComparator3.clock.wait(cycleDurationMillis, fiveOrOne); // L: 313 - for (int var5 = 0; var5 < class58.gameCyclesToDo; ++var5) { // L: 313 + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { // L: 314 this.clientTick(); } - this.graphicsTick(); // L: 314 - this.post(this.canvas); // L: 315 + this.graphicsTick(); // L: 315 + this.post(this.canvas); // L: 316 } - } catch (Exception var6) { // L: 318 - Decimator.RunException_sendStackTrace((String)null, var6); // L: 319 - this.error("crash"); // L: 320 + } catch (Exception var6) { // L: 319 + PacketWriter.RunException_sendStackTrace((String)null, var6); // L: 320 + this.error("crash"); // L: 321 } - this.kill(); // L: 322 - } // L: 323 + this.kill(); // L: 323 + } // L: 324 - public final void windowActivated(WindowEvent var1) { - } // L: 449 + public final void windowIconified(WindowEvent var1) { + } // L: 459 public final void stop() { - if (this == gameShell && !isKilled) { // L: 416 - stopTimeMs = PacketWriter.currentTimeMillis() + 4000L; // L: 417 + if (this == gameShell && !isKilled) { // L: 417 + stopTimeMs = User.currentTimeMillis() + 4000L; // L: 418 } - } // L: 418 + } // L: 419 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 442 + this.field488 = true; // L: 443 + } // L: 444 + + public final void update(Graphics var1) { + this.paint(var1); // L: 429 + } // L: 430 + + public final void focusLost(FocusEvent var1) { + volatileFocus = false; // L: 447 + } // L: 448 + + public final void windowOpened(WindowEvent var1) { + } // L: 460 public abstract void init(); - @ObfuscatedName("i") + public final void windowActivated(WindowEvent var1) { + } // L: 450 + + public final void windowDeiconified(WindowEvent var1) { + } // L: 458 + + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 454 + } // L: 455 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 457 + + public final void windowClosed(WindowEvent var1) { + } // L: 451 + + public final void start() { + if (this == gameShell && !isKilled) { // L: 412 + stopTimeMs = 0L; // L: 413 + } + } // L: 414 + + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "1" + descriptor = "(III)I", + garbageValue = "-516507127" ) - public static int method996(int var0, int var1) { + public static int method1072(int var0, int var1) { int var2; - for (var2 = 0; var1 > 0; --var1) { // L: 79 80 83 - var2 = var2 << 1 | var0 & 1; // L: 81 - var0 >>>= 1; // L: 82 + if (var1 > var0) { // L: 35 + var2 = var0; // L: 36 + var0 = var1; // L: 37 + var1 = var2; // L: 38 } - return var2; // L: 85 + while (var1 != 0) { // L: 40 + var2 = var0 % var1; // L: 41 + var0 = var1; // L: 42 + var1 = var2; // L: 43 + } + + return var0; // L: 45 } - @ObfuscatedName("ad") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "([BII)I", - garbageValue = "-1245222841" + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "-1950130429" ) - public static int method1108(byte[] var0, int var1) { - int var3 = -1; // L: 47 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 48 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 - } - - var3 = ~var3; // L: 51 - return var3; // L: 54 - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "53" - ) - static void method1109() { - if (ModelData0.field1901 != null) { // L: 10904 - Client.field946 = Client.cycle; // L: 10905 - ModelData0.field1901.method4414(); // L: 10906 - - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 10907 - if (Client.players[var0] != null) { // L: 10908 - ModelData0.field1901.method4423((Client.players[var0].x >> 7) + WorldMapManager.baseX, (Client.players[var0].y >> 7) + WorldMapLabel.baseY); // L: 10909 - } - } - } - - } // L: 10913 + static final void method1138(String var0, int var1) { + PacketBufferNode var2 = class4.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); // L: 268 + var2.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 269 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 270 + var2.packetBuffer.method5664(var1); // L: 271 + Client.packetWriter.addNode(var2); // L: 272 + } // L: 273 } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 2f0b8eba97..a8b10b3596 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,46 +1,59 @@ +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("f") +@ObfuscatedName("y") +@Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive11; - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "[Lls;" - ) - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget field79; - @ObfuscatedName("z") + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = 152068117 + intValue = 1749191729 ) + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("ev") + static int[] field77; + @ObfuscatedName("gp") + @ObfuscatedGetter( + intValue = -1761495631 + ) + static int field78; + @ObfuscatedName("li") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1698153219 + ) + @Export("world") public final int world; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 3809481130081136381L + longValue = -4139247955454884713L ) + @Export("age") public final long age; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lv;" + descriptor = "Lj;" ) + @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("offerName") String offerName; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lkf;BI)V" + descriptor = "(Lkb;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 @@ -51,7 +64,7 @@ public class GrandExchangeEvent { int var5 = var1.readInt(); // L: 116 this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 this.grandExchangeOffer.method189(2); // L: 118 - this.grandExchangeOffer.method184(var2); // L: 119 + this.grandExchangeOffer.method206(var2); // L: 119 this.grandExchangeOffer.unitPrice = var4; // L: 120 this.grandExchangeOffer.totalQuantity = var5; // L: 121 this.grandExchangeOffer.currentQuantity = 0; // L: 122 @@ -59,109 +72,217 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; // L: 124 } // L: 125 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-820260328" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "98" ) + @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "2082763364" + garbageValue = "209960511" ) + @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; // L: 132 } - @ObfuscatedName("fz") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljm;IIIB)V", - garbageValue = "6" + descriptor = "(Lks;I)V", + garbageValue = "-2056491743" ) - static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { // L: 3259 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3260 - int var4 = var0.soundEffects[var1]; // L: 3261 - if (var4 != 0) { // L: 3262 - int var5 = var4 >> 8; // L: 3263 - int var6 = var4 >> 4 & 7; // L: 3264 - int var7 = var4 & 15; // L: 3265 - Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3266 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3267 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3268 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3269 - int var8 = (var2 - 64) / 128; // L: 3270 - int var9 = (var3 - 64) / 128; // L: 3271 - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3272 - ++Client.soundEffectCount; // L: 3273 + static final void method172(PacketBuffer var0) { + int var1 = 0; // L: 252 + var0.importIndex(); // L: 253 + + byte[] var10000; + int var2; + int var4; + int var5; + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 254 + var5 = Players.Players_indices[var2]; // L: 255 + if ((Players.field1282[var5] & 1) == 0) { // L: 256 + if (var1 > 0) { // L: 257 + --var1; // L: 258 + var10000 = Players.field1282; // L: 259 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 262 + if (var4 == 0) { // L: 263 + var1 = Tiles.method1220(var0); // L: 264 + var10000 = Players.field1282; // L: 265 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + WorldMapData_1.readPlayerUpdate(var0, var5); // L: 268 + } } } } - } // L: 3274 - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "(Lhq;III)V", - garbageValue = "-570952041" - ) - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3365 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3366 - SpriteMask var3 = var0.getSpriteMask(true); // L: 3367 - if (var3 == null) { // L: 3368 - return; - } + var0.exportIndex(); // L: 271 + if (var1 != 0) { // L: 272 + throw new RuntimeException(); // L: 273 + } else { + var0.importIndex(); // L: 275 - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3369 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3370 - if (var3.contains(var4, var5)) { // L: 3371 - var4 -= var3.width / 2; // L: 3372 - var5 -= var3.height / 2; // L: 3373 - int var6 = Client.camAngleY & 2047; // L: 3374 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3375 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3376 - int var9 = var4 * var8 + var5 * var7 >> 11; // L: 3377 - int var10 = var8 * var5 - var4 * var7 >> 11; // L: 3378 - int var11 = var9 + WorldMapLabelSize.localPlayer.x >> 7; // L: 3379 - int var12 = WorldMapLabelSize.localPlayer.y - var10 >> 7; // L: 3380 - PacketBufferNode var13 = Client.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); // L: 3382 - var13.packetBuffer.writeByte(18); // L: 3383 - var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3384 - var13.packetBuffer.method5654(var11 + WorldMapManager.baseX); // L: 3385 - var13.packetBuffer.writeShort(var12 + WorldMapLabel.baseY); // L: 3386 - var13.packetBuffer.writeByte(var4); // L: 3387 - var13.packetBuffer.writeByte(var5); // L: 3388 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 3389 - var13.packetBuffer.writeByte(57); // L: 3390 - var13.packetBuffer.writeByte(0); // L: 3391 - var13.packetBuffer.writeByte(0); // L: 3392 - var13.packetBuffer.writeByte(89); // L: 3393 - var13.packetBuffer.writeShort(WorldMapLabelSize.localPlayer.x); // L: 3394 - var13.packetBuffer.writeShort(WorldMapLabelSize.localPlayer.y); // L: 3395 - var13.packetBuffer.writeByte(63); // L: 3396 - Client.packetWriter.addNode(var13); // L: 3397 - Client.destinationX = var11; // L: 3398 - Client.destinationY = var12; // L: 3399 + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 276 + var5 = Players.Players_indices[var2]; // L: 277 + if ((Players.field1282[var5] & 1) != 0) { // L: 278 + if (var1 > 0) { // L: 279 + --var1; // L: 280 + var10000 = Players.field1282; // L: 281 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 284 + if (var4 == 0) { // L: 285 + var1 = Tiles.method1220(var0); // L: 286 + var10000 = Players.field1282; // L: 287 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + WorldMapData_1.readPlayerUpdate(var0, var5); // L: 290 + } + } } } - } - } // L: 3402 + var0.exportIndex(); // L: 293 + if (var1 != 0) { // L: 294 + throw new RuntimeException(); // L: 295 + } else { + var0.importIndex(); // L: 297 - @ObfuscatedName("fn") + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 298 + var5 = Players.Players_emptyIndices[var2]; // L: 299 + if ((Players.field1282[var5] & 1) != 0) { // L: 300 + if (var1 > 0) { // L: 301 + --var1; // L: 302 + var10000 = Players.field1282; // L: 303 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 306 + if (var4 == 0) { // L: 307 + var1 = Tiles.method1220(var0); // L: 308 + var10000 = Players.field1282; // L: 309 + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class9.updateExternalPlayer(var0, var5)) { // L: 312 + var10000 = Players.field1282; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); // L: 315 + if (var1 != 0) { // L: 316 + throw new RuntimeException(); // L: 317 + } else { + var0.importIndex(); // L: 319 + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 320 + var5 = Players.Players_emptyIndices[var2]; // L: 321 + if ((Players.field1282[var5] & 1) == 0) { // L: 322 + if (var1 > 0) { // L: 323 + --var1; // L: 324 + var10000 = Players.field1282; // L: 325 + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var4 = var0.readBits(1); // L: 328 + if (var4 == 0) { // L: 329 + var1 = Tiles.method1220(var0); // L: 330 + var10000 = Players.field1282; // L: 331 + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (class9.updateExternalPlayer(var0, var5)) { // L: 334 + var10000 = Players.field1282; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); // L: 337 + if (var1 != 0) { // L: 338 + throw new RuntimeException(); // L: 339 + } else { + Players.Players_count = 0; // L: 341 + Players.Players_emptyIdxCount = 0; // L: 342 + + for (var2 = 1; var2 < 2048; ++var2) { // L: 343 + var10000 = Players.field1282; // L: 344 + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var3 = Client.players[var2]; // L: 345 + if (var3 != null) { // L: 346 + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 347 + } + } + + } + } + } + } + } // L: 349 + + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "33" + descriptor = "(ILco;ZB)I", + garbageValue = "-11" ) - static void method160() { - PacketBufferNode var0 = Client.getPacketBufferNode(ClientPacket.field2341, Client.packetWriter.isaacCipher); // L: 3880 - var0.packetBuffer.writeByte(class39.getWindowedMode()); // L: 3881 - var0.packetBuffer.writeShort(FloorDecoration.canvasWidth); // L: 3882 - var0.packetBuffer.writeShort(GameShell.canvasHeight); // L: 3883 - Client.packetWriter.addNode(var0); // L: 3884 - } // L: 3885 + static int method165(int var0, Script var1, boolean var2) { + Widget var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 1194 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1195 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1196 + return 1; // L: 1197 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1199 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1200 + return 1; // L: 1201 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1203 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.text; // L: 1204 + return 1; // L: 1205 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1207 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1208 + return 1; // L: 1209 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1211 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1212 + return 1; // L: 1213 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1215 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1216 + return 1; // L: 1217 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1219 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1220 + return 1; // L: 1221 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1223 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1224 + return 1; // L: 1225 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1227 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1228 + return 1; // L: 1229 + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1231 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1232 + return 1; // L: 1233 + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1235 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1236 + return 1; // L: 1237 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1239 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.color; // L: 1240 + return 1; // L: 1241 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1243 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.color2; // L: 1244 + return 1; // L: 1245 + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1247 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1248 + return 1; // L: 1249 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1251 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1252 + return 1; // L: 1253 + } else { + return 2; // L: 1255 + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 0807864a0f..b53be74a6c 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -1,37 +1,55 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Date; 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("c") +@ObfuscatedName("r") +@Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("k") + @ObfuscatedName("qa") + @ObfuscatedSignature( + descriptor = "Ldf;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("b") + @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("i") - public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("ga") - static int[] regionMapArchiveIds; @ObfuscatedName("z") + @Export("GrandExchangeEvents_quantityComparator") + public static Comparator GrandExchangeEvents_quantityComparator; + @ObfuscatedName("y") + static String[] field68; + @ObfuscatedName("go") + @ObfuscatedGetter( + intValue = 1672626269 + ) + static int field64; + @ObfuscatedName("f") + @Export("events") public final List events; static { GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); // L: 11 new GrandExchangeOfferWorldComparator(); - GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41 + GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54 GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator(); } // L: 67 @ObfuscatedSignature( - descriptor = "(Lkf;Z)V", + descriptor = "(Lkb;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -53,11 +71,12 @@ public class GrandExchangeEvents { } // L: 92 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZS)V", - garbageValue = "6265" + descriptor = "(Ljava/util/Comparator;ZI)V", + garbageValue = "692042674" ) + @Export("sort") public void sort(Comparator var1, boolean var2) { if (var2) { // L: 95 Collections.sort(this.events, var1); // L: 96 @@ -67,348 +86,39 @@ public class GrandExchangeEvents { } // L: 101 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "355141932" + descriptor = "(IIIIB)V", + garbageValue = "0" ) - public static void method150(int var0) { - if (class206.musicPlayerStatus != 0) { // L: 44 - Tiles.musicTrackVolume = var0; - } else { - class206.midiPcmStream.setPcmStreamVolume(var0); // L: 45 + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 + if (var4 == null) { // L: 40 + var4 = new ItemContainer(); // L: 41 + ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 } - } + if (var4.ids.length <= var1) { // L: 44 + int[] var5 = new int[var1 + 1]; // L: 45 + int[] var6 = new int[var1 + 1]; // L: 46 - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "176488379" - ) - public static void method143() { - VarpDefinition.VarpDefinition_cached.clear(); // L: 46 - } // L: 47 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "395740968" - ) - static int method144(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2575 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2576 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2577 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2578 - return 1; // L: 2579 - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 2581 - Varps.Interpreter_stringStackSize -= 2; // L: 2582 - var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2583 - var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2584 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2585 - return 1; // L: 2586 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2588 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2589 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2590 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + ModeWhere.intToString(var9, true); // L: 2591 - return 1; // L: 2592 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2594 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2595 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2596 - return 1; // L: 2597 - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 2599 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2600 - long var13 = 86400000L * (11745L + (long)var10); // L: 2601 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2602 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 2603 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2604 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2605 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2606 - return 1; // L: 2607 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2609 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 2617 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2618 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 2619 - return 1; // L: 2620 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 2622 - Varps.Interpreter_stringStackSize -= 2; // L: 2623 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketWriter.method2360(GrandExchangeOffer.compareStrings(Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1], class58.clientLanguage)); // L: 2624 - return 1; // L: 2625 - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 2627 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2628 - Interpreter.Interpreter_intStackSize -= 2; // L: 2629 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2630 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2631 - var11 = TilePaint.archive13.takeFile(var5, 0); // L: 2632 - var12 = new Font(var11); // L: 2633 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 2634 - return 1; // L: 2635 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 2637 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2638 - Interpreter.Interpreter_intStackSize -= 2; // L: 2639 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2640 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2641 - var11 = TilePaint.archive13.takeFile(var5, 0); // L: 2642 - var12 = new Font(var11); // L: 2643 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 2644 - return 1; // L: 2645 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 2647 - Varps.Interpreter_stringStackSize -= 2; // L: 2648 - var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2649 - var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2650 - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 2651 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4; // L: 2652 - } - - return 1; // L: 2653 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 2655 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2656 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 2657 - return 1; // L: 2658 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 2660 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2661 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2662 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 2663 - return 1; // L: 2664 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 2666 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2667 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBarDefinition.isCharPrintable((char)var10) ? 1 : 0; // L: 2668 - return 1; // L: 2669 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 2671 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2672 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class204.isAlphaNumeric((char)var10) ? 1 : 0; // L: 2673 - return 1; // L: 2674 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 2676 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2677 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MilliClock.isCharAlphabetic((char)var10) ? 1 : 0; // L: 2678 - return 1; // L: 2679 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 2681 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2682 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class1.isDigit((char)var10) ? 1 : 0; // L: 2683 - return 1; // L: 2684 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 2686 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2687 - if (var3 != null) { // L: 2688 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2689 - } - - return 1; // L: 2690 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 2692 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2693 - Interpreter.Interpreter_intStackSize -= 2; // L: 2694 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2695 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2696 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 2697 - return 1; // L: 2698 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 2700 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2701 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 2702 - boolean var16 = false; // L: 2703 - - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 2704 - char var7 = var3.charAt(var6); // L: 2705 - if (var7 == '<') { // L: 2706 - var16 = true; - } else if (var7 == '>') { // L: 2707 - var16 = false; - } else if (!var16) { // L: 2708 - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var15.toString(); // L: 2710 - return 1; // L: 2711 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 2713 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2714 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2715 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 2716 - return 1; // L: 2717 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 2719 - Varps.Interpreter_stringStackSize -= 2; // L: 2720 - var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2721 - var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2722 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2723 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 2724 - return 1; // L: 2725 - } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 2727 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2728 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 2729 - return 1; // L: 2730 - } else { - return 2; // L: 2732 - } - } - } else { - Varps.Interpreter_stringStackSize -= 2; // L: 2610 - var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2611 - var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2612 - if (WorldMapLabelSize.localPlayer.appearance != null && WorldMapLabelSize.localPlayer.appearance.isFemale) { // L: 2613 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3; // L: 2614 - } - - return 1; // L: 2615 - } + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 + var5[var7] = var4.ids[var7]; // L: 48 + var6[var7] = var4.quantities[var7]; // L: 49 } + + for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 + var5[var7] = -1; // L: 52 + var6[var7] = 0; // L: 53 + } + + var4.ids = var5; // L: 55 + var4.quantities = var6; // L: 56 } - } - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "(Ljx;IIII)V", - garbageValue = "1036487158" - ) - static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { // L: 8457 - if (var0.transforms != null) { // L: 8458 - var0 = var0.transform(); - } - - if (var0 != null) { // L: 8459 - if (var0.isInteractable) { // L: 8460 - if (!var0.isFollower || Client.followerIndex == var1) { // L: 8461 - String var4 = var0.name; // L: 8462 - int var7; - int var8; - if (var0.combatLevel != 0) { // L: 8463 - var7 = var0.combatLevel; // L: 8466 - var8 = WorldMapLabelSize.localPlayer.combatLevel; // L: 8467 - int var9 = var8 - var7; // L: 8469 - String var6; - if (var9 < -9) { // L: 8470 - var6 = WorldMapAreaData.colorStartTag(16711680); // L: 8471 - } else if (var9 < -6) { // L: 8474 - var6 = WorldMapAreaData.colorStartTag(16723968); // L: 8475 - } else if (var9 < -3) { // L: 8478 - var6 = WorldMapAreaData.colorStartTag(16740352); // L: 8479 - } else if (var9 < 0) { // L: 8482 - var6 = WorldMapAreaData.colorStartTag(16756736); // L: 8483 - } else if (var9 > 9) { // L: 8486 - var6 = WorldMapAreaData.colorStartTag(65280); // L: 8487 - } else if (var9 > 6) { // L: 8490 - var6 = WorldMapAreaData.colorStartTag(4259584); // L: 8491 - } else if (var9 > 3) { // L: 8494 - var6 = WorldMapAreaData.colorStartTag(8453888); // L: 8495 - } else if (var9 > 0) { // L: 8498 - var6 = WorldMapAreaData.colorStartTag(12648192); // L: 8499 - } else { - var6 = WorldMapAreaData.colorStartTag(16776960); // L: 8502 - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 8504 - } - - if (var0.isFollower && Client.followerOpsLowPriority) { // L: 8506 - StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 8507 - } - - if (Client.isItemSelected == 1) { // L: 8510 - StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 8511 - } else if (Client.isSpellSelected) { // L: 8514 - if ((UserComparator8.selectedSpellFlags & 2) == 2) { // L: 8515 - StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 8516 - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 8521 - String[] var11 = var0.actions; // L: 8522 - if (var11 != null) { // L: 8523 - for (var7 = 4; var7 >= 0; --var7) { // L: 8524 - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 8525 - var8 = 0; // L: 8526 - if (var7 == 0) { // L: 8527 - var8 = var10 + 9; - } - - if (var7 == 1) { // L: 8528 - var8 = var10 + 10; - } - - if (var7 == 2) { // L: 8529 - var8 = var10 + 11; - } - - if (var7 == 3) { // L: 8530 - var8 = var10 + 12; - } - - if (var7 == 4) { // L: 8531 - var8 = var10 + 13; - } - - StructDefinition.insertMenuItemNoShift(var11[var7], WorldMapAreaData.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 8532 - } - } - } - - if (var11 != null) { // L: 8537 - for (var7 = 4; var7 >= 0; --var7) { // L: 8538 - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 8539 - short var12 = 0; // L: 8540 - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 8541 - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > WorldMapLabelSize.localPlayer.combatLevel) { // L: 8542 - var12 = 2000; // L: 8543 - } - - var8 = 0; // L: 8545 - if (var7 == 0) { // L: 8546 - var8 = var12 + 9; - } - - if (var7 == 1) { // L: 8547 - var8 = var12 + 10; - } - - if (var7 == 2) { // L: 8548 - var8 = var12 + 11; - } - - if (var7 == 3) { // L: 8549 - var8 = var12 + 12; - } - - if (var7 == 4) { // L: 8550 - var8 = var12 + 13; - } - - StructDefinition.insertMenuItemNoShift(var11[var7], WorldMapAreaData.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 8551 - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 8556 - StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 8557 - } - } - - } - } - } - } - } // L: 8561 - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-775294286" - ) - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 9631 - } // L: 9632 + var4.ids[var1] = var2; // L: 58 + var4.quantities[var1] = var3; // L: 59 + } // L: 60 } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 0389601bc1..77b851a087 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -1,245 +1,195 @@ +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("v") +@ObfuscatedName("j") +@Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("be") + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = -235857651 + intValue = -2001741545 ) - static int field99; - @ObfuscatedName("z") + static int field87; + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("gr") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("lc") + @ObfuscatedSignature( + descriptor = "Lcu;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("f") + @Export("state") byte state; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1886313297 + intValue = 1175311391 ) + @Export("id") public int id; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1193190523 + intValue = 1620049031 ) + @Export("unitPrice") public int unitPrice; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1489525001 + intValue = -658451115 ) + @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -683135485 + intValue = 682864265 ) + @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2067595945 + intValue = 2131508633 ) + @Export("currentPrice") public int currentPrice; public GrandExchangeOffer() { - } + } // L: 13 @ObfuscatedSignature( - descriptor = "(Lkf;Z)V", + descriptor = "(Lkb;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { - this.state = var1.readByte(); - this.id = var1.readUnsignedShort(); // L: 17 - this.unitPrice = var1.readInt(); - this.totalQuantity = var1.readInt(); - this.currentQuantity = var1.readInt(); + this.state = var1.readByte(); // L: 16 + this.id = var1.readUnsignedShort(); + this.unitPrice = var1.readInt(); // L: 18 + this.totalQuantity = var1.readInt(); // L: 19 + this.currentQuantity = var1.readInt(); // L: 20 this.currentPrice = var1.readInt(); // L: 21 } // L: 22 - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "562486348" + garbageValue = "-682485902" ) + @Export("status") public int status() { return this.state & 7; // L: 50 } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1427821401" + garbageValue = "-1493721468" ) + @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1947498588" + garbageValue = "-629489777" ) void method189(int var1) { - this.state &= -8; - this.state = (byte)(this.state | var1 & 7); - } + this.state &= -8; // L: 58 + this.state = (byte)(this.state | var1 & 7); // L: 59 + } // L: 60 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1892738676" + garbageValue = "-130470346" ) - void method184(int var1) { - this.state &= -9; + void method206(int var1) { + this.state &= -9; // L: 63 if (var1 == 1) { - this.state = (byte)(this.state | 8); + this.state = (byte)(this.state | 8); // L: 64 } } // L: 65 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgn;I)I", - garbageValue = "-780286568" + descriptor = "(B)[Lgg;", + garbageValue = "-42" ) - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); // L: 11 - int var4 = var1.length(); // L: 12 - int var5 = 0; // L: 13 - int var6 = 0; // L: 14 - byte var7 = 0; // L: 15 - char var8 = 0; // L: 16 + public static class194[] method208() { + return new class194[]{class194.field2356, class194.field2349, class194.field2359, class194.field2348, class194.field2352, class194.field2351, class194.field2354, class194.field2353, class194.field2355, class194.field2357}; // L: 17 + } - while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 - if (var5 - var7 >= var3) { // L: 19 - return -1; - } - - if (var6 - var8 >= var4) { // L: 20 - return 1; - } - - char var9; - if (var7 != 0) { // L: 23 - var9 = (char)var7; // L: 24 - boolean var14 = false; // L: 25 - } else { - var9 = var0.charAt(var5++); // L: 27 - } - - char var10; - if (var8 != 0) { // L: 28 - var10 = var8; // L: 29 - boolean var15 = false; // L: 30 - } else { - var10 = var1.charAt(var6++); // L: 32 - } - - byte var11; - if (var9 == 198) { // L: 35 - var11 = 69; // L: 36 - } else if (var9 == 230) { // L: 39 - var11 = 101; // L: 40 - } else if (var9 == 223) { // L: 43 - var11 = 115; // L: 44 - } else if (var9 == 338) { // L: 47 - var11 = 69; // L: 48 - } else if (var9 == 339) { // L: 51 - var11 = 101; // L: 52 - } else { - var11 = 0; // L: 55 - } - - var7 = var11; // L: 57 - var8 = LoginScreenAnimation.method1879(var10); // L: 58 - var9 = TileItem.standardizeChar(var9, var2); // L: 59 - var10 = TileItem.standardizeChar(var10, var2); // L: 60 - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 61 - var9 = Character.toLowerCase(var9); // L: 62 - var10 = Character.toLowerCase(var10); // L: 63 - if (var10 != var9) { // L: 64 - return class58.lowercaseChar(var9, var2) - class58.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); // L: 67 - - char var12; - int var17; - for (var17 = 0; var17 < var16; ++var17) { // L: 68 - if (var2 == Language.Language_FR) { // L: 69 - var5 = var3 - 1 - var17; // L: 70 - var6 = var4 - 1 - var17; // L: 71 - } else { - var6 = var17; // L: 73 - var5 = var17; - } - - char var18 = var0.charAt(var5); // L: 74 - var12 = var1.charAt(var6); // L: 75 - if (var12 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var12)) { // L: 76 - var18 = Character.toLowerCase(var18); // L: 77 - var12 = Character.toLowerCase(var12); // L: 78 - if (var18 != var12) { - return class58.lowercaseChar(var18, var2) - class58.lowercaseChar(var12, var2); // L: 79 - } - } - } - - var17 = var3 - var4; // L: 82 - if (var17 != 0) { // L: 83 - return var17; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-253768081" + ) + static int method198(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 1010 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1011 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.x; // L: 1012 + return 1; // L: 1013 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1015 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.y; // L: 1016 + return 1; // L: 1017 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1019 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.width; // L: 1020 + return 1; // L: 1021 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1023 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.height; // L: 1024 + return 1; // L: 1025 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1027 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1028 + return 1; // L: 1029 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1031 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.parentId; // L: 1032 + return 1; // L: 1033 } else { - for (int var19 = 0; var19 < var16; ++var19) { // L: 84 - var12 = var0.charAt(var19); // L: 85 - char var13 = var1.charAt(var19); // L: 86 - if (var13 != var12) { // L: 87 - return class58.lowercaseChar(var12, var2) - class58.lowercaseChar(var13, var2); - } + return 2; // L: 1035 + } + } + + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIIB)V", + garbageValue = "0" + ) + @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; // L: 7144 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7145 7146 7151 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7147 + var9 = var10; // L: 7148 + break; } - - return 0; // L: 89 - } - } - - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1774568305" - ) - static boolean method207() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1427 - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1428 - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1429 - if (!var0.isLoaded()) { - return false; // L: 1430 - } - - ++Client.archiveLoadersDone; // L: 1431 - } - - return true; // L: 1433 - } else { - return true; // L: 1432 - } - } - - @ObfuscatedName("gx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "695036800" - ) - static void method206() { - if (Client.renderSelf) { // L: 4248 - VarpDefinition.addPlayerToScene(WorldMapLabelSize.localPlayer, false); // L: 4249 } - } // L: 4251 + if (var9 == null) { // L: 7153 + var9 = new PendingSpawn(); // L: 7154 + var9.plane = var0; // L: 7155 + var9.type = var3; // L: 7156 + var9.x = var1; // L: 7157 + var9.y = var2; // L: 7158 + JagexCache.method3619(var9); // L: 7159 + Client.pendingSpawns.addFirst(var9); // L: 7160 + } - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-67" - ) - static final int method209() { - return Client.menuOptionsCount - 1; // L: 8254 - } + var9.id = var4; // L: 7162 + var9.field962 = var5; // L: 7163 + var9.orientation = var6; // L: 7164 + var9.delay = var7; // L: 7165 + var9.hitpoints = var8; // L: 7166 + } // L: 7167 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 84976dc7c1..b95f4dfbd2 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,267 +1,291 @@ -import java.awt.Component; +import java.io.IOException; import java.util.Comparator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("u") +@ObfuscatedName("d") +@Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("s") + @ObfuscatedName("sk") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lcp;" ) - public static AbstractArchive SequenceDefinition_skeletonsArchive; + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("ObjectDefinition_modelsArchive") + public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lf;Lf;B)I", - garbageValue = "0" + descriptor = "(Ly;Ly;B)I", + garbageValue = "-94" ) + @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 21 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 } - @ObfuscatedName("z") + public boolean equals(Object var1) { + return super.equals(var1); // L: 21 + } + + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1389394211" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "65677327" ) - static void method242(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 - var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 - } // L: 40 + static final void method241(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 126 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your ignore list first").toString(); + DevicePcmPlayerProvider.addGameMessage(30, "", var1); // L: 128 + } // L: 130 - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lky;I)V", - garbageValue = "1274576828" + descriptor = "(I)V", + garbageValue = "-1203523043" ) - static final void method234(PacketBuffer var0) { - for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { // L: 443 - int var2 = Players.Players_pendingUpdateIndices[var1]; // L: 444 - Player var3 = Client.players[var2]; // L: 445 - int var4 = var0.readUnsignedByte(); // L: 446 - if ((var4 & 128) != 0) { // L: 447 - var4 += var0.readUnsignedByte() << 8; - } + public static void method242() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 192 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 193 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 194 + } // L: 195 - byte var5 = -1; // L: 449 - if ((var4 & 2048) != 0) { // L: 450 - var3.field997 = var0.readByte(); // L: 451 - var3.field1016 = var0.method5730(); // L: 452 - var3.field1015 = var0.readByte(); // L: 453 - var3.field1017 = var0.readByte(); // L: 454 - var3.field1026 = var0.method5657() + Client.cycle; // L: 455 - var3.field1019 = var0.method5655() + Client.cycle; // L: 456 - var3.field1027 = var0.method5656(); // L: 457 - if (var3.field660) { // L: 458 - var3.field997 += var3.tileX; // L: 459 - var3.field1016 += var3.tileY; // L: 460 - var3.field1015 += var3.tileX; // L: 461 - var3.field1017 += var3.tileY; // L: 462 - var3.pathLength = 0; // L: 463 + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-695150363" + ) + static int method240(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3273 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WallDecoration.loadWorlds() ? 1 : 0; // L: 3274 + return 1; // L: 3275 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3277 + var9 = ModelData0.worldListStart(); // L: 3278 + if (var9 != null) { // L: 3279 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.id; // L: 3280 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.properties; // L: 3281 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var9.activity; // L: 3282 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.location; // L: 3283 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.population; // L: 3284 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var9.host; // L: 3285 } else { - var3.field997 += var3.pathX[0]; // L: 466 - var3.field1016 += var3.pathY[0]; // L: 467 - var3.field1015 += var3.pathX[0]; // L: 468 - var3.field1017 += var3.pathY[0]; // L: 469 - var3.pathLength = 1; // L: 470 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3288 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3289 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3290 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3291 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3292 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3293 } - var3.field973 = 0; // L: 472 - } - - int var6; - int var7; - if ((var4 & 4) != 0) { // L: 474 - var6 = var0.method5656(); // L: 475 - if (var6 == 65535) { // L: 476 - var6 = -1; - } - - var7 = var0.readUnsignedByte(); // L: 477 - GrandExchangeOfferNameComparator.performPlayerAnimation(var3, var6, var7); // L: 478 - } - - if ((var4 & 4096) != 0) { // L: 480 - var5 = var0.method5649(); // L: 481 - } - - int var9; - int var10; - int var13; - if ((var4 & 64) != 0) { // L: 483 - var6 = var0.method5656(); // L: 484 - PlayerType var14 = (PlayerType)TextureProvider.findEnumerated(ApproximateRouteStrategy.PlayerType_values(), var0.method5639()); // L: 485 - boolean var8 = var0.method5612() == 1; // L: 486 - var9 = var0.method5639(); // L: 487 - var10 = var0.offset; // L: 488 - if (var3.username != null && var3.appearance != null) { // L: 489 - boolean var11 = false; // L: 490 - if (var14.isUser && class60.friendSystem.isIgnored(var3.username)) { // L: 491 492 - var11 = true; - } - - if (!var11 && Client.field790 == 0 && !var3.isHidden) { // L: 494 - Players.field1287.offset = 0; // L: 495 - var0.method5697(Players.field1287.array, 0, var9); // L: 496 - Players.field1287.offset = 0; // L: 497 - String var12 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(Players.field1287))); // L: 498 - var3.overheadText = var12.trim(); // L: 499 - var3.overheadTextColor = var6 >> 8; // L: 500 - var3.overheadTextEffect = var6 & 255; // L: 501 - var3.overheadTextCyclesRemaining = 150; // L: 502 - var3.isAutoChatting = var8; // L: 503 - var3.field986 = var3 != WorldMapLabelSize.localPlayer && var14.isUser && "" != Client.field913 && var12.toLowerCase().indexOf(Client.field913) == -1; // L: 504 - if (var14.isPrivileged) { // L: 506 - var13 = var8 ? 91 : 1; - } else { - var13 = var8 ? 90 : 2; // L: 507 - } - - if (var14.modIcon != -1) { // L: 508 - WorldMapRectangle.addGameMessage(var13, WorldMapScaleHandler.method824(var14.modIcon) + var3.username.getName(), var12); - } else { - WorldMapRectangle.addGameMessage(var13, var3.username.getName(), var12); // L: 509 - } - } - } - - var0.offset = var10 + var9; // L: 512 - } - - if ((var4 & 512) != 0) { // L: 514 - Players.field1284[var2] = var0.readByte(); // L: 515 - } - - if ((var4 & 16) != 0) { // L: 517 - var6 = var0.method5612(); // L: 518 - int var16; - int var17; - int var19; - if (var6 > 0) { // L: 519 - for (var7 = 0; var7 < var6; ++var7) { // L: 520 - var9 = -1; // L: 522 - var10 = -1; // L: 523 - var19 = -1; // L: 524 - var17 = var0.readUShortSmart(); // L: 525 - if (var17 == 32767) { // L: 526 - var17 = var0.readUShortSmart(); // L: 527 - var10 = var0.readUShortSmart(); // L: 528 - var9 = var0.readUShortSmart(); // L: 529 - var19 = var0.readUShortSmart(); // L: 530 - } else if (var17 != 32766) { // L: 532 - var10 = var0.readUShortSmart(); // L: 533 - } else { - var17 = -1; // L: 535 - } - - var16 = var0.readUShortSmart(); // L: 536 - var3.addHitSplat(var17, var10, var9, var19, Client.cycle, var16); // L: 537 - } - } - - var7 = var0.method5646(); // L: 540 - if (var7 > 0) { // L: 541 - for (var17 = 0; var17 < var7; ++var17) { // L: 542 - var9 = var0.readUShortSmart(); // L: 543 - var10 = var0.readUShortSmart(); // L: 544 - if (var10 != 32767) { // L: 545 - var19 = var0.readUShortSmart(); // L: 546 - var16 = var0.readUnsignedByte(); // L: 547 - var13 = var10 > 0 ? var0.method5646() : var16; // L: 548 - var3.addHealthBar(var9, Client.cycle, var10, var19, var16, var13); // L: 549 - } else { - var3.removeHealthBar(var9); // L: 551 - } - } - } - } - - if ((var4 & 1024) != 0) { // L: 555 - var3.spotAnimation = var0.readUnsignedShort(); // L: 556 - var6 = var0.method5667(); // L: 557 - var3.field1003 = var6 >> 16; // L: 558 - var3.field1013 = (var6 & 65535) + Client.cycle; // L: 559 - var3.spotAnimationFrame = 0; // L: 560 - var3.spotAnimationFrameCycle = 0; // L: 561 - if (var3.field1013 > Client.cycle) { // L: 562 - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { // L: 563 - var3.spotAnimation = -1; - } - } - - if ((var4 & 32) != 0) { // L: 565 - var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 566 - if (var3.overheadText.charAt(0) == '~') { // L: 567 - var3.overheadText = var3.overheadText.substring(1); // L: 568 - WorldMapRectangle.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 569 - } else if (var3 == WorldMapLabelSize.localPlayer) { // L: 571 - WorldMapRectangle.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 572 - } - - var3.isAutoChatting = false; // L: 574 - var3.overheadTextColor = 0; // L: 575 - var3.overheadTextEffect = 0; // L: 576 - var3.overheadTextCyclesRemaining = 150; // L: 577 - } - - if ((var4 & 1) != 0) { // L: 579 - var6 = var0.method5639(); // L: 580 - byte[] var20 = new byte[var6]; // L: 581 - Buffer var15 = new Buffer(var20); // L: 582 - var0.method5749(var20, 0, var6); // L: 583 - Players.field1277[var2] = var15; // L: 584 - var3.read(var15); // L: 585 - } - - if ((var4 & 8) != 0) { // L: 587 - var3.targetIndex = var0.method5657(); // L: 588 - if (var3.targetIndex == 65535) { // L: 589 - var3.targetIndex = -1; - } - } - - if ((var4 & 2) != 0) { // L: 591 - var3.field1000 = var0.method5655(); // L: 592 - if (var3.pathLength == 0) { // L: 593 - var3.orientation = var3.field1000; // L: 594 - var3.field1000 = -1; // L: 595 - } - } - - if ((var4 & 256) != 0) { // L: 598 - for (var6 = 0; var6 < 3; ++var6) { // L: 599 - var3.actions[var6] = var0.readStringCp1252NullTerminated(); - } - } - - if (var3.field660) { // L: 601 - if (var5 == 127) { // L: 602 - var3.resetPath(var3.tileX, var3.tileY); + return 1; // L: 3295 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3297 + var9 = FileSystem.getNextWorldListWorld(); // L: 3298 + if (var9 != null) { // L: 3299 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.id; // L: 3300 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.properties; // L: 3301 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var9.activity; // L: 3302 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.location; // L: 3303 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.population; // L: 3304 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var9.host; // L: 3305 } else { - byte var18; - if (var5 != -1) { // L: 605 - var18 = var5; + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3308 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3309 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3310 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3311 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3312 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3313 + } + + return 1; // L: 3315 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3317 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3318 + var7 = null; // L: 3319 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3320 + if (var3 == DefaultsGroup.World_worlds[var8].id) { // L: 3321 + var7 = DefaultsGroup.World_worlds[var8]; // L: 3322 + break; + } + } + + if (var7 != null) { // L: 3326 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.id; // L: 3327 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.properties; // L: 3328 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var7.activity; // L: 3329 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.location; // L: 3330 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.population; // L: 3331 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var7.host; // L: 3332 } else { - var18 = Players.field1284[var2]; // L: 606 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3335 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3336 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3337 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3338 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3339 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3340 } - var3.method1286(var3.tileX, var3.tileY, var18); // L: 607 + return 1; // L: 3342 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3344 + MilliClock.Interpreter_intStackSize -= 4; // L: 3345 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3346 + boolean var10 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1] == 1; // L: 3347 + var8 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 3348 + boolean var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3] == 1; // L: 3349 + World.sortWorldList(var3, var10, var8, var6); // L: 3350 + return 1; // L: 3351 + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3353 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3374 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 3375 + return 1; // L: 3376 + } else { + int var4; + ParamDefinition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3378 + MilliClock.Interpreter_intStackSize -= 2; // L: 3379 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3380 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 3381 + var5 = TileItem.getParamDefinition(var4); // L: 3382 + if (var5.isString()) { // L: 3383 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = Clock.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3384 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Clock.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3387 + } + + return 1; // L: 3389 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3391 + MilliClock.Interpreter_intStackSize -= 2; // L: 3392 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3393 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 3394 + var5 = TileItem.getParamDefinition(var4); // L: 3395 + if (var5.isString()) { // L: 3396 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ScriptEvent.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3397 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ScriptEvent.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3400 + } + + return 1; // L: 3402 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3404 + MilliClock.Interpreter_intStackSize -= 2; // L: 3405 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3406 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 3407 + var5 = TileItem.getParamDefinition(var4); // L: 3408 + if (var5.isString()) { // L: 3409 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3410 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3413 + } + + return 1; // L: 3415 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3417 + MilliClock.Interpreter_intStackSize -= 2; // L: 3418 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3419 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 3420 + var5 = TileItem.getParamDefinition(var4); // L: 3421 + if (var5.isString()) { // L: 3422 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ClientPacket.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3423 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ClientPacket.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3426 + } + + return 1; // L: 3428 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3430 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3431 + return 1; // L: 3432 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3434 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3435 + return 1; // L: 3436 + } else if (var0 == 6520) { // L: 3438 + return 1; // L: 3439 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3441 + return 1; // L: 3442 + } else if (var0 == 6522) { // L: 3444 + --UrlRequester.Interpreter_stringStackSize; // L: 3445 + --MilliClock.Interpreter_intStackSize; // L: 3446 + return 1; // L: 3447 + } else if (var0 == 6523) { // L: 3449 + --UrlRequester.Interpreter_stringStackSize; // L: 3450 + --MilliClock.Interpreter_intStackSize; // L: 3451 + return 1; // L: 3452 + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3454 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3455 + return 1; // L: 3456 + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3458 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; // L: 3459 + return 1; // L: 3460 + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3462 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; // L: 3463 + return 1; // L: 3464 + } else { + return 2; // L: 3466 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3354 + if (var3 >= 0 && var3 < World.World_count) { // L: 3355 + var7 = DefaultsGroup.World_worlds[var3]; // L: 3356 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.id; // L: 3357 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.properties; // L: 3358 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var7.activity; // L: 3359 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.location; // L: 3360 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.population; // L: 3361 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var7.host; // L: 3362 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3365 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3366 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3367 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3368 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3369 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3370 + } + + return 1; // L: 3372 } } } + } - } // L: 613 + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "487407566" + ) + static final void method243(boolean var0) { + FriendSystem.playPcmPlayers(); // L: 5656 + ++Client.packetWriter.pendingWrites; // L: 5657 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5658 + Client.packetWriter.pendingWrites = 0; // L: 5659 + if (!Client.field730 && Client.packetWriter.getSocket() != null) { // L: 5660 + PacketBufferNode var1 = class4.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); // L: 5662 + Client.packetWriter.addNode(var1); // L: 5663 + + try { + Client.packetWriter.flush(); // L: 5665 + } catch (IOException var3) { // L: 5667 + Client.field730 = true; // L: 5668 + } + } + + } + } // L: 5671 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index a90a701801..a8847ca3c0 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,32 +1,18 @@ import java.util.Comparator; -import net.runelite.mapping.ObfuscatedGetter; +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("r") +@ObfuscatedName("v") +@Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("na") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Lhq;" - ) - static Widget[] field115; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - static Bounds field112; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = -1454055259 - ) - static int field114; - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lf;Lf;I)I", - garbageValue = "-1190870183" + descriptor = "(Ly;Ly;I)I", + garbageValue = "-875345693" ) + @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 } @@ -39,849 +25,90 @@ final class GrandExchangeOfferNameComparator implements Comparator { return super.equals(var1); // L: 64 } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Ljp;", - garbageValue = "-615080564" + descriptor = "(I)V", + garbageValue = "453891314" ) - public static EnumDefinition getEnum(int var0) { - EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); // L: 29 - if (var1 != null) { // L: 30 - return var1; + static void method228() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 } else { - byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); // L: 31 - var1 = new EnumDefinition(); // L: 32 - if (var2 != null) { // L: 33 - var1.decode(new Buffer(var2)); - } - - EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 - return var1; // L: 35 + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 } - } - @ObfuscatedName("p") + } // L: 147 + + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "1335089944" + descriptor = "(I)V", + garbageValue = "-91260225" ) - static int method231(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1259 - var5 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1260 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemId; // L: 1261 - return 1; // L: 1262 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1264 - var5 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1265 - if (var5.itemId != -1) { // L: 1266 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1267 - } + static void method227() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 50 + } // L: 51 - return 1; // L: 1268 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1270 - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1271 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1272 - if (var4 != null) { // L: 1273 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1274 - } - - return 1; // L: 1275 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1277 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1278 - return 1; // L: 1279 - } else { - return 2; // L: 1281 - } - } - - @ObfuscatedName("fu") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lbf;IIB)V", - garbageValue = "2" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-559149911" ) - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 3839 - int var3 = WorldMapRegion.SequenceDefinition_get(var1).field3535; // L: 3840 - if (var3 == 1) { // L: 3841 - var0.sequenceFrame = 0; // L: 3842 - var0.sequenceFrameCycle = 0; // L: 3843 - var0.sequenceDelay = var2; // L: 3844 - var0.field1009 = 0; // L: 3845 - } + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1532 + Login.Login_response2 = var1; // L: 1533 + Login.Login_response3 = var2; // L: 1534 + } // L: 1535 - if (var3 == 2) { // L: 3847 - var0.field1009 = 0; // L: 3848 - } - } else if (var1 == -1 || var0.sequence == -1 || WorldMapRegion.SequenceDefinition_get(var1).field3537 >= WorldMapRegion.SequenceDefinition_get(var0.sequence).field3537) { // L: 3851 - var0.sequence = var1; // L: 3852 - var0.sequenceFrame = 0; // L: 3853 - var0.sequenceFrameCycle = 0; // L: 3854 - var0.sequenceDelay = var2; // L: 3855 - var0.field1009 = 0; // L: 3856 - var0.field973 = var0.pathLength; // L: 3857 - } - - } // L: 3859 - - @ObfuscatedName("gc") + @ObfuscatedName("gh") @ObfuscatedSignature( - descriptor = "(Lcg;IIIIII)V", - garbageValue = "930508889" + descriptor = "(ZB)V", + garbageValue = "16" ) - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { // L: 4429 - if (var0 instanceof NPC) { // L: 4430 - NPCDefinition var6 = ((NPC)var0).definition; // L: 4431 - if (var6.transforms != null) { // L: 4432 - var6 = var6.transform(); - } + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4859 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4860 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4861 + int var3 = var2.x >> 7; // L: 4862 + int var4 = var2.y >> 7; // L: 4863 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4864 + if (var2.field1011 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4865 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4866 + continue; + } - if (var6 == null) { // L: 4433 - return; + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4867 + } + + long var5 = GrandExchangeOfferOwnWorldComparator.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4869 + var2.playerCycle = Client.cycle; // L: 4870 + ModeWhere.scene.drawEntity(GrandExchangeOfferUnitPriceComparator.Client_plane, var2.x, var2.y, GrandExchangeOfferWorldComparator.getTileHeight(var2.field1011 * 64 - 64 + var2.x, var2.field1011 * 64 - 64 + var2.y, GrandExchangeOfferUnitPriceComparator.Client_plane), var2.field1011 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4871 } } - - int var75 = Players.Players_count; // L: 4435 - int[] var7 = Players.Players_indices; // L: 4436 - byte var8 = 0; // L: 4437 - if (var1 < var75 && var0.playerCycle == Client.cycle && PrivateChatMode.method6022((Player)var0)) { // L: 4438 - Player var9 = (Player)var0; // L: 4439 - if (var1 < var75) { // L: 4440 - Coord.method4086(var0, var0.defaultHeight + 15); // L: 4441 - AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4442 - byte var11 = 9; // L: 4443 - var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); // L: 4444 - var8 = 18; // L: 4445 - } - } - - int var76 = -2; // L: 4448 - int var15; - int var22; - int var23; - if (!var0.healthBars.method4945()) { // L: 4449 - Coord.method4086(var0, var0.defaultHeight + 15); // L: 4450 - - for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { // L: 4451 - HealthBarUpdate var79 = var87.get(Client.cycle); // L: 4452 - if (var79 == null) { // L: 4453 - if (var87.isEmpty()) { // L: 4511 - var87.remove(); - } - } else { - HealthBarDefinition var80 = var87.definition; // L: 4454 - Sprite var13 = var80.getBackSprite(); // L: 4455 - Sprite var81 = var80.getFrontSprite(); // L: 4456 - int var82 = 0; // L: 4458 - if (var13 != null && var81 != null) { // L: 4459 - if (var80.widthPadding * 2 < var81.subWidth) { // L: 4460 - var82 = var80.widthPadding; - } - - var15 = var81.subWidth - var82 * 2; // L: 4461 - } else { - var15 = var80.width; // L: 4463 - } - - int var17 = 255; // L: 4464 - boolean var83 = true; // L: 4465 - int var84 = Client.cycle - var79.cycle; // L: 4466 - int var85 = var15 * var79.health2 / var80.width; // L: 4467 - int var86; - int var93; - if (var79.cycleOffset > var84) { // L: 4468 - var86 = var80.field3310 == 0 ? 0 : var80.field3310 * (var84 / var80.field3310); // L: 4469 - var22 = var15 * var79.health / var80.width; // L: 4470 - var93 = var86 * (var85 - var22) / var79.cycleOffset + var22; // L: 4471 - } else { - var93 = var85; // L: 4474 - var86 = var79.cycleOffset + var80.int5 - var84; // L: 4475 - if (var80.int3 >= 0) { // L: 4476 - var17 = (var86 << 8) / (var80.int5 - var80.int3); - } - } - - if (var79.health2 > 0 && var93 < 1) { // L: 4478 - var93 = 1; - } - - if (var13 != null && var81 != null) { // L: 4479 - if (var93 == var15) { // L: 4480 - var93 += var82 * 2; - } else { - var93 += var82; // L: 4481 - } - - var86 = var13.subHeight; // L: 4482 - var76 += var86; // L: 4483 - var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4484 - var23 = var3 + Client.viewportTempY - var76; // L: 4485 - var22 -= var82; // L: 4486 - if (var17 >= 0 && var17 < 255) { // L: 4487 - var13.drawTransAt(var22, var23, var17); // L: 4488 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var86 + var23); // L: 4489 - var81.drawTransAt(var22, var23, var17); // L: 4490 - } else { - var13.drawTransBgAt(var22, var23); // L: 4493 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var23 + var86); // L: 4494 - var81.drawTransBgAt(var22, var23); // L: 4495 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4497 - var76 += 2; // L: 4498 - } else { - var76 += 5; // L: 4501 - if (Client.viewportTempX > -1) { // L: 4502 - var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4503 - var22 = var3 + Client.viewportTempY - var76; // L: 4504 - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var93, 5, 65280); // L: 4505 - Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var93, var22, var15 - var93, 5, 16711680); // L: 4506 - } - - var76 += 2; // L: 4508 - } - } - } - } - - if (var76 == -2) { // L: 4514 - var76 += 7; - } - - var76 += var8; // L: 4515 - if (var1 < var75) { // L: 4516 - Player var88 = (Player)var0; // L: 4517 - if (var88.isHidden) { // L: 4518 - return; - } - - if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 4519 - Coord.method4086(var0, var0.defaultHeight + 15); // L: 4520 - if (Client.viewportTempX > -1) { // L: 4521 - if (var88.headIconPk != -1) { // L: 4522 - var76 += 25; // L: 4523 - class279.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4524 - } - - if (var88.headIconPrayer != -1) { // L: 4526 - var76 += 25; // L: 4527 - Client.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4528 - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4532 - Coord.method4086(var0, var0.defaultHeight + 15); // L: 4533 - if (Client.viewportTempX > -1) { // L: 4534 - var76 += Varcs.headIconHintSprites[1].subHeight; // L: 4535 - Varcs.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4536 - } - } - } else { - NPCDefinition var89 = ((NPC)var0).definition; // L: 4541 - if (var89.transforms != null) { // L: 4542 - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < Client.headIconPrayerSprites.length) { // L: 4543 - Coord.method4086(var0, var0.defaultHeight + 15); // L: 4544 - if (Client.viewportTempX > -1) { // L: 4545 - Client.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4546 - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4549 - Coord.method4086(var0, var0.defaultHeight + 15); // L: 4550 - if (Client.viewportTempX > -1) { // L: 4551 - Varcs.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field986 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4554 4555 - Coord.method4086(var0, var0.defaultHeight); // L: 4556 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4557 - Client.overheadTextXOffsets[Client.overheadTextCount] = class4.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4558 - Client.overheadTextAscents[Client.overheadTextCount] = class4.fontBold12.ascent; // L: 4559 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4560 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4561 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4562 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4563 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4564 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4565 - ++Client.overheadTextCount; // L: 4566 - } - } - - for (int var77 = 0; var77 < 4; ++var77) { // L: 4570 - int var90 = var0.hitSplatCycles[var77]; // L: 4571 - int var12 = var0.hitSplatTypes[var77]; // L: 4572 - HitSplatDefinition var91 = null; // L: 4573 - int var14 = 0; // L: 4574 - if (var12 >= 0) { // L: 4575 - if (var90 <= Client.cycle) { // L: 4576 - continue; - } - - var91 = MusicPatchNode.method3929(var0.hitSplatTypes[var77]); // L: 4577 - var14 = var91.field3356; // L: 4578 - if (var91 != null && var91.transforms != null) { // L: 4579 - var91 = var91.transform(); // L: 4580 - if (var91 == null) { // L: 4581 - var0.hitSplatCycles[var77] = -1; // L: 4582 - continue; // L: 4583 - } - } - } else if (var90 < 0) { // L: 4587 - continue; - } - - var15 = var0.hitSplatTypes2[var77]; // L: 4588 - HitSplatDefinition var16 = null; // L: 4589 - if (var15 >= 0) { // L: 4590 - var16 = MusicPatchNode.method3929(var15); // L: 4591 - if (var16 != null && var16.transforms != null) { // L: 4592 - var16 = var16.transform(); - } - } - - if (var90 - var14 <= Client.cycle) { // L: 4594 - if (var91 == null) { // L: 4595 - var0.hitSplatCycles[var77] = -1; // L: 4596 - } else { - Coord.method4086(var0, var0.defaultHeight / 2); // L: 4599 - if (Client.viewportTempX > -1) { // L: 4600 - if (var77 == 1) { // L: 4602 - Client.viewportTempY -= 20; // L: 4603 - } - - if (var77 == 2) { // L: 4605 - Client.viewportTempX -= 15; // L: 4606 - Client.viewportTempY -= 10; // L: 4607 - } - - if (var77 == 3) { // L: 4609 - Client.viewportTempX += 15; // L: 4610 - Client.viewportTempY -= 10; // L: 4611 - } - - Sprite var18 = null; // L: 4613 - Sprite var19 = null; // L: 4614 - Sprite var20 = null; // L: 4615 - Sprite var21 = null; // L: 4616 - var22 = 0; // L: 4617 - var23 = 0; // L: 4618 - int var24 = 0; // L: 4619 - int var25 = 0; // L: 4620 - int var26 = 0; // L: 4621 - int var27 = 0; // L: 4622 - int var28 = 0; // L: 4623 - int var29 = 0; // L: 4624 - Sprite var30 = null; // L: 4625 - Sprite var31 = null; // L: 4626 - Sprite var32 = null; // L: 4627 - Sprite var33 = null; // L: 4628 - int var34 = 0; // L: 4629 - int var35 = 0; // L: 4630 - int var36 = 0; // L: 4631 - int var37 = 0; // L: 4632 - int var38 = 0; // L: 4633 - int var39 = 0; // L: 4634 - int var40 = 0; // L: 4635 - int var41 = 0; // L: 4636 - int var42 = 0; // L: 4637 - var18 = var91.method4668(); // L: 4638 - int var43; - if (var18 != null) { // L: 4639 - var22 = var18.subWidth; // L: 4640 - var43 = var18.subHeight; // L: 4641 - if (var43 > var42) { // L: 4642 - var42 = var43; - } - - var26 = var18.xOffset; // L: 4643 - } - - var19 = var91.method4681(); // L: 4645 - if (var19 != null) { // L: 4646 - var23 = var19.subWidth; // L: 4647 - var43 = var19.subHeight; // L: 4648 - if (var43 > var42) { // L: 4649 - var42 = var43; - } - - var27 = var19.xOffset; // L: 4650 - } - - var20 = var91.method4670(); // L: 4652 - if (var20 != null) { // L: 4653 - var24 = var20.subWidth; // L: 4654 - var43 = var20.subHeight; // L: 4655 - if (var43 > var42) { // L: 4656 - var42 = var43; - } - - var28 = var20.xOffset; // L: 4657 - } - - var21 = var91.method4678(); // L: 4659 - if (var21 != null) { // L: 4660 - var25 = var21.subWidth; // L: 4661 - var43 = var21.subHeight; // L: 4662 - if (var43 > var42) { // L: 4663 - var42 = var43; - } - - var29 = var21.xOffset; // L: 4664 - } - - if (var16 != null) { // L: 4666 - var30 = var16.method4668(); // L: 4667 - if (var30 != null) { // L: 4668 - var34 = var30.subWidth; // L: 4669 - var43 = var30.subHeight; // L: 4670 - if (var43 > var42) { // L: 4671 - var42 = var43; - } - - var38 = var30.xOffset; // L: 4672 - } - - var31 = var16.method4681(); // L: 4674 - if (var31 != null) { // L: 4675 - var35 = var31.subWidth; // L: 4676 - var43 = var31.subHeight; // L: 4677 - if (var43 > var42) { // L: 4678 - var42 = var43; - } - - var39 = var31.xOffset; // L: 4679 - } - - var32 = var16.method4670(); // L: 4681 - if (var32 != null) { // L: 4682 - var36 = var32.subWidth; // L: 4683 - var43 = var32.subHeight; // L: 4684 - if (var43 > var42) { // L: 4685 - var42 = var43; - } - - var40 = var32.xOffset; // L: 4686 - } - - var33 = var16.method4678(); // L: 4688 - if (var33 != null) { // L: 4689 - var37 = var33.subWidth; // L: 4690 - var43 = var33.subHeight; // L: 4691 - if (var43 > var42) { // L: 4692 - var42 = var43; - } - - var41 = var33.xOffset; // L: 4693 - } - } - - Font var78 = var91.getFont(); // L: 4698 - if (var78 == null) { // L: 4699 - var78 = DynamicObject.fontPlain11; - } - - Font var44; - if (var16 != null) { // L: 4700 - var44 = var16.getFont(); // L: 4701 - if (var44 == null) { // L: 4702 - var44 = DynamicObject.fontPlain11; - } - } else { - var44 = DynamicObject.fontPlain11; // L: 4704 - } - - String var45 = null; // L: 4705 - String var46 = null; // L: 4706 - boolean var47 = false; // L: 4707 - int var48 = 0; // L: 4708 - var45 = var91.getString(var0.hitSplatValues[var77]); // L: 4709 - int var92 = var78.stringWidth(var45); // L: 4710 - if (var16 != null) { // L: 4711 - var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 4712 - var48 = var44.stringWidth(var46); // L: 4713 - } - - int var49 = 0; // L: 4715 - int var50 = 0; // L: 4716 - if (var23 > 0) { // L: 4717 - if (var20 == null && var21 == null) { // L: 4718 - var49 = 1; // L: 4719 - } else { - var49 = var92 / var23 + 1; - } - } - - if (var16 != null && var35 > 0) { // L: 4721 4722 - if (var32 == null && var33 == null) { // L: 4723 - var50 = 1; // L: 4724 - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; // L: 4727 - int var52 = var51; // L: 4728 - if (var22 > 0) { // L: 4729 - var51 += var22; - } - - var51 += 2; // L: 4730 - int var53 = var51; // L: 4731 - if (var24 > 0) { // L: 4732 - var51 += var24; - } - - int var54 = var51; // L: 4733 - int var55 = var51; // L: 4734 - int var56; - if (var23 > 0) { // L: 4735 - var56 = var49 * var23; // L: 4736 - var51 += var56; // L: 4737 - var55 += (var56 - var92) / 2; // L: 4738 - } else { - var51 += var92; // L: 4741 - } - - var56 = var51; // L: 4743 - if (var25 > 0) { // L: 4744 - var51 += var25; - } - - int var57 = 0; // L: 4745 - int var58 = 0; // L: 4746 - int var59 = 0; // L: 4747 - int var60 = 0; // L: 4748 - int var61 = 0; // L: 4749 - int var62; - if (var16 != null) { // L: 4750 - var51 += 2; // L: 4751 - var57 = var51; // L: 4752 - if (var34 > 0) { - var51 += var34; // L: 4753 - } - - var51 += 2; // L: 4754 - var58 = var51; // L: 4755 - if (var36 > 0) { // L: 4756 - var51 += var36; - } - - var59 = var51; // L: 4757 - var61 = var51; // L: 4758 - if (var35 > 0) { // L: 4759 - var62 = var35 * var50; // L: 4760 - var51 += var62; // L: 4761 - var61 += (var62 - var48) / 2; // L: 4762 - } else { - var51 += var48; // L: 4765 - } - - var60 = var51; // L: 4767 - if (var37 > 0) { // L: 4768 - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 4770 - int var63 = var91.field3368 - var62 * var91.field3368 / var91.field3356; // L: 4771 - int var64 = var62 * var91.field3362 / var91.field3356 + -var91.field3362; // L: 4772 - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 4773 - int var66 = var3 + Client.viewportTempY - 12 + var64; // L: 4774 - int var67 = var66; // L: 4775 - int var68 = var66 + var42; // L: 4776 - int var69 = var66 + var91.field3366 + 15; // L: 4777 - int var70 = var69 - var78.maxAscent; // L: 4778 - int var71 = var69 + var78.maxDescent; // L: 4779 - if (var70 < var66) { // L: 4780 - var67 = var70; - } - - if (var71 > var68) { // L: 4781 - var68 = var71; - } - - int var72 = 0; // L: 4782 - int var73; - int var74; - if (var16 != null) { // L: 4783 - var72 = var66 + var16.field3366 + 15; // L: 4784 - var73 = var72 - var44.maxAscent; // L: 4785 - var74 = var72 + var44.maxDescent; // L: 4786 - if (var73 < var67) { // L: 4787 - ; - } - - if (var74 > var68) { // L: 4788 - ; - } - } - - var73 = 255; // L: 4790 - if (var91.field3355 >= 0) { // L: 4791 - var73 = (var62 << 8) / (var91.field3356 - var91.field3355); - } - - if (var73 >= 0 && var73 < 255) { // L: 4792 - if (var18 != null) { // L: 4793 - var18.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var20 != null) { // L: 4794 - var20.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var19 != null) { // L: 4795 - for (var74 = 0; var74 < var49; ++var74) { // L: 4796 - var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 4797 - } - } - - if (var21 != null) { // L: 4800 - var21.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var78.drawAlpha(var45, var65 + var55, var69, var91.textColor, 0, var73); // L: 4801 - if (var16 != null) { // L: 4802 - if (var30 != null) { // L: 4803 - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { // L: 4804 - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { // L: 4805 - for (var74 = 0; var74 < var50; ++var74) { // L: 4806 - var31.drawTransAt(var35 * var74 + (var65 + var59 - var39), var66, var73); // L: 4807 - } - } - - if (var33 != null) { // L: 4810 - var33.drawTransAt(var60 + var65 - var41, var66, var73); - } - - var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 4811 - } - } else { - if (var18 != null) { // L: 4815 - var18.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var20 != null) { // L: 4816 - var20.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var19 != null) { // L: 4817 - for (var74 = 0; var74 < var49; ++var74) { // L: 4818 - var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 4819 - } - } - - if (var21 != null) { // L: 4822 - var21.drawTransBgAt(var56 + var65 - var29, var66); - } - - var78.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); // L: 4823 - if (var16 != null) { // L: 4824 - if (var30 != null) { // L: 4825 - var30.drawTransBgAt(var65 + var57 - var38, var66); - } - - if (var32 != null) { // L: 4826 - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { // L: 4827 - for (var74 = 0; var74 < var50; ++var74) { // L: 4828 - var31.drawTransBgAt(var74 * var35 + (var59 + var65 - var39), var66); // L: 4829 - } - } - - if (var33 != null) { // L: 4832 - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 4833 - } - } - } - } - } - } - } - } // L: 4838 - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(Lhq;II)I", - garbageValue = "1175033265" - ) - static final int method230(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 9351 - try { - int[] var2 = var0.cs1Instructions[var1]; // L: 9353 - int var3 = 0; // L: 9354 - int var4 = 0; // L: 9355 - byte var5 = 0; // L: 9356 - - while (true) { - int var6 = var2[var4++]; // L: 9358 - int var7 = 0; // L: 9359 - byte var8 = 0; // L: 9360 - if (var6 == 0) { // L: 9361 - return var3; - } - - if (var6 == 1) { // L: 9362 - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { // L: 9363 - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { // L: 9364 - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { // L: 9365 - var9 = var2[var4++] << 16; // L: 9366 - var9 += var2[var4++]; // L: 9367 - var10 = TileItem.getWidget(var9); // L: 9368 - var11 = var2[var4++]; // L: 9369 - if (var11 != -1 && (!GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9370 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9371 - if (var11 + 1 == var10.itemIds[var12]) { // L: 9372 - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { // L: 9376 - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { // L: 9377 - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { // L: 9378 - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { // L: 9379 - var7 = WorldMapLabelSize.localPlayer.combatLevel; - } - - if (var6 == 9) { // L: 9380 - for (var9 = 0; var9 < 25; ++var9) { // L: 9381 - if (Skills.Skills_enabled[var9]) { // L: 9382 - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { // L: 9385 - var9 = var2[var4++] << 16; // L: 9386 - var9 += var2[var4++]; // L: 9387 - var10 = TileItem.getWidget(var9); // L: 9388 - var11 = var2[var4++]; // L: 9389 - if (var11 != -1 && (!GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9390 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9391 - if (var11 + 1 == var10.itemIds[var12]) { // L: 9392 - var7 = 999999999; // L: 9393 - break; // L: 9394 - } - } - } - } - - if (var6 == 11) { // L: 9399 - var7 = Client.runEnergy; - } - - if (var6 == 12) { // L: 9400 - var7 = Client.weight; - } - - if (var6 == 13) { // L: 9401 - var9 = Varps.Varps_main[var2[var4++]]; // L: 9402 - int var13 = var2[var4++]; // L: 9403 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 9404 - } - - if (var6 == 14) { // L: 9406 - var9 = var2[var4++]; // L: 9407 - var7 = WorldMapSection1.getVarbit(var9); // L: 9408 - } - - if (var6 == 15) { // L: 9410 - var8 = 1; - } - - if (var6 == 16) { // L: 9411 - var8 = 2; - } - - if (var6 == 17) { // L: 9412 - var8 = 3; - } - - if (var6 == 18) { // L: 9413 - var7 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; - } - - if (var6 == 19) { // L: 9414 - var7 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; - } - - if (var6 == 20) { // L: 9415 - var7 = var2[var4++]; - } - - if (var8 == 0) { // L: 9416 - if (var5 == 0) { // L: 9417 - var3 += var7; - } - - if (var5 == 1) { // L: 9418 - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { // L: 9419 - var3 /= var7; - } - - if (var5 == 3) { // L: 9420 - var3 *= var7; - } - - var5 = 0; // L: 9421 - } else { - var5 = var8; // L: 9423 - } - } - } catch (Exception var14) { // L: 9426 - return -1; // L: 9427 - } - } else { - return -2; - } - } + } // L: 4875 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 84d1305935..1a6e83262c 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,303 +1,84 @@ 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("bt") +@ObfuscatedName("bu") +@Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("z") + @ObfuscatedName("t") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("lq") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + static Widget field677; + @ObfuscatedName("f") + @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 10950 + } // L: 11739 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lf;Lf;I)I", - garbageValue = "960814637" + descriptor = "(Ly;Ly;B)I", + garbageValue = "22" ) + @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 10953 + if (var2.world == var1.world) { // L: 11742 return 0; } else { - if (this.filterWorlds) { // L: 10954 - if (Client.worldId == var1.world) { // L: 10955 + if (this.filterWorlds) { // L: 11743 + if (Client.worldId == var1.world) { // L: 11744 return -1; } - if (var2.world == Client.worldId) { // L: 10956 + if (var2.world == Client.worldId) { // L: 11745 return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 10958 + return var1.world < var2.world ? -1 : 1; // L: 11747 } } public boolean equals(Object var1) { - return super.equals(var1); // L: 10966 + return super.equals(var1); // L: 11755 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 10962 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11751 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1772140785" + descriptor = "(IIIZIB)J", + garbageValue = "14" ) - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 68 - if (var1 == null) { // L: 69 - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 70 71 + @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; // L: 72 + if (var3) { // L: 73 + var5 |= 65536L; } + + return var5; // L: 74 } - @ObfuscatedName("h") + @ObfuscatedName("jg") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "27" + descriptor = "(Lht;I)V", + garbageValue = "1071185333" ) - static final int method1334(int var0, int var1) { - int var2 = var1 * 57 + var0; // L: 856 - var2 ^= var2 << 13; // L: 857 - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 858 - return var3 >> 19 & 255; // L: 859 - } - - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "18134" - ) - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 3990 - if (WorldMapLabelSize.localPlayer.x >> 7 == Client.destinationX && WorldMapLabelSize.localPlayer.y >> 7 == Client.destinationY) { // L: 3992 - Client.destinationX = 0; // L: 3993 + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field748) { // L: 11029 + Client.field834[var0.rootIndex] = true; // L: 11030 } - GrandExchangeOffer.method206(); // L: 3996 - Tiles.method1177(); // L: 3997 - CollisionMap.addNpcsToScene(true); // L: 3998 - int var4 = Players.Players_count; // L: 4000 - int[] var5 = Players.Players_indices; // L: 4001 - - int var6; - for (var6 = 0; var6 < var4; ++var6) { // L: 4002 - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4003 - VarpDefinition.addPlayerToScene(Client.players[var5[var6]], true); // L: 4004 - } - } - - CollisionMap.addNpcsToScene(false); // L: 4007 - Login.method2160(); // L: 4008 - - for (GraphicsObject var21 = (GraphicsObject)Client.graphicsObjects.last(); var21 != null; var21 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4010 4011 4018 - if (var21.plane == Huffman.Client_plane && !var21.isFinished) { // L: 4012 - if (Client.cycle >= var21.cycleStart) { // L: 4013 - var21.advance(Client.field737); // L: 4014 - if (var21.isFinished) { // L: 4015 - var21.remove(); - } else { - ScriptEvent.scene.drawEntity(var21.plane, var21.x, var21.y, var21.height, 60, var21, 0, -1L, false); // L: 4016 - } - } - } else { - var21.remove(); - } - } - - class231.setViewportShape(var0, var1, var2, var3, true); // L: 4021 - var0 = Client.viewportOffsetX; // L: 4022 - var1 = Client.viewportOffsetY; // L: 4023 - var2 = Client.viewportWidth; // L: 4024 - var3 = Client.viewportHeight; // L: 4025 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4026 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4027 - int var7; - int var8; - int var9; - int var11; - int var12; - int var13; - int var14; - int var22; - if (!Client.isCameraLocked) { // L: 4028 - var4 = Client.camAngleX; // L: 4029 - if (Client.field762 / 256 > var4) { // L: 4030 - var4 = Client.field762 / 256; - } - - if (Client.field922[4] && Client.field740[4] + 128 > var4) { // L: 4031 - var4 = Client.field740[4] + 128; - } - - var22 = Client.camAngleY & 2047; // L: 4032 - var6 = GrandExchangeOfferWorldComparator.oculusOrbFocalPointX; // L: 4033 - var7 = class7.field40; // L: 4034 - var8 = MouseHandler.oculusOrbFocalPointY; // L: 4035 - var9 = var4 * 3 + 600; // L: 4038 - var12 = var3 - 334; // L: 4044 - if (var12 < 0) { // L: 4045 - var12 = 0; - } else if (var12 > 100) { // L: 4046 - var12 = 100; - } - - var13 = (Client.zoomWidth - Client.zoomHeight) * var12 / 100 + Client.zoomHeight; // L: 4047 - var11 = var9 * var13 / 256; // L: 4048 - var12 = 2048 - var4 & 2047; // L: 4051 - var13 = 2048 - var22 & 2047; // L: 4052 - var14 = 0; // L: 4053 - int var15 = 0; // L: 4054 - int var16 = var11; // L: 4055 - int var17; - int var18; - int var19; - if (var12 != 0) { // L: 4056 - var17 = Rasterizer3D.Rasterizer3D_sine[var12]; // L: 4057 - var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; // L: 4058 - var19 = var18 * var15 - var11 * var17 >> 16; // L: 4059 - var16 = var11 * var18 + var15 * var17 >> 16; // L: 4060 - var15 = var19; // L: 4061 - } - - if (var13 != 0) { // L: 4063 - var17 = Rasterizer3D.Rasterizer3D_sine[var13]; // L: 4064 - var18 = Rasterizer3D.Rasterizer3D_cosine[var13]; // L: 4065 - var19 = var14 * var18 + var17 * var16 >> 16; // L: 4066 - var16 = var16 * var18 - var17 * var14 >> 16; // L: 4067 - var14 = var19; // L: 4068 - } - - VertexNormal.cameraX = var6 - var14; // L: 4070 - FaceNormal.cameraY = var7 - var15; // L: 4071 - AbstractWorldMapData.cameraZ = var8 - var16; // L: 4072 - PacketBuffer.cameraPitch = var4; // L: 4073 - ServerPacket.cameraYaw = var22; // L: 4074 - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7 != WorldMapLabelSize.localPlayer.x >> 7 || MouseHandler.oculusOrbFocalPointY >> 7 != WorldMapLabelSize.localPlayer.y >> 7)) { // L: 4075 4076 - var17 = WorldMapLabelSize.localPlayer.plane; // L: 4077 - var18 = (GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7) + WorldMapManager.baseX; // L: 4078 - var19 = (MouseHandler.oculusOrbFocalPointY >> 7) + WorldMapLabel.baseY; // L: 4079 - PacketBufferNode var20 = Client.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); // L: 4082 - var20.packetBuffer.writeShort(var19); // L: 4083 - var20.packetBuffer.method5662(Client.field758); // L: 4084 - var20.packetBuffer.writeShort(var18); // L: 4085 - var20.packetBuffer.method5644(var17); // L: 4086 - Client.packetWriter.addNode(var20); // L: 4087 - } - } - - if (!Client.isCameraLocked) { // L: 4094 - var4 = class9.method111(); - } else { - var4 = class22.method244(); // L: 4095 - } - - var22 = VertexNormal.cameraX; // L: 4096 - var6 = FaceNormal.cameraY; // L: 4097 - var7 = AbstractWorldMapData.cameraZ; // L: 4098 - var8 = PacketBuffer.cameraPitch; // L: 4099 - var9 = ServerPacket.cameraYaw; // L: 4100 - - int var10; - for (var10 = 0; var10 < 5; ++var10) { // L: 4101 - if (Client.field922[var10]) { // L: 4102 - var11 = (int)(Math.random() * (double)(Client.field678[var10] * 2 + 1) - (double)Client.field678[var10] + Math.sin((double)Client.field926[var10] * ((double)Client.field925[var10] / 100.0D)) * (double)Client.field740[var10]); // L: 4103 - if (var10 == 0) { // L: 4104 - VertexNormal.cameraX += var11; - } - - if (var10 == 1) { // L: 4105 - FaceNormal.cameraY += var11; - } - - if (var10 == 2) { // L: 4106 - AbstractWorldMapData.cameraZ += var11; - } - - if (var10 == 3) { // L: 4107 - ServerPacket.cameraYaw = var11 + ServerPacket.cameraYaw & 2047; - } - - if (var10 == 4) { // L: 4108 - PacketBuffer.cameraPitch += var11; // L: 4109 - if (PacketBuffer.cameraPitch < 128) { // L: 4110 - PacketBuffer.cameraPitch = 128; - } - - if (PacketBuffer.cameraPitch > 383) { // L: 4111 - PacketBuffer.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; // L: 4115 - var11 = MouseHandler.MouseHandler_y; // L: 4116 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4117 - var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4118 - var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4119 - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4121 - class299.method5393(var10 - var0, var11 - var1); // L: 4122 - } else { - class92.method2142(); // L: 4125 - } - - RouteStrategy.playPcmPlayers(); // L: 4127 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4128 - RouteStrategy.playPcmPlayers(); // L: 4129 - var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4130 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4131 - ScriptEvent.scene.draw(VertexNormal.cameraX, FaceNormal.cameraY, AbstractWorldMapData.cameraZ, PacketBuffer.cameraPitch, ServerPacket.cameraYaw, var4); // L: 4132 - Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4133 - RouteStrategy.playPcmPlayers(); // L: 4134 - ScriptEvent.scene.clearTempGameObjects(); // L: 4135 - WorldMapID.method616(var0, var1, var2, var3); // L: 4136 - if (Client.hintArrowType == 2) { // L: 4138 - class89.worldToScreen((Client.hintArrowX - WorldMapManager.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - WorldMapLabel.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4139 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4140 - Varcs.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field737); // L: 4142 - Client.field790 = 0; // L: 4145 - var13 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 4146 - var14 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 4147 - if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { // L: 4148 - Client.field790 = 1; - } - - if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { // L: 4149 - Client.field790 = 1; - } - - if (Client.field790 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { // L: 4150 - Client.field790 = 0; - } - - VertexNormal.cameraX = var22; // L: 4153 - FaceNormal.cameraY = var6; // L: 4154 - AbstractWorldMapData.cameraZ = var7; // L: 4155 - PacketBuffer.cameraPitch = var8; // L: 4156 - ServerPacket.cameraYaw = var9; // L: 4157 - if (Client.isLoading) { // L: 4158 - byte var23 = 0; // L: 4161 - var14 = var23 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 4162 - if (var14 == 0) { // L: 4166 - Client.isLoading = false; - } - } - - if (Client.isLoading) { // L: 4168 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4169 - Actor.drawLoadingMessage("Loading - please wait.", false); // L: 4170 - } - - } // L: 4172 + } // L: 11032 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 67efecd14f..8884a9a4f5 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,202 +1,90 @@ 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("y") +@ObfuscatedName("s") +@Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "[Lls;" + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -343674237 ) - static IndexedSprite[] runesSprite; - @ObfuscatedName("g") - public static short[] field83; + static int field81; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lf;Lf;I)I", - garbageValue = "1171850991" + descriptor = "(Ly;Ly;I)I", + garbageValue = "-2113100809" ) + @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); // L: 69 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 77 - } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("z") + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "666077913" + garbageValue = "280235874" ) - static int method172(int var0, int var1) { - if (var0 == -2) { // L: 15 - return 12345678; - } else if (var0 == -1) { // L: 16 - if (var1 < 0) { - var1 = 0; // L: 18 - } else if (var1 > 127) { // L: 20 - var1 = 127; // L: 21 - } - - var1 = 127 - var1; // L: 23 - return var1; // L: 24 + static int method183(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; } else { - var1 = (var0 & 127) * var1 / 128; // L: 26 - if (var1 < 2) { // L: 27 - var1 = 2; - } else if (var1 > 126) { // L: 28 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 29 + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 } } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Ljq;", - garbageValue = "5" + descriptor = "(B)Z", + garbageValue = "43" ) - public static ItemDefinition ItemDefinition_get(int var0) { - ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); // L: 92 - if (var1 != null) { // L: 93 - return var1; - } else { - byte[] var2 = class231.ItemDefinition_archive.takeFile(10, var0); // L: 94 - var1 = new ItemDefinition(); // L: 95 - var1.id = var0; // L: 96 - if (var2 != null) { // L: 97 - var1.decode(new Buffer(var2)); - } - - var1.post(); // L: 98 - if (var1.noteTemplate != -1) { // L: 99 - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { // L: 100 - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { // L: 101 - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!ItemDefinition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 - var1.name = "Members object"; // L: 103 - var1.isTradable = false; // L: 104 - var1.groundActions = null; // L: 105 - var1.inventoryActions = null; // L: 106 - var1.shiftClickIndex = -1; // L: 107 - var1.team = 0; // L: 108 - if (var1.params != null) { // L: 109 - boolean var3 = false; // L: 110 - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111 - ParamDefinition var5 = PlayerAppearance.getParamDefinition((int)var4.key); // L: 112 - if (var5.autoDisable) { // L: 113 - var4.remove(); - } else { - var3 = true; // L: 114 - } - } - - if (!var3) { // L: 116 - var1.params = null; - } - } - } - - ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); // L: 119 - return var1; // L: 120 - } - } - - @ObfuscatedName("k") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 34 - if (var0 % 37L == 0L) { // L: 35 - return null; - } else { - int var2 = 0; // L: 36 - - for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 37 38 40 - ++var2; // L: 39 - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 42 43 - long var6 = var0; // L: 44 - var0 /= 37L; // L: 45 - var8 = class298.base37Table[(int)(var6 - var0 * 37L)]; // L: 46 - if (var8 == '_') { // L: 47 - int var9 = var5.length() - 1; // L: 48 - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 49 - var8 = 160; // L: 50 + public static boolean method174() { + try { + if (class206.musicPlayerStatus == 2) { // L: 71 + if (InterfaceParent.musicTrack == null) { // L: 72 + InterfaceParent.musicTrack = MusicTrack.readTrack(class23.musicTrackArchive, TileItem.musicTrackGroupId, class206.musicTrackFileId); // L: 73 + if (InterfaceParent.musicTrack == null) { // L: 74 + return false; } } - var5.reverse(); // L: 54 - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 55 - return var5.toString(); + if (LoginType.soundCache == null) { // L: 76 + LoginType.soundCache = new SoundCache(class206.soundEffectsArchive, class206.musicSamplesArchive); + } + + if (class13.midiPcmStream.loadMusicTrack(InterfaceParent.musicTrack, class206.musicPatchesArchive, LoginType.soundCache, 22050)) { // L: 77 + class13.midiPcmStream.clearAll(); // L: 78 + class13.midiPcmStream.setPcmStreamVolume(class206.musicTrackVolume); // L: 79 + class13.midiPcmStream.setMusicTrack(InterfaceParent.musicTrack, class195.musicTrackBoolean); // L: 80 + class206.musicPlayerStatus = 0; // L: 81 + InterfaceParent.musicTrack = null; // L: 82 + LoginType.soundCache = null; // L: 83 + class23.musicTrackArchive = null; // L: 84 + return true; // L: 85 + } } - } else { - return null; - } - } - - @ObfuscatedName("k") - public static boolean method173(long var0) { - boolean var2 = 0L != var0; // L: 52 - if (var2) { // L: 53 - boolean var3 = (int)(var0 >>> 16 & 1L) == 1; // L: 56 - var2 = !var3; // L: 58 + } catch (Exception var1) { // L: 89 + var1.printStackTrace(); // L: 90 + class13.midiPcmStream.clear(); // L: 91 + class206.musicPlayerStatus = 0; // L: 92 + InterfaceParent.musicTrack = null; // L: 93 + LoginType.soundCache = null; // L: 94 + class23.musicTrackArchive = null; // L: 95 } - return var2; // L: 60 + return false; // L: 97 } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2133866985" - ) - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 17 - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "1811677104" - ) - public static int parseInt(CharSequence var0) { - return UserComparator7.parseIntCustomRadix(var0, 10, true); // L: 67 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2132548468" - ) - static void method169() { - Login.loginIndex = 24; // L: 1745 - UrlRequester.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1746 - } // L: 1747 - - @ObfuscatedName("ho") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2070536842" - ) - static void method164() { - WorldMapSprite.method493(DevicePcmPlayerProvider.menuWidth / 2 + ChatChannel.menuX, Client.menuY); // L: 7205 - } // L: 7206 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 3aa0f7b12c..788815a95b 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,26 +1,26 @@ 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("j") +@ObfuscatedName("w") +@Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive4; - @ObfuscatedName("mr") + @ObfuscatedName("kt") @ObfuscatedGetter( - intValue = 401783773 + intValue = 2060435919 ) - static int selectedItemSlot; + @Export("Client_plane") + static int Client_plane; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lf;Lf;I)I", - garbageValue = "1888921269" + descriptor = "(Ly;Ly;S)I", + garbageValue = "-21475" ) + @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43 } @@ -33,30 +33,57 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { return super.equals(var1); // L: 51 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lmu;B)I", - garbageValue = "1" + descriptor = "([BILjava/lang/CharSequence;I)I", + garbageValue = "2085161041" ) - public static final int method211(LoginType var0) { - if (var0 == null) { // L: 16 - return 12; // L: 17 - } else { - switch(var0.field4063) { // L: 19 - case 7: - return 20; // L: 23 - default: - return 12; // L: 21 + public static int method219(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); // L: 9 + int var4 = var1; // L: 10 + + for (int var5 = 0; var5 < var3; ++var5) { // L: 11 + char var6 = var2.charAt(var5); // L: 12 + if (var6 <= 127) { // L: 13 + var0[var4++] = (byte)var6; // L: 14 + } else if (var6 <= 2047) { // L: 16 + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 21 + var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 22 + var0[var4++] = (byte)(128 | var6 & '?'); // L: 23 } } + + return var4 - var1; // L: 26 } - @ObfuscatedName("km") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhq;I)Z", - garbageValue = "798311981" + descriptor = "(Liw;B)V", + garbageValue = "1" ) - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 10732 + public static void method211(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; // L: 17 + } // L: 18 + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "-56" + ) + static String method218(String var0) { + PlayerType[] var1 = WorldMapLabelSize.PlayerType_values(); // L: 11676 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11677 + PlayerType var3 = var1[var2]; // L: 11678 + if (var3.modIcon != -1 && var0.startsWith(PrivateChatMode.method6034(var3.modIcon))) { // L: 11680 11681 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11682 + break; + } + } + + return var0; // L: 11689 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 7c8ffe25a6..93a8e4314c 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,27 +1,30 @@ import java.util.Comparator; -import net.runelite.mapping.ObfuscatedGetter; +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("q") +@ObfuscatedName("p") +@Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("hn") + @ObfuscatedName("sj") @ObfuscatedSignature( - descriptor = "[Lls;" + descriptor = "Llt;" ) - static IndexedSprite[] modIconSprites; - @ObfuscatedName("im") - @ObfuscatedGetter( - intValue = -1435460859 + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lik;" ) - static int oculusOrbFocalPointX; + static StudioGame field58; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lf;Lf;I)I", - garbageValue = "-1922470" + descriptor = "(Ly;Ly;B)I", + garbageValue = "15" ) + @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28 } @@ -34,730 +37,28 @@ final class GrandExchangeOfferWorldComparator implements Comparator { return super.equals(var1); // L: 36 } - @ObfuscatedName("w") + @ObfuscatedName("gb") @ObfuscatedSignature( - descriptor = "(IIIIIILec;Lft;B)V", - garbageValue = "-56" + descriptor = "(IIII)I", + garbageValue = "-297483438" ) - static final void method137(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) { // L: 236 237 238 - if (var0 < Tiles.Tiles_minPlane) { // L: 241 - Tiles.Tiles_minPlane = var0; + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 5423 + int var4 = var1 >> 7; // L: 5424 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5425 + int var5 = var2; // L: 5426 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5427 + var5 = var2 + 1; } - ObjectDefinition var8 = MidiPcmStream.getObjectDefinition(var3); // L: 242 - int var9; - int var10; - if (var4 != 1 && var4 != 3) { // L: 245 - var9 = var8.sizeX; // L: 250 - var10 = var8.sizeY; // L: 251 - } else { - var9 = var8.sizeY; // L: 246 - var10 = var8.sizeX; // L: 247 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 257 - var11 = (var9 >> 1) + var1; // L: 258 - var12 = (var9 + 1 >> 1) + var1; // L: 259 - } else { - var11 = var1; // L: 262 - var12 = var1 + 1; // L: 263 - } - - int var13; - int var14; - if (var10 + var2 <= 104) { // L: 265 - var13 = (var10 >> 1) + var2; // L: 266 - var14 = var2 + (var10 + 1 >> 1); // L: 267 - } else { - var13 = var2; // L: 270 - var14 = var2 + 1; // L: 271 - } - - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 273 - int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 274 - int var17 = (var1 << 7) + (var9 << 6); // L: 275 - int var18 = (var2 << 7) + (var10 << 6); // L: 276 - long var19 = class227.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 277 - int var21 = var5 + (var4 << 6); // L: 278 - if (var8.int3 == 1) { // L: 279 - var21 += 256; - } - - if (var8.hasSound()) { // L: 280 - class280.method5093(var0, var1, var2, var8, var4); - } - - Object var29; - if (var5 == 22) { // L: 281 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 282 - if (var8.animationId == -1 && var8.transforms == null) { // L: 284 - var29 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 285 - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var29, var19, var21); // L: 286 - if (var8.interactType == 1 && var7 != null) { // L: 287 - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var28; - if (var5 != 10 && var5 != 11) { // L: 290 - int[] var10000; - if (var5 >= 12) { // L: 311 - if (var8.animationId == -1 && var8.transforms == null) { // L: 313 - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 314 - } - - var6.method3263(var0, var1, var2, var16, 1, 1, (Entity)var29, 0, var19, var21); // L: 315 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 316 - var10000 = class204.field2421[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { // L: 317 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { // L: 320 - if (var8.animationId == -1 && var8.transforms == null) { // L: 322 - var29 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 323 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field524[var4], 0, var19, var21); // L: 324 - if (var4 == 0) { // L: 325 - if (var8.clipped) { // L: 326 - class22.field122[var0][var1][var2] = 50; // L: 327 - class22.field122[var0][var1][var2 + 1] = 50; // L: 328 - } - - if (var8.modelClipped) { // L: 330 - var10000 = class204.field2421[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { // L: 332 - if (var8.clipped) { // L: 333 - class22.field122[var0][var1][var2 + 1] = 50; // L: 334 - class22.field122[var0][var1 + 1][var2 + 1] = 50; // L: 335 - } - - if (var8.modelClipped) { // L: 337 - var10000 = class204.field2421[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { // L: 339 - if (var8.clipped) { // L: 340 - class22.field122[var0][var1 + 1][var2] = 50; // L: 341 - class22.field122[var0][var1 + 1][var2 + 1] = 50; // L: 342 - } - - if (var8.modelClipped) { // L: 344 - var10000 = class204.field2421[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { // L: 346 - if (var8.clipped) { // L: 347 - class22.field122[var0][var1][var2] = 50; // L: 348 - class22.field122[var0][var1 + 1][var2] = 50; // L: 349 - } - - if (var8.modelClipped) { // L: 351 - var10000 = class204.field2421[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 353 - var7.method3630(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 354 - var6.method3204(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { // L: 357 - if (var8.animationId == -1 && var8.transforms == null) { // L: 359 - var29 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 360 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field525[var4], 0, var19, var21); // L: 361 - if (var8.clipped) { // L: 362 - if (var4 == 0) { - class22.field122[var0][var1][var2 + 1] = 50; // L: 363 - } else if (var4 == 1) { // L: 364 - class22.field122[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 365 - class22.field122[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 366 - class22.field122[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 368 - var7.method3630(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var22; - if (var5 == 2) { // L: 371 - var22 = var4 + 1 & 3; // L: 372 - Object var24; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { // L: 375 - var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 376 - var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 377 - } else { - var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 380 - var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 381 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var30, (Entity)var24, Tiles.field524[var4], Tiles.field524[var22], var19, var21); // L: 383 - if (var8.modelClipped) { // L: 384 - if (var4 == 0) { // L: 385 - var10000 = class204.field2421[var0][var1]; // L: 386 - var10000[var2] |= 585; - var10000 = class204.field2421[var0][var1]; // L: 387 - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { // L: 389 - var10000 = class204.field2421[var0][var1]; // L: 390 - var10000[1 + var2] |= 1170; - var10000 = class204.field2421[var0][var1 + 1]; // L: 391 - var10000[var2] |= 585; - } else if (var4 == 2) { // L: 393 - var10000 = class204.field2421[var0][var1 + 1]; // L: 394 - var10000[var2] |= 585; - var10000 = class204.field2421[var0][var1]; // L: 395 - var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 397 - var10000 = class204.field2421[var0][var1]; // L: 398 - var10000[var2] |= 1170; - var10000 = class204.field2421[var0][var1]; // L: 399 - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 402 - var7.method3630(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 403 - var6.method3204(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { // L: 406 - if (var8.animationId == -1 && var8.transforms == null) { // L: 408 - var29 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 409 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field525[var4], 0, var19, var21); // L: 410 - if (var8.clipped) { // L: 411 - if (var4 == 0) { // L: 412 - class22.field122[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 413 - class22.field122[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 414 - class22.field122[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 415 - class22.field122[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 417 - var7.method3630(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { // L: 420 - if (var8.animationId == -1 && var8.transforms == null) { // L: 422 - var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 423 - } - - var6.method3263(var0, var1, var2, var16, 1, 1, (Entity)var29, 0, var19, var21); // L: 424 - if (var8.interactType != 0 && var7 != null) { // L: 425 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 426 - var6.method3204(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { // L: 429 - if (var8.animationId == -1 && var8.transforms == null) { // L: 431 - var29 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 432 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field524[var4], 0, 0, 0, var19, var21); // L: 433 - } else { - long var23; - Object var25; - if (var5 == 5) { // L: 436 - var22 = 16; // L: 437 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 438 - if (0L != var23) { // L: 439 - var22 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var23)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 441 - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 442 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, Tiles.field524[var4], 0, var22 * Tiles.field517[var4], var22 * Tiles.field527[var4], var19, var21); // L: 443 - } else if (var5 == 6) { // L: 446 - var22 = 8; // L: 447 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 448 - if (var23 != 0L) { // L: 449 - var22 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var23)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 451 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 452 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, 256, var4, var22 * Tiles.field534[var4], var22 * Tiles.field529[var4], var19, var21); // L: 453 - } else if (var5 == 7) { // L: 456 - var28 = var4 + 2 & 3; // L: 458 - if (var8.animationId == -1 && var8.transforms == null) { // L: 459 - var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 460 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var29, (Entity)null, 256, var28, 0, 0, var19, var21); // L: 461 - } else if (var5 == 8) { // L: 464 - var22 = 8; // L: 465 - var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 466 - if (var23 != 0L) { // L: 467 - var22 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var23)).int2 / 2; - } - - int var27 = var4 + 2 & 3; // L: 470 - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 471 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 472 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 473 - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 476 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 477 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)var26, 256, var4, var22 * Tiles.field534[var4], var22 * Tiles.field529[var4], var19, var21); // L: 479 - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 292 - var29 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 293 - } - - if (var29 != null && var6.method3263(var0, var1, var2, var16, var9, var10, (Entity)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 294 295 - var28 = 15; // L: 296 - if (var29 instanceof Model) { // L: 297 - var28 = ((Model)var29).method3016() / 4; // L: 298 - if (var28 > 30) { // L: 299 - var28 = 30; - } - } - - for (int var31 = 0; var31 <= var9; ++var31) { // L: 301 - for (int var32 = 0; var32 <= var10; ++var32) { // L: 302 - if (var28 > class22.field122[var0][var31 + var1][var32 + var2]) { // L: 303 - class22.field122[var0][var31 + var1][var32 + var2] = (byte)var28; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 308 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } - } // L: 288 309 318 355 369 404 418 427 434 444 454 462 480 482 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "-107" - ) - static int method141(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1306 - var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1307 - WorldMapRectangle.addGameMessage(0, "", var7); // L: 1308 - return 1; // L: 1309 - } else if (var0 == ScriptOpcodes.ANIM) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1312 - GrandExchangeOfferNameComparator.performPlayerAnimation(WorldMapLabelSize.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1313 - return 1; // L: 1314 - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1132) { // L: 1317 - Interpreter.field1131 = true; // L: 1318 - } - - return 1; // L: 1320 + int var6 = var0 & 127; // L: 5428 + int var7 = var1 & 127; // L: 5429 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 5430 + int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5431 + return var8 * (128 - var7) + var7 * var9 >> 7; // L: 5432 } else { - int var15; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1323 - var15 = 0; // L: 1324 - if (World.isNumber(var7)) { // L: 1325 - var15 = GrandExchangeOfferTotalQuantityComparator.parseInt(var7); - } - - PacketBufferNode var13 = Client.getPacketBufferNode(ClientPacket.field2332, Client.packetWriter.isaacCipher); // L: 1327 - var13.packetBuffer.writeInt(var15); // L: 1328 - Client.packetWriter.addNode(var13); // L: 1329 - return 1; // L: 1330 - } else { - PacketBufferNode var11; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1333 - var11 = Client.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 1335 - var11.packetBuffer.writeByte(var7.length() + 1); // L: 1336 - var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1337 - Client.packetWriter.addNode(var11); // L: 1338 - return 1; // L: 1339 - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1342 - var11 = Client.getPacketBufferNode(ClientPacket.field2339, Client.packetWriter.isaacCipher); // L: 1344 - var11.packetBuffer.writeByte(var7.length() + 1); // L: 1345 - var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1346 - Client.packetWriter.addNode(var11); // L: 1347 - return 1; // L: 1348 - } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1351 - var4 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1352 - Archive.method4383(var10, var4); // L: 1353 - return 1; // L: 1354 - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 3; // L: 1357 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1358 - var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1359 - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1360 - Widget var14 = TileItem.getWidget(var9); // L: 1361 - class13.clickWidget(var14, var10, var15); // L: 1362 - return 1; // L: 1363 - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1366 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1367 - var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1368 - Widget var12 = var2 ? Canvas.field438 : class3.field12; // L: 1369 - class13.clickWidget(var12, var10, var15); // L: 1370 - return 1; // L: 1371 - } else if (var0 == ScriptOpcodes.MOUSECAM) { - ScriptEvent.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1374 - return 1; // L: 1375 - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.roofsHidden ? 1 : 0; // L: 1378 - return 1; // L: 1379 - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - Tile.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1382 - WorldMapData_1.savePreferences(); // L: 1383 - return 1; // L: 1384 - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1387 - boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1388 - class280.openURL(var7, var8, false); // L: 1389 - return 1; // L: 1390 - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1393 - var11 = Client.getPacketBufferNode(ClientPacket.field2338, Client.packetWriter.isaacCipher); // L: 1395 - var11.packetBuffer.writeShort(var10); // L: 1396 - Client.packetWriter.addNode(var11); // L: 1397 - return 1; // L: 1398 - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1401 - Varps.Interpreter_stringStackSize -= 2; // L: 1402 - var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 1403 - String var5 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 1404 - if (var4.length() > 500) { // L: 1405 - return 1; - } else if (var5.length() > 500) { // L: 1406 - return 1; - } else { - PacketBufferNode var6 = Client.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); // L: 1407 - var6.packetBuffer.writeShort(1 + Decimator.stringCp1252NullTerminatedByteSize(var4) + Decimator.stringCp1252NullTerminatedByteSize(var5)); // L: 1408 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1409 - var6.packetBuffer.method5645(var10); // L: 1410 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1411 - Client.packetWriter.addNode(var6); // L: 1412 - return 1; // L: 1413 - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1416 - return 1; // L: 1417 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1420 - return 1; // L: 1421 - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1424 - return 1; // L: 1425 - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1428 - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; // L: 1429 - } - - return 1; // L: 1430 - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1433 - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; // L: 1434 - } - - return 1; // L: 1435 - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1438 - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; // L: 1439 - } - - return 1; // L: 1440 - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1443 - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; // L: 1444 - } - - return 1; // L: 1445 - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1448 - return 1; // L: 1449 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1452 - return 1; // L: 1453 - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1456 - return 1; // L: 1457 - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - GrandExchangeEvents.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1460 - return 1; // L: 1461 - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChat.getTapToDrop() ? 1 : 0; // L: 1464 - return 1; // L: 1465 - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1468 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1469 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1470 - return 1; // L: 1471 - } else if (var0 == 3130) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1474 - return 1; // L: 1475 - } else if (var0 == 3131) { - --Interpreter.Interpreter_intStackSize; // L: 1478 - return 1; // L: 1479 - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorDecoration.canvasWidth; // L: 1482 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GameShell.canvasHeight; // L: 1483 - return 1; // L: 1484 - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --Interpreter.Interpreter_intStackSize; // L: 1487 - return 1; // L: 1488 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1491 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1494 - return 1; // L: 1495 - } else if (var0 == 3136) { - Client.field865 = 3; // L: 1498 - Client.field840 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1499 - return 1; // L: 1500 - } else if (var0 == 3137) { - Client.field865 = 2; // L: 1503 - Client.field840 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1504 - return 1; // L: 1505 - } else if (var0 == 3138) { - Client.field865 = 0; // L: 1508 - return 1; // L: 1509 - } else if (var0 == 3139) { - Client.field865 = 1; // L: 1512 - return 1; // L: 1513 - } else if (var0 == 3140) { - Client.field865 = 3; // L: 1516 - Client.field840 = var2 ? Canvas.field438.id * 1163691799 * 1189552295 : class3.field12.id * 1163691799 * 1189552295; // L: 1517 - return 1; // L: 1518 - } else { - boolean var3; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1521 - Tile.clientPreferences.hideUsername = var3; // L: 1522 - WorldMapData_1.savePreferences(); // L: 1523 - return 1; // L: 1524 - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.hideUsername ? 1 : 0; // L: 1527 - return 1; // L: 1528 - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1531 - Client.Login_isUsernameRemembered = var3; // L: 1532 - if (!var3) { // L: 1533 - Tile.clientPreferences.rememberedUsername = ""; // L: 1534 - WorldMapData_1.savePreferences(); // L: 1535 - } - - return 1; // L: 1537 - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1540 - return 1; // L: 1541 - } else if (var0 == 3145) { - return 1; // L: 1544 - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1547 - if (var3 == Tile.clientPreferences.titleMusicDisabled) { // L: 1548 - Tile.clientPreferences.titleMusicDisabled = !var3; // L: 1549 - WorldMapData_1.savePreferences(); // L: 1550 - } - - return 1; // L: 1552 - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1555 - return 1; // L: 1556 - } else if (var0 == 3148) { - return 1; // L: 1559 - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1562 - return 1; // L: 1563 - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1566 - return 1; // L: 1567 - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1570 - return 1; // L: 1571 - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1574 - return 1; // L: 1575 - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1578 - return 1; // L: 1579 - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_1.method785(); // L: 1582 - return 1; // L: 1583 - } else if (var0 == 3155) { - --Varps.Interpreter_stringStackSize; // L: 1586 - return 1; // L: 1587 - } else if (var0 == 3156) { - return 1; // L: 1590 - } else if (var0 == 3157) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1593 - return 1; // L: 1594 - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1597 - return 1; // L: 1598 - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1601 - return 1; // L: 1602 - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1605 - return 1; // L: 1606 - } else if (var0 == 3161) { - --Interpreter.Interpreter_intStackSize; // L: 1609 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1610 - return 1; // L: 1611 - } else if (var0 == 3162) { - --Interpreter.Interpreter_intStackSize; // L: 1614 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1615 - return 1; // L: 1616 - } else if (var0 == 3163) { - --Varps.Interpreter_stringStackSize; // L: 1619 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1620 - return 1; // L: 1621 - } else if (var0 == 3164) { - --Interpreter.Interpreter_intStackSize; // L: 1624 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1625 - return 1; // L: 1626 - } else if (var0 == 3165) { - --Interpreter.Interpreter_intStackSize; // L: 1629 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1630 - return 1; // L: 1631 - } else if (var0 == 3166) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1634 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1635 - return 1; // L: 1636 - } else if (var0 == 3167) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1639 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1640 - return 1; // L: 1641 - } else if (var0 == 3168) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1644 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1645 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1646 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1647 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1648 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1649 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1650 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1651 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1652 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1653 - return 1; // L: 1654 - } else if (var0 == 3169) { - return 1; // L: 1657 - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1660 - return 1; // L: 1661 - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1664 - return 1; // L: 1665 - } else if (var0 == 3172) { - --Interpreter.Interpreter_intStackSize; // L: 1668 - return 1; // L: 1669 - } else if (var0 == 3173) { - --Interpreter.Interpreter_intStackSize; // L: 1672 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1673 - return 1; // L: 1674 - } else if (var0 == 3174) { - --Interpreter.Interpreter_intStackSize; // L: 1677 - return 1; // L: 1678 - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1681 - return 1; // L: 1682 - } else if (var0 == 3176) { - return 1; // L: 1685 - } else if (var0 == 3177) { - return 1; // L: 1688 - } else if (var0 == 3178) { - --Varps.Interpreter_stringStackSize; // L: 1691 - return 1; // L: 1692 - } else if (var0 == 3179) { - return 1; // L: 1695 - } else if (var0 == 3180) { - --Varps.Interpreter_stringStackSize; // L: 1698 - return 1; // L: 1699 - } else { - return 2; // L: 1701 - } - } - } - } + return 0; } } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 5d3fd8a412..c89272c7a7 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -1,86 +1,99 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lo") +@Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1162804389 + intValue = 1450250857 ) + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1995988465 + ) + @Export("compass") public int compass; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1318347759 - ) - public int field3831; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 2062877841 - ) - public int mapScenes; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -2100530677 - ) - public int headIconsPk; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1982500985 - ) - public int field3839; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1352009329 + intValue = -395005955 ) public int field3835; - @ObfuscatedName("x") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 893846923 + intValue = -1288371471 ) - public int field3838; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -27380687 - ) - public int field3837; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 255609423 - ) - public int field3836; + @Export("mapScenes") + public int mapScenes; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1251414459 + intValue = -768564219 + ) + @Export("headIconsPk") + public int headIconsPk; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1062060293 + ) + public int field3836; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1307072609 + ) + public int field3839; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 534054869 + ) + public int field3841; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 2066068829 + ) + public int field3837; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 835992905 ) public int field3834; - @ObfuscatedName("n") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 733929835 + intValue = 1361350511 ) - public int field3840; + public int field3842; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 643339115 + ) + public int field3844; public GraphicsDefaults() { this.compass = -1; // L: 7 - this.field3831 = -1; // L: 8 + this.field3835 = -1; // L: 8 this.mapScenes = -1; // L: 9 this.headIconsPk = -1; // L: 10 - this.field3839 = -1; // L: 11 - this.field3835 = -1; // L: 12 - this.field3838 = -1; // L: 13 + this.field3836 = -1; // L: 11 + this.field3839 = -1; // L: 12 + this.field3841 = -1; // L: 13 this.field3837 = -1; // L: 14 - this.field3836 = -1; // L: 15 - this.field3834 = -1; // L: 16 - this.field3840 = -1; // L: 17 + this.field3834 = -1; // L: 15 + this.field3842 = -1; // L: 16 + this.field3844 = -1; // L: 17 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "-2057643179" + descriptor = "(Liw;I)V", + garbageValue = "-1821799353" ) + @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3828.group); // L: 20 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3833.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 while (true) { @@ -91,20 +104,20 @@ public class GraphicsDefaults { switch(var4) { // L: 25 case 1: - var3.readMedium(); // L: 28 - break; + var3.readMedium(); // L: 31 + break; // L: 32 case 2: - this.compass = var3.method5634(); // L: 36 - this.field3831 = var3.method5634(); // L: 37 - this.mapScenes = var3.method5634(); // L: 38 - this.headIconsPk = var3.method5634(); // L: 39 - this.field3839 = var3.method5634(); // L: 40 - this.field3835 = var3.method5634(); // L: 41 - this.field3838 = var3.method5634(); // L: 42 - this.field3837 = var3.method5634(); // L: 43 - this.field3836 = var3.method5634(); // L: 44 - this.field3834 = var3.method5634(); // L: 45 - this.field3840 = var3.method5634(); // L: 46 + this.compass = var3.method5851(); // L: 36 + this.field3835 = var3.method5851(); // L: 37 + this.mapScenes = var3.method5851(); // L: 38 + this.headIconsPk = var3.method5851(); // L: 39 + this.field3836 = var3.method5851(); // L: 40 + this.field3839 = var3.method5851(); // L: 41 + this.field3841 = var3.method5851(); // L: 42 + this.field3837 = var3.method5851(); // L: 43 + this.field3834 = var3.method5851(); // L: 44 + this.field3842 = var3.method5851(); // L: 45 + this.field3844 = var3.method5851(); // L: 46 } } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index f1d4679bee..c2f04c733a 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,58 +1,68 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("cy") +@Implements("GraphicsObject") public final class GraphicsObject extends Entity { + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 494289481 + ) + @Export("id") + int id; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -770993721 + ) + @Export("cycleStart") + int cycleStart; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 2046486035 + ) + @Export("plane") + int plane; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 467633941 + ) + @Export("x") + int x; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1326465881 + intValue = 1569589891 ) + @Export("height") int height; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1027327973 - ) - int id; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1536729399 - ) - int cycleStart; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1152665819 - ) - int plane; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1500063053 - ) - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1460229241 + intValue = 1673763885 ) + @Export("y") int y; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljm;" + descriptor = "Ljg;" ) + @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1933421917 + intValue = -300375293 ) + @Export("frame") int frame; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1610487487 + intValue = 687860479 ) + @Export("frameCycle") int frameCycle; - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("isFinished") boolean isFinished; GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -65,21 +75,22 @@ public final class GraphicsObject extends Entity { this.y = var4; // L: 24 this.height = var5; // L: 25 this.cycleStart = var7 + var6; // L: 26 - int var8 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + int var8 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence; // L: 27 if (var8 != -1) { // L: 28 this.isFinished = false; // L: 29 - this.sequenceDefinition = WorldMapRegion.SequenceDefinition_get(var8); // L: 30 + this.sequenceDefinition = class105.SequenceDefinition_get(var8); // L: 30 } else { this.isFinished = true; // L: 32 } } // L: 33 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1653124671" + garbageValue = "-825901935" ) + @Export("advance") final void advance(int var1) { if (!this.isFinished) { // L: 36 this.frameCycle += var1; // L: 37 @@ -96,13 +107,14 @@ public final class GraphicsObject extends Entity { } } // L: 46 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ler;", - garbageValue = "-2026237468" + descriptor = "(I)Leh;", + garbageValue = "-2070677844" ) + @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 49 + SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id); // L: 49 Model var2; if (!this.isFinished) { // L: 51 var2 = var1.getModel(this.frame); @@ -113,82 +125,22 @@ public final class GraphicsObject extends Entity { return var2 == null ? null : var2; // L: 53 } - @ObfuscatedName("s") + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "104" + descriptor = "(I)I", + garbageValue = "1882927898" ) - static void method2091() { - try { - File var0 = new File(UserComparator2.userHomeDirectory, "random.dat"); // L: 283 - int var2; - if (var0.exists()) { // L: 284 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 285 - } else { - label38: - for (int var1 = 0; var1 < class69.field570.length; ++var1) { // L: 288 - for (var2 = 0; var2 < UserComparator4.field2005.length; ++var2) { // L: 289 - File var3 = new File(UserComparator4.field2005[var2] + class69.field570[var1] + File.separatorChar + "random.dat"); // L: 290 - if (var3.exists()) { // L: 291 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 292 - break label38; // L: 293 - } - } - } + static int method2122() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1909 + int var0 = 0; // L: 1910 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1911 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1912 } - if (JagexCache.JagexCache_randomDat == null) { // L: 298 - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 299 - var2 = var4.read(); // L: 300 - var4.seek(0L); // L: 301 - var4.write(var2); // L: 302 - var4.seek(0L); // L: 303 - var4.close(); // L: 304 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 305 - } - } catch (IOException var5) { // L: 308 + return var0 * 10000 / Client.field953; // L: 1914 + } else { + return 10000; } - - } // L: 309 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1643627841" - ) - public static void method2095() { - try { - if (class206.musicPlayerStatus == 1) { // L: 65 - int var0 = class206.midiPcmStream.method3806(); // L: 66 - if (var0 > 0 && class206.midiPcmStream.isReady()) { // L: 67 - var0 -= FaceNormal.pcmSampleLength; // L: 68 - if (var0 < 0) { // L: 69 - var0 = 0; - } - - class206.midiPcmStream.setPcmStreamVolume(var0); // L: 70 - return; // L: 71 - } - - class206.midiPcmStream.clear(); // L: 73 - class206.midiPcmStream.removeAll(); // L: 74 - if (class204.musicTrackArchive != null) { // L: 75 - class206.musicPlayerStatus = 2; - } else { - class206.musicPlayerStatus = 0; // L: 76 - } - - class206.musicTrack = null; // L: 77 - class39.soundCache = null; // L: 78 - } - } catch (Exception var2) { // L: 81 - var2.printStackTrace(); // L: 82 - class206.midiPcmStream.clear(); // L: 83 - class206.musicPlayerStatus = 0; // L: 84 - class206.musicTrack = null; // L: 85 - class39.soundCache = null; // L: 86 - class204.musicTrackArchive = null; // L: 87 - } - - } // L: 89 + } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index cc44e2cfb8..35ae3fa18d 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,40 +1,51 @@ +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("cu") +@ObfuscatedName("cx") +@Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lic;" + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1819103189 ) - public static AbstractArchive Widget_fontsArchive; + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1100752365 + ) + @Export("canvasHeight") + public static int canvasHeight; @ObfuscatedName("l") - static int[] BZip2Decompressor_block; - @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lir;" + descriptor = "Lix;" ) + @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljs;" ) + @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lir;)V" + descriptor = "(Lix;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); // L: 12 this.definition = var1; // L: 15 } // L: 16 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-891370152" + garbageValue = "184587772" ) + @Export("put") void put(int var1, int var2, int var3, int var4) { HealthBarUpdate var5 = null; // L: 19 int var6 = 0; // L: 20 @@ -65,11 +76,12 @@ public class HealthBar extends Node { } } // L: 31 35 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)Lca;", - garbageValue = "-95" + descriptor = "(II)Lce;", + garbageValue = "1695918285" ) + @Export("get") HealthBarUpdate get(int var1) { HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); // L: 38 if (var2 != null && var2.cycle <= var1) { // L: 39 @@ -78,7 +90,7 @@ public class HealthBar extends Node { var2 = var3; // L: 43 } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { // L: 47 + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 return var2; } else { var2.remove(); // L: 49 @@ -89,690 +101,107 @@ public class HealthBar extends Node { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "112420094" ) + @Export("isEmpty") boolean isEmpty() { - return this.updates.method4945(); // L: 55 + return this.updates.method4990(); // L: 55 } - @ObfuscatedName("g") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lec;[Lft;I)V", - garbageValue = "79338939" + descriptor = "(Liw;Liw;ZII)V", + garbageValue = "265238448" ) - static final void method2113(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { // L: 485 - for (var3 = 0; var3 < 104; ++var3) { // L: 486 - for (var4 = 0; var4 < 104; ++var4) { // L: 487 - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 488 - var5 = var2; // L: 489 - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 490 - var5 = var2 - 1; - } - - if (var5 >= 0) { // L: 491 - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - } - - Tiles.field535 += (int)(Math.random() * 5.0D) - 2; // L: 496 - if (Tiles.field535 < -8) { // L: 497 - Tiles.field535 = -8; - } - - if (Tiles.field535 > 8) { // L: 498 - Tiles.field535 = 8; - } - - Tiles.field520 += (int)(Math.random() * 5.0D) - 2; // L: 499 - if (Tiles.field520 < -16) { // L: 500 - Tiles.field520 = -16; - } - - if (Tiles.field520 > 16) { // L: 501 - Tiles.field520 = 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) { // L: 502 - byte[][] var42 = class22.field122[var2]; // L: 503 - var9 = (int)Math.sqrt(5100.0D); // L: 509 - var10 = var9 * 768 >> 8; // L: 510 - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { // L: 511 - for (var12 = 1; var12 < 103; ++var12) { // L: 512 - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 513 - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 514 - var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 515 - var16 = (var13 << 8) / var15; // L: 516 - var17 = 65536 / var15; // L: 517 - var18 = (var14 << 8) / var15; // L: 518 - var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 519 - 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); // L: 520 - class39.field282[var12][var11] = var19 - var20; // L: 521 - } + static void method2141(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 128 + if (var3 == 4) { // L: 129 + Login.loginIndex = 4; // L: 130 } - for (var11 = 0; var11 < 104; ++var11) { // L: 524 - Tiles.Tiles_hue[var11] = 0; // L: 525 - Tiles.Tiles_saturation[var11] = 0; // L: 526 - WorldMapRectangle.Tiles_lightness[var11] = 0; // L: 527 - WorldMapScaleHandler.Tiles_hueMultiplier[var11] = 0; // L: 528 - class60.field453[var11] = 0; // L: 529 - } - - for (var11 = -5; var11 < 109; ++var11) { // L: 531 - for (var12 = 0; var12 < 104; ++var12) { // L: 532 - var13 = var11 + 5; // L: 533 - int var10002; - if (var13 >= 0 && var13 < 104) { // L: 534 - var14 = Tiles.field528[var2][var13][var12] & 255; // L: 535 - if (var14 > 0) { // L: 536 - var16 = var14 - 1; // L: 538 - FloorUnderlayDefinition var44 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 540 - FloorUnderlayDefinition var46; - if (var44 != null) { // L: 541 - var46 = var44; // L: 542 - } else { - byte[] var45 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 545 - var44 = new FloorUnderlayDefinition(); // L: 546 - if (var45 != null) { // L: 547 - var44.decode(new Buffer(var45), var16); - } - - var44.postDecode(); // L: 548 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var44, (long)var16); // L: 549 - var46 = var44; // L: 550 - } - - var10000 = Tiles.Tiles_hue; // L: 553 - var10000[var12] += var46.hue; - var10000 = Tiles.Tiles_saturation; // L: 554 - var10000[var12] += var46.saturation; - var10000 = WorldMapRectangle.Tiles_lightness; // L: 555 - var10000[var12] += var46.lightness; - var10000 = WorldMapScaleHandler.Tiles_hueMultiplier; // L: 556 - var10000[var12] += var46.hueMultiplier; - var10002 = class60.field453[var12]++; // L: 557 - } - } - - var14 = var11 - 5; // L: 560 - if (var14 >= 0 && var14 < 104) { // L: 561 - var15 = Tiles.field528[var2][var14][var12] & 255; // L: 562 - if (var15 > 0) { // L: 563 - var17 = var15 - 1; // L: 565 - FloorUnderlayDefinition var52 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); // L: 567 - FloorUnderlayDefinition var48; - if (var52 != null) { // L: 568 - var48 = var52; // L: 569 - } else { - byte[] var47 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); // L: 572 - var52 = new FloorUnderlayDefinition(); // L: 573 - if (var47 != null) { // L: 574 - var52.decode(new Buffer(var47), var17); - } - - var52.postDecode(); // L: 575 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var52, (long)var17); // L: 576 - var48 = var52; // L: 577 - } - - var10000 = Tiles.Tiles_hue; // L: 580 - var10000[var12] -= var48.hue; - var10000 = Tiles.Tiles_saturation; // L: 581 - var10000[var12] -= var48.saturation; - var10000 = WorldMapRectangle.Tiles_lightness; // L: 582 - var10000[var12] -= var48.lightness; - var10000 = WorldMapScaleHandler.Tiles_hueMultiplier; // L: 583 - var10000[var12] -= var48.hueMultiplier; - var10002 = class60.field453[var12]--; // L: 584 - } - } - } - - if (var11 >= 1 && var11 < 103) { // L: 588 - var12 = 0; // L: 589 - var13 = 0; // L: 590 - var14 = 0; // L: 591 - var15 = 0; // L: 592 - var16 = 0; // L: 593 - - for (var17 = -5; var17 < 109; ++var17) { // L: 594 - var18 = var17 + 5; // L: 595 - if (var18 >= 0 && var18 < 104) { // L: 596 - var12 += Tiles.Tiles_hue[var18]; // L: 597 - var13 += Tiles.Tiles_saturation[var18]; // L: 598 - var14 += WorldMapRectangle.Tiles_lightness[var18]; // L: 599 - var15 += WorldMapScaleHandler.Tiles_hueMultiplier[var18]; // L: 600 - var16 += class60.field453[var18]; // L: 601 - } - - var19 = var17 - 5; // L: 603 - if (var19 >= 0 && var19 < 104) { // L: 604 - var12 -= Tiles.Tiles_hue[var19]; // L: 605 - var13 -= Tiles.Tiles_saturation[var19]; // L: 606 - var14 -= WorldMapRectangle.Tiles_lightness[var19]; // L: 607 - var15 -= WorldMapScaleHandler.Tiles_hueMultiplier[var19]; // L: 608 - var16 -= class60.field453[var19]; // L: 609 - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 611 612 613 614 - if (var2 < Tiles.Tiles_minPlane) { // L: 617 - Tiles.Tiles_minPlane = var2; - } - - var20 = Tiles.field528[var2][var11][var17] & 255; // L: 618 - int var21 = Tiles.field521[var2][var11][var17] & 255; // L: 619 - if (var20 > 0 || var21 > 0) { // L: 620 - int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 621 - int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 622 - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 623 - int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 624 - int var26 = class39.field282[var11][var17]; // L: 625 - int var27 = class39.field282[var11 + 1][var17]; // L: 626 - int var28 = class39.field282[var11 + 1][var17 + 1]; // L: 627 - int var29 = class39.field282[var11][var17 + 1]; // L: 628 - int var30 = -1; // L: 629 - int var31 = -1; // L: 630 - int var32; - int var33; - if (var20 > 0) { // L: 631 - var32 = var12 * 256 / var15; // L: 632 - var33 = var13 / var16; // L: 633 - int var34 = var14 / var16; // L: 634 - var30 = class60.hslToRgb(var32, var33, var34); // L: 635 - var32 = var32 + Tiles.field535 & 255; // L: 636 - var34 += Tiles.field520; // L: 637 - if (var34 < 0) { // L: 638 - var34 = 0; - } else if (var34 > 255) { // L: 639 - var34 = 255; - } - - var31 = class60.hslToRgb(var32, var33, var34); // L: 640 - } - - if (var2 > 0) { // L: 642 - boolean var50 = true; // L: 643 - if (var20 == 0 && class297.field3668[var2][var11][var17] != 0) { // L: 644 - var50 = false; - } - - if (var21 > 0 && !SoundSystem.method2594(var21 - 1).hideUnderlay) { // L: 645 - var50 = false; - } - - if (var50 && var23 == var22 && var22 == var24 && var22 == var25) { // L: 646 647 - var10000 = class204.field2421[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; // L: 650 - if (var31 != -1) { // L: 651 - var32 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method1795(var31, 96)]; - } - - if (var21 == 0) { // L: 652 - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, PendingSpawn.method1795(var30, var26), PendingSpawn.method1795(var30, var27), PendingSpawn.method1795(var30, var28), PendingSpawn.method1795(var30, var29), 0, 0, 0, 0, var32, 0); // L: 653 - } else { - var33 = class297.field3668[var2][var11][var17] + 1; // L: 656 - byte var51 = class171.field2049[var2][var11][var17]; // L: 657 - FloorOverlayDefinition var35 = SoundSystem.method2594(var21 - 1); // L: 658 - int var36 = var35.texture; // L: 659 - int var37; - int var38; - int var39; - int var40; - if (var36 >= 0) { // L: 662 - var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 663 - var37 = -1; // L: 664 - } else if (var35.primaryRgb == 16711935) { // L: 667 - var37 = -2; // L: 668 - var36 = -1; // L: 669 - var38 = -2; // L: 670 - } else { - var37 = class60.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 673 - var39 = var35.hue + Tiles.field535 & 255; // L: 674 - var40 = var35.lightness + Tiles.field520; // L: 675 - if (var40 < 0) { // L: 676 - var40 = 0; - } else if (var40 > 255) { // L: 677 - var40 = 255; - } - - var38 = class60.hslToRgb(var39, var35.saturation, var40); // L: 678 - } - - var39 = 0; // L: 681 - if (var38 != -2) { // L: 682 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[Coord.method4083(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { // L: 683 - var40 = var35.secondaryHue + Tiles.field535 & 255; // L: 684 - int var41 = var35.secondaryLightness + Tiles.field520; // L: 685 - if (var41 < 0) { // L: 686 - var41 = 0; - } else if (var41 > 255) { // L: 687 - var41 = 255; - } - - var38 = class60.hslToRgb(var40, var35.secondarySaturation, var41); // L: 688 - var39 = Rasterizer3D.Rasterizer3D_colorPalette[Coord.method4083(var38, 96)]; // L: 689 - } - - var0.addTile(var2, var11, var17, var33, var51, var36, var22, var23, var24, var25, PendingSpawn.method1795(var30, var26), PendingSpawn.method1795(var30, var27), PendingSpawn.method1795(var30, var28), PendingSpawn.method1795(var30, var29), Coord.method4083(var37, var26), Coord.method4083(var37, var27), Coord.method4083(var37, var28), Coord.method4083(var37, var29), var32, var39); // L: 691 - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { // L: 698 - for (var12 = 1; var12 < 103; ++var12) { // L: 699 - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 706 - var17 = 0; // L: 707 - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 710 - var17 = var2 - 1; // L: 711 - } else { - var17 = var2; // L: 714 - } - - var0.setTileMinPlane(var2, var12, var11, var17); // L: 716 - } - } - - Tiles.field528[var2] = null; // L: 719 - Tiles.field521[var2] = null; // L: 720 - class297.field3668[var2] = null; // L: 721 - class171.field2049[var2] = null; // L: 722 - class22.field122[var2] = null; // L: 723 - } - - var0.method3219(-50, -10, -50); // L: 725 - - for (var2 = 0; var2 < 104; ++var2) { // L: 726 - for (var3 = 0; var3 < 104; ++var3) { // L: 727 - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 728 - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; // L: 731 - var3 = 2; // L: 732 - var4 = 4; // L: 733 - - for (var5 = 0; var5 < 4; ++var5) { // L: 734 - if (var5 > 0) { // L: 735 - var2 <<= 3; // L: 736 - var3 <<= 3; // L: 737 - var4 <<= 3; // L: 738 - } - - for (int var6 = 0; var6 <= var5; ++var6) { // L: 740 - for (int var7 = 0; var7 <= 104; ++var7) { // L: 741 - for (int var8 = 0; var8 <= 104; ++var8) { // L: 742 - short var49; - if ((class204.field2421[var6][var8][var7] & var2) != 0) { // L: 743 - var9 = var7; // L: 744 - var10 = var7; // L: 745 - var11 = var6; // L: 746 - - for (var12 = var6; var9 > 0 && (class204.field2421[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 747 748 - } - - while (var10 < 104 && (class204.field2421[var6][var8][var10 + 1] & var2) != 0) { // L: 749 - ++var10; - } - - label453: - while (var11 > 0) { // L: 750 - for (var13 = var9; var13 <= var10; ++var13) { // L: 751 - if ((class204.field2421[var11 - 1][var8][var13] & var2) == 0) { - break label453; - } - } - - --var11; // L: 752 - } - - label442: - while (var12 < var5) { // L: 754 - for (var13 = var9; var13 <= var10; ++var13) { // L: 755 - if ((class204.field2421[var12 + 1][var8][var13] & var2) == 0) { - break label442; - } - } - - ++var12; // L: 756 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 758 - if (var13 >= 8) { // L: 759 - var49 = 240; // L: 760 - var15 = Tiles.Tiles_heights[var12][var8][var9] - var49; // L: 761 - var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 762 - Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 763 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 764 - for (var18 = var9; var18 <= var10; ++var18) { // L: 765 - var10000 = class204.field2421[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((class204.field2421[var6][var8][var7] & var3) != 0) { // L: 769 - var9 = var8; // L: 770 - var10 = var8; // L: 771 - var11 = var6; // L: 772 - - for (var12 = var6; var9 > 0 && (class204.field2421[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 773 774 - } - - while (var10 < 104 && (class204.field2421[var6][var10 + 1][var7] & var3) != 0) { // L: 775 - ++var10; - } - - label506: - while (var11 > 0) { // L: 776 - for (var13 = var9; var13 <= var10; ++var13) { // L: 777 - if ((class204.field2421[var11 - 1][var13][var7] & var3) == 0) { - break label506; - } - } - - --var11; // L: 778 - } - - label495: - while (var12 < var5) { // L: 780 - for (var13 = var9; var13 <= var10; ++var13) { // L: 781 - if ((class204.field2421[var12 + 1][var13][var7] & var3) == 0) { - break label495; - } - } - - ++var12; // L: 782 - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 784 - if (var13 >= 8) { // L: 785 - var49 = 240; // L: 786 - var15 = Tiles.Tiles_heights[var12][var9][var7] - var49; // L: 787 - var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 788 - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 789 - - for (var17 = var11; var17 <= var12; ++var17) { // L: 790 - for (var18 = var9; var18 <= var10; ++var18) { // L: 791 - var10000 = class204.field2421[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((class204.field2421[var6][var8][var7] & var4) != 0) { // L: 795 - var9 = var8; // L: 796 - var10 = var8; // L: 797 - var11 = var7; // L: 798 - - for (var12 = var7; var11 > 0 && (class204.field2421[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 799 800 - } - - while (var12 < 104 && (class204.field2421[var6][var8][var12 + 1] & var4) != 0) { // L: 801 - ++var12; - } - - label559: - while (var9 > 0) { // L: 802 - for (var13 = var11; var13 <= var12; ++var13) { // L: 803 - if ((class204.field2421[var6][var9 - 1][var13] & var4) == 0) { - break label559; - } - } - - --var9; // L: 804 - } - - label548: - while (var10 < 104) { // L: 806 - for (var13 = var11; var13 <= var12; ++var13) { // L: 807 - if ((class204.field2421[var6][var10 + 1][var13] & var4) == 0) { - break label548; - } - } - - ++var10; // L: 808 - } - - if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 810 - var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 811 - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 812 - - for (var14 = var9; var14 <= var10; ++var14) { // L: 813 - for (var15 = var11; var15 <= var12; ++var15) { // L: 814 - var10000 = class204.field2421[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - - } // L: 822 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-2034460378" - ) - static int Messages_getNextChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75 - if (var1 == null) { // L: 76 - return -1; } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 77 78 - } - } + Login.loginIndex = var3; // L: 134 + Rasterizer2D.Rasterizer2D_clear(); // L: 135 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 136 + Login.leftTitleSprite = class39.convertJpgToSprite(var4); // L: 137 + Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); // L: 138 + AbstractArchive.method4386(var1, Client.worldProperties); // L: 139 + Tiles.titleboxSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 140 + Login.titlebuttonSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 141 + int var6 = var1.getGroupId("runes"); // L: 144 + int var7 = var1.getFileId(var6, ""); // L: 145 + IndexedSprite[] var5 = UserComparator5.method3540(var1, var6, var7); // L: 146 + class278.runesSprite = var5; // L: 148 + var7 = var1.getGroupId("title_mute"); // L: 151 + int var8 = var1.getFileId(var7, ""); // L: 152 + IndexedSprite[] var10 = UserComparator5.method3540(var1, var7, var8); // L: 153 + DefaultsGroup.title_muteSprite = var10; // L: 155 + Login.options_buttons_0Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 156 + class69.field583 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 157 + Login.options_buttons_2Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 158 + DevicePcmPlayerProvider.field439 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 159 + class225.field2576 = Login.options_buttons_0Sprite.subWidth; // L: 160 + class232.field2780 = Login.options_buttons_0Sprite.subHeight; // L: 161 + Login.loginScreenRunesAnimation = new LoginScreenAnimation(class278.runesSprite); // L: 162 + if (var2) { // L: 163 + Login.Login_username = ""; // L: 164 + Login.Login_password = ""; // L: 165 + } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "-51" - ) - static int method2112(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2269 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2270 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2271 - return 1; // L: 2272 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2274 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2275 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2276 - return 1; // L: 2277 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2279 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2280 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2281 - return 1; // L: 2282 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2284 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2285 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2286 - return 1; // L: 2287 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2289 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2290 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2291 - return 1; // L: 2292 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2294 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2295 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2296 - return 1; // L: 2297 - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2299 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2300 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2301 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2302 - return 1; // L: 2303 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2305 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2306 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2307 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2308 - return 1; // L: 2309 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2311 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2312 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2313 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2314 - return 1; // L: 2315 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2317 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2318 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2319 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2320 - return 1; // L: 2321 + class169.field2035 = 0; // L: 167 + EnumDefinition.otp = ""; // L: 168 + Login.field1227 = true; // L: 169 + Login.worldSelectOpen = false; // L: 170 + if (!GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled) { // L: 171 + Archive var11 = ApproximateRouteStrategy.archive6; // L: 172 + var8 = var11.getGroupId("scape main"); // L: 174 + int var9 = var11.getFileId(var8, ""); // L: 175 + class206.musicPlayerStatus = 1; // L: 177 + class23.musicTrackArchive = var11; // L: 178 + TileItem.musicTrackGroupId = var8; // L: 179 + class206.musicTrackFileId = var9; // L: 180 + class206.musicTrackVolume = 255; // L: 181 + class195.musicTrackBoolean = false; // L: 182 + MusicPatch.pcmSampleLength = 2; // L: 183 } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2323 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2324 - if (WorldMapSection1.grandExchangeEvents != null) { // L: 2325 - WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2326 - } - - return 1; // L: 2328 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2330 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2331 - if (WorldMapSection1.grandExchangeEvents != null) { // L: 2332 - WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2333 - } - - return 1; // L: 2335 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2337 - Interpreter.Interpreter_intStackSize -= 2; // L: 2338 - var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; // L: 2339 - boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2340 - if (WorldMapSection1.grandExchangeEvents != null) { // L: 2341 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2342 - WorldMapSection1.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2343 - } - - return 1; // L: 2345 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2347 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2348 - if (WorldMapSection1.grandExchangeEvents != null) { // L: 2349 - WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2350 - } - - return 1; // L: 2352 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2354 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2355 - if (WorldMapSection1.grandExchangeEvents != null) { // L: 2356 - WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2357 - } - - return 1; // L: 2359 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2361 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection1.grandExchangeEvents == null ? 0 : WorldMapSection1.grandExchangeEvents.events.size(); // L: 2362 - return 1; // L: 2363 - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2365 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2366 - var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2367 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; // L: 2368 - return 1; // L: 2369 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2371 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2372 - var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2373 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2374 - return 1; // L: 2375 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2377 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2378 - var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2379 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2380 - return 1; // L: 2381 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2383 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2384 - var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2385 - long var5 = PacketWriter.currentTimeMillis() - ItemContainer.field553 - var4.age; // L: 2386 - int var7 = (int)(var5 / 3600000L); // L: 2387 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2388 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2389 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2390 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var10; // L: 2391 - return 1; // L: 2392 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2394 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2395 - var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2396 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2397 - return 1; // L: 2398 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2400 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2401 - var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2402 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2403 - return 1; // L: 2404 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2406 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2407 - var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2408 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2409 - return 1; // L: 2410 - } else { - return 2; // L: 2412 - } - } + VertexNormal.method3133(2); // L: 187 } - } - } - @ObfuscatedName("jf") + WorldMapSection0.method323(false); // L: 188 + Login.clearLoginScreen = true; // L: 189 + Login.xPadding = (ItemContainer.canvasWidth - 765) / 2; // L: 190 + Login.loginBoxX = Login.xPadding + 202; // L: 191 + AttackOption.loginBoxCenter = Login.loginBoxX + 180; // L: 192 + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 193 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 194 + SecureRandomFuture.logoSprite.drawAt(Login.xPadding + 382 - SecureRandomFuture.logoSprite.subWidth / 2, 18); // L: 195 + } + } // L: 132 196 + + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIILlp;Lhz;I)V", - garbageValue = "728555201" + descriptor = "(ZI)V", + garbageValue = "-614067797" ) - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - if (var4 != null) { // L: 10662 - int var6 = Client.camAngleY & 2047; // L: 10663 - int var7 = var3 * var3 + var2 * var2; // L: 10664 - if (var7 <= 6400) { // L: 10665 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 10666 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 10667 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 10668 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 10669 - if (var7 > 2500) { - var4.method6262(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 10670 - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 10671 - } - - } + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 818 + Login.Login_response2 = "Enter your username/email & password."; // L: 819 + Login.Login_response3 = ""; // L: 820 + Login.loginIndex = 2; // L: 821 + if (var0) { // L: 822 + Login.Login_password = ""; } - } // L: 10672 + + MusicPatch.method4038(); // L: 823 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 825 + Login.currentLoginField = 1; // L: 826 + } else { + Login.currentLoginField = 0; // L: 829 + } + + } // L: 832 } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 5a2b6ada83..47d17a1320 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -1,78 +1,93 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("ix") +@Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("HitSplatDefinition_spritesArchive") public static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) + @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -72609311 - ) - public int field3314; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -2108314947 - ) - public int int1; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1537532305 - ) - public int int2; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -778241871 + @ObfuscatedSignature( + descriptor = "Lev;" ) - public int int3; - @ObfuscatedName("n") + @Export("HealthBarDefinition_cachedSprites") + static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2007906497 + intValue = 1202719207 ) public int field3310; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1932692413 - ) - public int int5; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -2140238063 - ) - int frontSpriteID; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1649741031 - ) - int backSpriteID; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 197104923 - ) - public int width; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 127920675 + intValue = 989487885 ) + @Export("int1") + public int int1; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 609506575 + ) + @Export("int2") + public int int2; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1179673119 + ) + @Export("int3") + public int int3; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1289103719 + ) + public int field3314; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1724859725 + ) + @Export("int5") + public int int5; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1229803207 + ) + @Export("frontSpriteID") + int frontSpriteID; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -524037047 + ) + @Export("backSpriteID") + int backSpriteID; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 185744125 + ) + @Export("width") + public int width; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1513629223 + ) + @Export("widthPadding") public int widthPadding; static { @@ -80,152 +95,113 @@ public class HealthBarDefinition extends DualNode { HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15 } - HealthBarDefinition() { + public HealthBarDefinition() { this.int1 = 255; // L: 19 this.int2 = 255; // L: 20 this.int3 = -1; // L: 21 - this.field3310 = 1; // L: 22 + this.field3314 = 1; // L: 22 this.int5 = 70; // L: 23 this.frontSpriteID = -1; // L: 24 this.backSpriteID = -1; // L: 25 this.width = 30; // L: 26 this.widthPadding = 0; // L: 27 - } // L: 29 + } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "1885032868" + descriptor = "(Lkb;I)V", + garbageValue = "-1137754671" ) - void decode(Buffer var1) { + @Export("decode") + public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 43 - if (var2 == 0) { // L: 44 - return; // L: 47 + int var2 = var1.readUnsignedByte(); // L: 31 + if (var2 == 0) { // L: 32 + return; // L: 35 } - this.decodeNext(var1, var2); // L: 45 + this.decodeNext(var1, var2); // L: 33 } } - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "808317446" + descriptor = "(Lkb;II)V", + garbageValue = "1563095853" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 50 - var1.readUnsignedShort(); // L: 51 - } else if (var2 == 2) { // L: 53 + if (var2 == 1) { // L: 38 + var1.readUnsignedShort(); // L: 39 + } else if (var2 == 2) { // L: 41 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { // L: 54 + } else if (var2 == 3) { // L: 42 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { // L: 55 + } else if (var2 == 4) { // L: 43 this.int3 = 0; - } else if (var2 == 5) { // L: 56 - this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 57 - var1.readUnsignedByte(); // L: 58 - } else if (var2 == 7) { // L: 60 - this.frontSpriteID = var1.method5634(); - } else if (var2 == 8) { // L: 61 - this.backSpriteID = var1.method5634(); - } else if (var2 == 11) { // L: 62 - this.int3 = var1.readUnsignedShort(); - } else if (var2 == 14) { // L: 63 + } else if (var2 == 5) { + this.int5 = var1.readUnsignedShort(); // L: 44 + } else if (var2 == 6) { // L: 45 + var1.readUnsignedByte(); // L: 46 + } else if (var2 == 7) { // L: 48 + this.frontSpriteID = var1.method5851(); + } else if (var2 == 8) { // L: 49 + this.backSpriteID = var1.method5851(); + } else if (var2 == 11) { + this.int3 = var1.readUnsignedShort(); // L: 50 + } else if (var2 == 14) { // L: 51 this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 64 + } else if (var2 == 15) { // L: 52 this.widthPadding = var1.readUnsignedByte(); } - } // L: 66 + } // L: 54 - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Llp;", - garbageValue = "-1096535425" + descriptor = "(B)Llc;", + garbageValue = "124" ) + @Export("getFrontSprite") public Sprite getFrontSprite() { - if (this.frontSpriteID < 0) { // L: 69 + if (this.frontSpriteID < 0) { // L: 57 return null; } else { - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70 + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 58 if (var1 != null) { - return var1; // L: 71 + return var1; // L: 59 } else { - var1 = AbstractUserComparator.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 72 - if (var1 != null) { // L: 73 - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); + var1 = FloorDecoration.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 60 + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); // L: 61 } - return var1; // L: 75 + return var1; // L: 63 } } } - @ObfuscatedName("i") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Llp;", - garbageValue = "1" + descriptor = "(B)Llc;", + garbageValue = "120" ) + @Export("getBackSprite") public Sprite getBackSprite() { - if (this.backSpriteID < 0) { // L: 79 + if (this.backSpriteID < 0) { // L: 67 return null; } else { - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80 - if (var1 != null) { // L: 81 + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 68 + if (var1 != null) { // L: 69 return var1; } else { - var1 = AbstractUserComparator.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 82 - if (var1 != null) { // L: 83 + var1 = FloorDecoration.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 70 + if (var1 != null) { // L: 71 HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } - return var1; // L: 85 + return var1; // L: 73 } } } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1134464400" - ) - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 183 - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; // L: 184 - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 185 - } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", - garbageValue = "-91" - ) - static String method4563(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 10752 - if (Client.gameBuild == 1) { // L: 10753 - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 10754 - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 10755 - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 10756 - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 10757 - var0 = "local"; - } - - String var3 = ""; // L: 10758 - if (class200.field2403 != null) { // L: 10759 - var3 = "/p=" + class200.field2403; - } - - String var4 = "runescape.com"; // L: 10760 - return var2 + var0 + "." + var4 + "/l=" + class58.clientLanguage + "/a=" + GrandExchangeOffer.field99 + var3 + "/"; // L: 10761 - } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index f850b5080d..b4339bc3d5 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,33 +1,37 @@ +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("ca") +@ObfuscatedName("ce") +@Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("rb") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 948728571 - ) - static int field1038; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1931274229 + intValue = -591382375 ) + @Export("cycle") int cycle; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1765683631 + intValue = 1850182953 ) + @Export("health") int health; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1932254665 + intValue = -733805573 ) + @Export("health2") int health2; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -488536303 + intValue = 2105811825 ) + @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { @@ -37,11 +41,12 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 15 } // L: 16 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "1" + descriptor = "(IIIII)V", + garbageValue = "2090689234" ) + @Export("set") void set(int var1, int var2, int var3, int var4) { this.cycle = var1; // L: 19 this.health = var2; // L: 20 @@ -49,36 +54,122 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 22 } // L: 23 - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1655201695" + descriptor = "(Ljava/lang/String;B)Z", + garbageValue = "60" ) - public static boolean method1815() { - return class206.musicPlayerStatus != 0 ? true : class206.midiPcmStream.isReady(); // L: 59 60 + static boolean method1870(String var0) { + if (var0 == null) { // L: 35 + return false; + } else { + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; + } + } } - @ObfuscatedName("ej") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1341706343" + descriptor = "(II)Lie;", + garbageValue = "-736266811" ) - static final void method1818() { - Scene.Scene_isLowDetail = false; // L: 779 - Client.isLowDetail = false; // L: 780 - } // L: 781 + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37 + if (var1 != null) { // L: 38 + return var1; + } else { + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39 + var1 = new SpotAnimationDefinition(); // L: 40 + var1.id = var0; // L: 41 + if (var2 != null) { // L: 42 + var1.decode(new Buffer(var2)); + } - @ObfuscatedName("hi") + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43 + return var1; // L: 44 + } + } + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-487929114" + descriptor = "(Lkb;IIIIIII)V", + garbageValue = "1972730471" ) - static final void method1817(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7049 - 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) { // L: 7050 - Client.field883[var4] = true; + @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) { // L: 112 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 113 + + while (true) { + var7 = var0.readUnsignedByte(); // L: 115 + if (var7 == 0) { // L: 116 + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -Occluder.method3412(var4 + var2 + 932731, var3 + 556238 + var5) * 8; // L: 117 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 118 + } + break; + } + + if (var7 == 1) { // L: 121 + int var8 = var0.readUnsignedByte(); // L: 122 + if (var8 == 1) { // L: 123 + var8 = 0; + } + + if (var1 == 0) { // L: 124 + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 125 + } + break; + } + + if (var7 <= 49) { // L: 128 + NPC.field1161[var1][var2][var3] = var0.readByte(); // L: 129 + Tiles.field531[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 130 + UserComparator2.field3859[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 131 + } else if (var7 <= 81) { // L: 134 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 135 + } else { + TileItem.field1273[var1][var2][var3] = (byte)(var7 - 81); // L: 138 + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); // L: 143 + if (var7 == 0) { // L: 144 + break; + } + + if (var7 == 1) { // L: 145 + var0.readUnsignedByte(); // L: 146 + break; + } + + if (var7 <= 49) { // L: 149 + var0.readUnsignedByte(); + } } } - } // L: 7052 + } // L: 152 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1201553018" + ) + static final void method1869(String var0) { + PacketBufferNode var1 = class4.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); // L: 203 + var1.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var0)); // L: 204 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 205 + Client.packetWriter.addNode(var1); // L: 206 + } // L: 207 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 8a3ab9f8e4..a526d8d218 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -1,113 +1,125 @@ +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("jd") +@ObfuscatedName("jx") +@Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("HitSplatDefinition_archive") + public static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + public static AbstractArchive field3350; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("HitSplatDefinition_cached") + static EvictingDualNodeHashTable HitSplatDefinition_cached; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lev;" ) - public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - public static AbstractArchive field3364; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 840460821 - ) - int fontId; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -910808373 - ) - public int textColor; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1699415327 - ) - public int field3356; + @Export("HitSplatDefinition_cachedSprites") + static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -359975217 + @ObfuscatedSignature( + descriptor = "Lev;" ) - int field3357; - @ObfuscatedName("c") + @Export("HitSplatDefinition_cachedFonts") + static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1100166573 + intValue = -815033711 ) - int field3351; - @ObfuscatedName("f") + @Export("fontId") + int fontId; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 620979093 + intValue = -1301515825 ) - int field3359; - @ObfuscatedName("y") + @Export("textColor") + public int textColor; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1746417223 + intValue = -1266638287 ) - int field3360; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1873666251 - ) - public int field3368; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1145971425 - ) - public int field3362; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1152481113 - ) - public int field3355; - @ObfuscatedName("u") - String field3361; + public int field3370; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -444433025 + intValue = -83015757 + ) + int field3360; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 651149395 + ) + int field3349; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1270434679 + ) + int field3362; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1716225461 + ) + int field3363; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 779984005 + ) + public int field3364; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -770163669 ) public int field3365; - @ObfuscatedName("b") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1573149035 + intValue = -604727169 ) public int field3366; - @ObfuscatedName("l") - public int[] transforms; - @ObfuscatedName("e") + @ObfuscatedName("d") + String field3367; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1795835533 + intValue = -1273582511 ) + public int field3361; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -991437923 + ) + public int field3351; + @ObfuscatedName("h") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1964734149 + ) + @Export("transformVarbit") int transformVarbit; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1163513145 + intValue = -1049290465 ) + @Export("transformVarp") int transformVarp; static { @@ -119,26 +131,27 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; // L: 26 this.textColor = 16777215; // L: 27 - this.field3356 = 70; // L: 28 - this.field3357 = -1; // L: 29 - this.field3351 = -1; // L: 30 - this.field3359 = -1; // L: 31 - this.field3360 = -1; // L: 32 - this.field3368 = 0; // L: 33 - this.field3362 = 0; // L: 34 - this.field3355 = -1; // L: 35 - this.field3361 = ""; // L: 36 - this.field3365 = -1; // L: 37 - this.field3366 = 0; // L: 38 + this.field3370 = 70; // L: 28 + this.field3360 = -1; // L: 29 + this.field3349 = -1; // L: 30 + this.field3362 = -1; // L: 31 + this.field3363 = -1; // L: 32 + this.field3364 = 0; // L: 33 + this.field3365 = 0; // L: 34 + this.field3366 = -1; // L: 35 + this.field3367 = ""; // L: 36 + this.field3361 = -1; // L: 37 + this.field3351 = 0; // L: 38 this.transformVarbit = -1; // L: 40 this.transformVarp = -1; // L: 41 } // L: 43 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "183277091" + descriptor = "(Lkb;I)V", + garbageValue = "738572554" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 57 @@ -150,40 +163,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-2105056828" + descriptor = "(Lkb;II)V", + garbageValue = "-403077535" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 64 - this.fontId = var1.method5634(); + this.fontId = var1.method5851(); } else if (var2 == 2) { // L: 65 this.textColor = var1.readMedium(); } else if (var2 == 3) { // L: 66 - this.field3357 = var1.method5634(); + this.field3360 = var1.method5851(); } else if (var2 == 4) { // L: 67 - this.field3359 = var1.method5634(); + this.field3362 = var1.method5851(); } else if (var2 == 5) { // L: 68 - this.field3351 = var1.method5634(); + this.field3349 = var1.method5851(); } else if (var2 == 6) { // L: 69 - this.field3360 = var1.method5634(); + this.field3363 = var1.method5851(); } else if (var2 == 7) { // L: 70 - this.field3368 = var1.readShort(); + this.field3364 = var1.readShort(); } else if (var2 == 8) { // L: 71 - this.field3361 = var1.readStringCp1252NullCircumfixed(); + this.field3367 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { // L: 72 - this.field3356 = var1.readUnsignedShort(); + this.field3370 = var1.readUnsignedShort(); } else if (var2 == 10) { // L: 73 - this.field3362 = var1.readShort(); + this.field3365 = var1.readShort(); } else if (var2 == 11) { // L: 74 - this.field3355 = 0; + this.field3366 = 0; } else if (var2 == 12) { // L: 75 - this.field3365 = var1.readUnsignedByte(); + this.field3361 = var1.readUnsignedByte(); } else if (var2 == 13) { // L: 76 - this.field3366 = var1.readShort(); + this.field3351 = var1.readShort(); } else if (var2 == 14) { - this.field3355 = var1.readUnsignedShort(); // L: 77 + this.field3366 = var1.readUnsignedShort(); // L: 77 } else if (var2 == 17 || var2 == 18) { // L: 78 this.transformVarbit = var1.readUnsignedShort(); // L: 79 if (this.transformVarbit == 65535) { // L: 80 @@ -218,15 +232,16 @@ public class HitSplatDefinition extends DualNode { } // L: 97 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Ljd;", - garbageValue = "-79" + descriptor = "(B)Ljx;", + garbageValue = "29" ) + @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; // L: 100 if (this.transformVarbit != -1) { // L: 101 - var1 = WorldMapSection1.getVarbit(this.transformVarbit); + var1 = ApproximateRouteStrategy.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 102 var1 = Varps.Varps_main[this.transformVarp]; } @@ -238,16 +253,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? MusicPatchNode.method3929(var2) : null; // L: 106 107 + return var2 != -1 ? class258.method4654(var2) : null; // L: 106 107 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "-265851490" + garbageValue = "722247792" ) + @Export("getString") public String getString(int var1) { - String var2 = this.field3361; // L: 111 + String var2 = this.field3367; // L: 111 while (true) { int var3 = var2.indexOf("%1"); // L: 113 @@ -255,26 +271,26 @@ public class HitSplatDefinition extends DualNode { return var2; // L: 117 } - var2 = var2.substring(0, var3) + ModeWhere.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 + var2 = var2.substring(0, var3) + class197.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Llp;", - garbageValue = "-339938865" + descriptor = "(I)Llc;", + garbageValue = "1144318986" ) - public Sprite method4668() { - if (this.field3357 < 0) { // L: 121 + public Sprite method4748() { + if (this.field3360 < 0) { // L: 121 return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3357); // L: 122 - if (var1 != null) { - return var1; // L: 123 + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3360); // L: 122 + if (var1 != null) { // L: 123 + return var1; } else { - var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3357, 0); // L: 124 + var1 = FloorDecoration.SpriteBuffer_getSprite(field3350, this.field3360, 0); // L: 124 if (var1 != null) { // L: 125 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3357); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3360); } return var1; // L: 127 @@ -282,22 +298,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Llp;", - garbageValue = "68117664" + descriptor = "(B)Llc;", + garbageValue = "-104" ) - public Sprite method4681() { - if (this.field3351 < 0) { // L: 131 + public Sprite method4733() { + if (this.field3349 < 0) { // L: 131 return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3351); // L: 132 - if (var1 != null) { // L: 133 - return var1; + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3349); // L: 132 + if (var1 != null) { + return var1; // L: 133 } else { - var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3351, 0); // L: 134 + var1 = FloorDecoration.SpriteBuffer_getSprite(field3350, this.field3349, 0); // L: 134 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3351); // L: 135 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3349); // L: 135 } return var1; // L: 137 @@ -305,22 +321,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Llp;", - garbageValue = "962785869" + descriptor = "(S)Llc;", + garbageValue = "1003" ) - public Sprite method4670() { - if (this.field3359 < 0) { // L: 141 + public Sprite method4731() { + if (this.field3362 < 0) { // L: 141 return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3359); // L: 142 + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3362); // L: 142 if (var1 != null) { return var1; // L: 143 } else { - var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3359, 0); // L: 144 + var1 = FloorDecoration.SpriteBuffer_getSprite(field3350, this.field3362, 0); // L: 144 if (var1 != null) { // L: 145 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3359); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3362); } return var1; // L: 147 @@ -328,22 +344,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)Llp;", - garbageValue = "-16" + descriptor = "(I)Llc;", + garbageValue = "1948931470" ) - public Sprite method4678() { - if (this.field3360 < 0) { // L: 151 + public Sprite method4727() { + if (this.field3363 < 0) { // L: 151 return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3360); // L: 152 + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3363); // L: 152 if (var1 != null) { return var1; // L: 153 } else { - var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3360, 0); // L: 154 - if (var1 != null) { // L: 155 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3360); + var1 = FloorDecoration.SpriteBuffer_getSprite(field3350, this.field3363, 0); // L: 154 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3363); // L: 155 } return var1; // L: 157 @@ -351,11 +367,12 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)Lkr;", - garbageValue = "-456462046" + descriptor = "(I)Lkq;", + garbageValue = "-1921749751" ) + @Export("getFont") public Font getFont() { if (this.fontId == -1) { // L: 161 return null; @@ -364,45 +381,31 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { // L: 163 return var1; } else { - var1 = RouteStrategy.method3688(field3364, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 164 - if (var1 != null) { // L: 165 - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); + AbstractArchive var3 = field3350; // L: 165 + AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 166 + int var5 = this.fontId; // L: 167 + byte[] var7 = var3.takeFile(var5, 0); // L: 171 + boolean var6; + if (var7 == null) { // L: 172 + var6 = false; // L: 173 + } else { + class217.SpriteBuffer_decode(var7); // L: 176 + var6 = true; // L: 177 } - return var1; // L: 167 - } - } - } + Font var2; + if (!var6) { // L: 179 + var2 = null; // L: 180 + } else { + var2 = UrlRequester.method3430(var4.takeFile(var5, 0)); // L: 183 + } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "20" - ) - static int method4698(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 1144 - var0 -= 1000; // L: 1145 - var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1146 - } else { - var3 = var2 ? Canvas.field438 : class3.field12; // L: 1148 - } + if (var2 != null) { // L: 186 + HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); + } - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { // L: 1149 - if (Interpreter.field1135 >= 10) { // L: 1150 - throw new RuntimeException(); // L: 1151 - } else if (var3.onResize == null) { // L: 1153 - return 0; - } else { - ScriptEvent var4 = new ScriptEvent(); // L: 1154 - var4.widget = var3; // L: 1155 - var4.args = var3.onResize; // L: 1156 - var4.field593 = Interpreter.field1135 + 1; // L: 1157 - Client.scriptEvents.addFirst(var4); // L: 1158 - return 1; // L: 1159 + return var2; // L: 188 } - } else { - return 2; // L: 1161 } } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index b6d4301b6a..b85020864b 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,92 +1,127 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jy") +@Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljy;" ) - field3479(1, 0), - @ObfuscatedName("k") + field3481(1, 0), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljy;" ) - HorizontalAlignment_centered(0, 1), - @ObfuscatedName("s") + @Export("HorizontalAlignment_centered") + HorizontalAlignment_centered(2, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljy;" ) - field3481(2, 2); + field3479(0, 2); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1646295401 + intValue = 1229271323 ) + @Export("value") public final int value; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1817509831 + intValue = 1995234347 ) + @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 23 + return this.id; // L: 19 } - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lky;B)V", - garbageValue = "-34" + descriptor = "(Liw;III)[Llc;", + garbageValue = "2130018574" ) - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = WorldMapLabelSize.localPlayer = Client.players[var1] = new Player(); // L: 39 - var2.index = var1; // L: 40 - int var3 = var0.readBits(30); // L: 41 - byte var4 = (byte)(var3 >> 28); // L: 42 - int var5 = var3 >> 14 & 16383; // L: 43 - int var6 = var3 & 16383; // L: 44 - var2.pathX[0] = var5 - WorldMapManager.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - WorldMapLabel.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - Huffman.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1277[var1] != null) { // L: 50 - var2.read(Players.field1277[var1]); + public static Sprite[] method4882(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 100 + boolean var3; + if (var4 == null) { // L: 101 + var3 = false; // L: 102 + } else { + class217.SpriteBuffer_decode(var4); // L: 105 + var3 = true; // L: 106 } - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1285[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 + if (!var3) { // L: 108 + return null; + } else { + Sprite[] var5 = new Sprite[class336.SpriteBuffer_spriteCount]; // L: 111 - for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 - if (var1 != var7) { // L: 56 - int var8 = var0.readBits(18); // L: 57 - int var9 = var8 >> 16; // L: 58 - int var10 = var8 >> 8 & 597; // L: 59 - int var11 = var8 & 597; // L: 60 - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 - Players.Players_orientations[var7] = 0; // L: 62 - Players.Players_targetIndices[var7] = -1; // L: 63 - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 - Players.field1285[var7] = 0; // L: 65 + for (int var6 = 0; var6 < class336.SpriteBuffer_spriteCount; ++var6) { // L: 112 + Sprite var7 = var5[var6] = new Sprite(); // L: 113 + var7.width = class336.SpriteBuffer_spriteWidth; // L: 114 + var7.height = class336.SpriteBuffer_spriteHeight; // L: 115 + var7.xOffset = class336.SpriteBuffer_xOffsets[var6]; // L: 116 + var7.yOffset = class225.SpriteBuffer_yOffsets[var6]; // L: 117 + var7.subWidth = class336.SpriteBuffer_spriteWidths[var6]; // L: 118 + var7.subHeight = class336.SpriteBuffer_spriteHeights[var6]; // L: 119 + int var8 = var7.subHeight * var7.subWidth; // L: 120 + byte[] var9 = class13.SpriteBuffer_pixels[var6]; // L: 121 + var7.pixels = new int[var8]; // L: 122 + + for (int var10 = 0; var10 < var8; ++var10) { // L: 123 + var7.pixels[var10] = WorldMapID.SpriteBuffer_spritePalette[var9[var10] & 255]; + } } + + class336.SpriteBuffer_xOffsets = null; // L: 126 + class225.SpriteBuffer_yOffsets = null; // L: 127 + class336.SpriteBuffer_spriteWidths = null; // L: 128 + class336.SpriteBuffer_spriteHeights = null; // L: 129 + WorldMapID.SpriteBuffer_spritePalette = null; // L: 130 + class13.SpriteBuffer_pixels = null; // L: 131 + return var5; // L: 135 + } + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-874256905" + ) + static int method4876(int var0, int var1) { + int var2 = var1 - 334; // L: 5436 + if (var2 < 0) { // L: 5437 + var2 = 0; + } else if (var2 > 100) { // L: 5438 + var2 = 100; } - var0.exportIndex(); // L: 67 - } // L: 68 + int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5439 + return var0 * var3 / 256; // L: 5440 + } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1158098047" + ) + static final String method4880(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 9990 9991 + } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index becc3886c9..b8c39c1512 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,26 +1,19 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hi") +@Implements("Huffman") public class Huffman { - @ObfuscatedName("o") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("du") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive8; - @ObfuscatedName("kk") - @ObfuscatedGetter( - intValue = 360288727 - ) - static int Client_plane; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("masks") int[] masks; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("bits") byte[] bits; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("keys") int[] keys; public Huffman(byte[] var1) { @@ -33,10 +26,10 @@ public class Huffman { for (int var5 = 0; var5 < var2; ++var5) { // L: 15 byte var6 = var1[var5]; // L: 16 - if (var6 != 0) { - int var7 = 1 << 32 - var6; - int var8 = var3[var6]; - this.masks[var5] = var8; + if (var6 != 0) { // L: 17 + int var7 = 1 << 32 - var6; // L: 18 + int var8 = var3[var6]; // L: 19 + this.masks[var5] = var8; // L: 20 int var9; int var10; int var11; @@ -58,14 +51,14 @@ public class Huffman { break; } - var3[var10] = var11 | var12; + var3[var10] = var11 | var12; // L: 33 } } - var3[var6] = var9; + var3[var6] = var9; // L: 38 - for (var10 = var6 + 1; var10 <= 32; ++var10) { - if (var8 == var3[var10]) { + for (var10 = var6 + 1; var10 <= 32; ++var10) { // L: 39 + if (var8 == var3[var10]) { // L: 40 var3[var10] = var9; } } @@ -106,11 +99,12 @@ public class Huffman { } // L: 60 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "-141428387" + garbageValue = "-1847376111" ) + @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { int var6 = 0; // L: 63 int var7 = var5 << 3; // L: 64 @@ -126,7 +120,7 @@ public class Huffman { int var11 = var7 >> 3; // L: 71 int var12 = var7 & 7; // L: 72 var6 &= -var12 >> 31; // L: 73 - int var13 = (var12 + var10 - 1 >> 3) + var11; // L: 74 + int var13 = (var10 + var12 - 1 >> 3) + var11; // L: 74 var12 += 24; // L: 76 var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77 if (var11 < var13) { // L: 78 @@ -156,11 +150,12 @@ public class Huffman { return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "-238004531" + garbageValue = "-1101500142" ) + @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { if (var5 == 0) { // L: 101 return 0; @@ -270,26 +265,26 @@ public class Huffman { if ((var9 = this.keys[var6]) < 0) { // L: 152 var3[var4++] = (byte)(~var9); // L: 153 - if (var4 >= var5) { + if (var4 >= var5) { // L: 154 break; } - var6 = 0; + var6 = 0; // L: 155 } if ((var8 & 1) != 0) { - var6 = this.keys[var6]; + var6 = this.keys[var6]; // L: 157 } else { - ++var6; + ++var6; // L: 158 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 159 + var3[var4++] = (byte)(~var9); // L: 160 + if (var4 >= var5) { // L: 161 break; } - var6 = 0; + var6 = 0; // L: 162 } ++var7; // L: 105 @@ -299,76 +294,13 @@ public class Huffman { } } - @ObfuscatedName("k") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1277930744" + descriptor = "(ZI)V", + garbageValue = "-1189529622" ) - public static void method4047(int var0, int var1) { - VarbitDefinition var2 = TaskHandler.method3567(var0); // L: 33 - int var3 = var2.baseVar; // L: 34 - int var4 = var2.startBit; // L: 35 - int var5 = var2.endBit; // L: 36 - int var6 = Varps.Varps_masks[var5 - var4]; // L: 37 - if (var1 < 0 || var1 > var6) { // L: 38 - var1 = 0; - } - - var6 <<= var4; // L: 39 - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40 - } // L: 41 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "81" - ) - public static int method4041(int var0, int var1, int var2) { - var2 &= 3; // L: 17 - if (var2 == 0) { // L: 18 - return var1; - } else if (var2 == 1) { // L: 19 - return 7 - var0; - } else { - return var2 == 2 ? 7 - var1 : var0; // L: 20 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "2" - ) - public static String method4049(String var0) { - int var1 = var0.length(); // L: 154 - char[] var2 = new char[var1]; // L: 155 - byte var3 = 2; // L: 156 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 157 - char var5 = var0.charAt(var4); // L: 158 - if (var3 == 0) { // L: 159 - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 160 - var5 = UserList.method5199(var5); - } - - if (Character.isLetter(var5)) { // L: 161 - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 162 - if (Character.isSpaceChar(var5)) { // L: 163 - if (var3 != 2) { // L: 164 - var3 = 1; - } - } else { - var3 = 1; // L: 166 - } - } else { - var3 = 2; - } - - var2[var4] = var5; // L: 167 - } - - return new String(var2); // L: 169 - } + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 10334 + } // L: 10335 } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 02a93f206a..4319c887b0 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -1,51 +1,52 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("ke") +@Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("rj") - @ObfuscatedGetter( - intValue = -1974595173 - ) - static int field3620; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) + @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lmu;)V" + descriptor = "(Lmc;)V" ) public IgnoreList(LoginType var1) { super(400); // L: 12 - this.loginType = var1; + this.loginType = var1; // L: 13 } // L: 14 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Ljc;", - garbageValue = "35" + descriptor = "(I)Ljh;", + garbageValue = "-1664145399" ) + @Export("newInstance") User newInstance() { return new Ignored(); // L: 17 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)[Ljc;", - garbageValue = "-19" + descriptor = "(IB)[Ljh;", + garbageValue = "-35" ) + @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; // L: 21 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;IB)V", - garbageValue = "-55" + descriptor = "(Lkb;IB)V", + garbageValue = "0" ) + @Export("read") public void read(Buffer var1, int var2) { while (true) { if (var1.offset < var2) { // L: 25 @@ -86,13 +87,4 @@ public class IgnoreList extends UserList { return; // L: 54 } } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)[Lij;", - garbageValue = "1485577751" - ) - static GameBuild[] method5182() { - return new GameBuild[]{GameBuild.LIVE, GameBuild.WIP, GameBuild.RC, GameBuild.BUILDLIVE}; // L: 13 - } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 98c4c3f766..e87a28bb7c 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -1,32 +1,43 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("kt") +@Implements("Ignored") public class Ignored extends User { @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1266323763 + intValue = -235599993 ) + static int field3637; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 421043005 + ) + @Export("id") int id; Ignored() { } // L: 6 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkk;I)I", - garbageValue = "1464728446" + descriptor = "(Lkt;I)I", + garbageValue = "1931682757" ) + @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } - @ObfuscatedName("ar") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljc;I)I", - garbageValue = "-243007320" + descriptor = "(Ljh;B)I", + garbageValue = "69" ) + @Export("compareTo_user") public int compareTo_user(User var1) { return this.compareTo_ignored((Ignored)var1); // L: 13 } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 78ea51ead0..3a8ee249bc 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -1,28 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ls") +@ObfuscatedName("le") +@Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("pixels") public byte[] pixels; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("palette") public int[] palette; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("subWidth") public int subWidth; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("subHeight") public int subHeight; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("xOffset") public int xOffset; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("yOffset") public int yOffset; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("width") public int width; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("height") public int height; IndexedSprite() { } // L: 15 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 byte[] var1 = new byte[this.width * this.height]; // L: 19 @@ -42,7 +54,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 31 - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 int var5 = this.palette[var4] >> 16 & 255; // L: 35 @@ -74,7 +87,8 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 var2 += this.yOffset; // L: 53 @@ -119,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("i") - public void method6217(int var1, int var2, int var3, int var4) { + @ObfuscatedName("z") + public void method6247(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; // L: 116 int var6 = this.subHeight; // L: 117 int var7 = 0; // L: 118 @@ -181,7 +195,8 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 } // L: 158 - @ObfuscatedName("t") + @ObfuscatedName("m") + @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); // L: 88 var5 = -(var5 & 3); // L: 89 @@ -234,7 +249,8 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 113 - @ObfuscatedName("o") + @ObfuscatedName("q") + @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; // L: 161 diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 4f99d95e7e..f077ce6c37 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -1,88 +1,116 @@ 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("dz") +@ObfuscatedName("dk") +@Implements("Instrument") public class Instrument { - @ObfuscatedName("y") + @ObfuscatedName("s") + @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("v") - static int[] Instrument_noise; @ObfuscatedName("j") + @Export("Instrument_noise") + static int[] Instrument_noise; + @ObfuscatedName("w") + @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("u") + @ObfuscatedName("d") + @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("p") + @ObfuscatedName("a") + @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("b") + @ObfuscatedName("g") + @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("l") + @ObfuscatedName("h") + @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("e") + @ObfuscatedName("i") + @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + @Export("pitch") + SoundEnvelope pitch; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + @Export("volume") + SoundEnvelope volume; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + @Export("pitchModifier") + SoundEnvelope pitchModifier; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + @Export("pitchModifierAmplitude") + SoundEnvelope pitchModifierAmplitude; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ldw;" - ) - SoundEnvelope pitch; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - SoundEnvelope volume; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - SoundEnvelope pitchModifier; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Lda;" ) + @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - SoundEnvelope release; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ldw;" - ) - SoundEnvelope attack; - @ObfuscatedName("g") - int[] oscillatorVolume; - @ObfuscatedName("m") - int[] oscillatorPitch; - @ObfuscatedName("n") - int[] oscillatorDelays; - @ObfuscatedName("d") - int delayTime; - @ObfuscatedName("h") - int delayDecay; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - AudioFilter filter; @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Lda;" ) - SoundEnvelope filterEnvelope; + @Export("volumeMultiplierAmplitude") + SoundEnvelope volumeMultiplierAmplitude; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + @Export("release") + SoundEnvelope release; @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + @Export("attack") + SoundEnvelope attack; + @ObfuscatedName("u") + @Export("oscillatorVolume") + int[] oscillatorVolume; + @ObfuscatedName("t") + @Export("oscillatorPitch") + int[] oscillatorPitch; + @ObfuscatedName("e") + @Export("oscillatorDelays") + int[] oscillatorDelays; + @ObfuscatedName("o") + @Export("delayTime") + int delayTime; + @ObfuscatedName("n") + @Export("delayDecay") + int delayDecay; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Ldt;" + ) + @Export("filter") + AudioFilter filter; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lda;" + ) + @Export("filterEnvelope") + SoundEnvelope filterEnvelope; + @ObfuscatedName("r") + @Export("duration") int duration; - @ObfuscatedName("f") + @ObfuscatedName("y") + @Export("offset") int offset; static { @@ -118,9 +146,10 @@ public class Instrument { this.offset = 0; // L: 25 } // L: 50 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("synthesize") final int[] synthesize(int var1, int var2) { - class310.clearIntArray(Instrument_samples, 0, var1); // L: 53 + class311.clearIntArray(Instrument_samples, 0, var1); // L: 53 if (var2 < 10) { // L: 54 return Instrument_samples; } else { @@ -324,7 +353,8 @@ public class Instrument { } } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 return (var1 & 32767) < 16384 ? var2 : -var2; // L: 180 181 @@ -337,10 +367,11 @@ public class Instrument { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) + @Export("decode") final void decode(Buffer var1) { this.pitch = new SoundEnvelope(); // L: 190 this.pitch.decode(var1); // L: 191 @@ -390,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); // L: 228 this.filter = new AudioFilter(); // L: 229 this.filterEnvelope = new SoundEnvelope(); // L: 230 - this.filter.method2809(var1, this.filterEnvelope); // L: 231 + this.filter.method2844(var1, this.filterEnvelope); // L: 231 } // L: 232 } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 0f1749c2e2..4bdd1f27d0 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -1,14 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mj") +@Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("qy") - @ObfuscatedSignature( - descriptor = "Ldr;" - ) - static PcmPlayer pcmPlayer1; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("array") int[] array; public IntHashTable(int[] var1) { @@ -33,11 +32,12 @@ public class IntHashTable { } // L: 17 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1243310529" + garbageValue = "1541928585" ) + @Export("get") public int get(int var1) { int var2 = (this.array.length >> 1) - 1; // L: 20 int var3 = var1 & var2; // L: 21 diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 6f6444c3de..bac7ab13a7 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -1,8 +1,12 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gv") +@ObfuscatedName("gh") +@Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("integer") public int integer; public IntegerNode(int var1) { diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index ea215bca7e..c0227a9c9f 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -1,22 +1,307 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bs") +@Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1616122647 + @ObfuscatedName("qm") + @ObfuscatedSignature( + descriptor = "Llc;" ) + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhj;" + ) + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1986621351 + ) + @Export("group") int group; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1330314565 + intValue = -41526563 ) + @Export("type") int type; - @ObfuscatedName("s") - boolean field580; + @ObfuscatedName("l") + boolean field596; InterfaceParent() { - this.field580 = false; // L: 8 + this.field596 = false; // L: 8 } // L: 10 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIIIIII)I", + garbageValue = "-2067928817" + ) + public static int method1272(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 38 + int var6 = var3; // L: 39 + var3 = var4; // L: 40 + var4 = var6; // L: 41 + } + + var2 &= 3; // L: 43 + if (var2 == 0) { // L: 44 + return var1; + } else if (var2 == 1) { // L: 45 + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 46 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1980231219" + ) + public static void method1270() { + try { + JagexCache.JagexCache_dat2File.close(); // L: 338 + + for (int var0 = 0; var0 < class297.idxCount; ++var0) { // L: 339 + JagexCache.JagexCache_idxFiles[var0].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 340 + JagexCache.JagexCache_randomDat.close(); // L: 341 + } catch (Exception var2) { // L: 343 + } + + } // L: 344 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-425142787" + ) + static int method1271(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1129 - 7.0D) * 256.0D); // L: 3197 + } + + @ObfuscatedName("fz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-271325074" + ) + static final void method1269() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { // L: 3775 + var0 = PlayerType.localPlayer.x; // L: 3776 + var1 = PlayerType.localPlayer.y; // L: 3777 + if (TileItem.oculusOrbFocalPointX - var0 < -500 || TileItem.oculusOrbFocalPointX - var0 > 500 || Interpreter.oculusOrbFocalPointY - var1 < -500 || Interpreter.oculusOrbFocalPointY - var1 > 500) { // L: 3778 + TileItem.oculusOrbFocalPointX = var0; // L: 3779 + Interpreter.oculusOrbFocalPointY = var1; // L: 3780 + } + + if (var0 != TileItem.oculusOrbFocalPointX) { // L: 3782 + TileItem.oculusOrbFocalPointX += (var0 - TileItem.oculusOrbFocalPointX) / 16; + } + + if (var1 != Interpreter.oculusOrbFocalPointY) { // L: 3783 + Interpreter.oculusOrbFocalPointY += (var1 - Interpreter.oculusOrbFocalPointY) / 16; + } + + var2 = TileItem.oculusOrbFocalPointX >> 7; // L: 3784 + var3 = Interpreter.oculusOrbFocalPointY >> 7; // L: 3785 + var4 = GrandExchangeOfferWorldComparator.getTileHeight(TileItem.oculusOrbFocalPointX, Interpreter.oculusOrbFocalPointY, GrandExchangeOfferUnitPriceComparator.Client_plane); // L: 3786 + var5 = 0; // L: 3787 + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3788 + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3789 + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3790 + int var8 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 3791 + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3792 + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3793 + if (var9 > var5) { // L: 3794 + var5 = var9; + } + } + } + } + + var6 = var5 * 192; // L: 3798 + if (var6 > 98048) { // L: 3799 + var6 = 98048; + } + + if (var6 < 32768) { // L: 3800 + var6 = 32768; + } + + if (var6 > Client.field810) { // L: 3801 + Client.field810 += (var6 - Client.field810) / 24; + } else if (var6 < Client.field810) { // L: 3802 + Client.field810 += (var6 - Client.field810) / 80; + } + + Tiles.field542 = GrandExchangeOfferWorldComparator.getTileHeight(PlayerType.localPlayer.x, PlayerType.localPlayer.y, GrandExchangeOfferUnitPriceComparator.Client_plane) - Client.camFollowHeight; // L: 3803 + } else if (Client.oculusOrbState == 1) { // L: 3805 + if (Client.field725 && PlayerType.localPlayer != null) { // L: 3807 + var0 = PlayerType.localPlayer.pathX[0]; // L: 3808 + var1 = PlayerType.localPlayer.pathY[0]; // L: 3809 + if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { // L: 3810 + TileItem.oculusOrbFocalPointX = PlayerType.localPlayer.x; // L: 3811 + var2 = GrandExchangeOfferWorldComparator.getTileHeight(PlayerType.localPlayer.x, PlayerType.localPlayer.y, GrandExchangeOfferUnitPriceComparator.Client_plane) - Client.camFollowHeight; // L: 3812 + if (var2 < Tiles.field542) { // L: 3813 + Tiles.field542 = var2; + } + + Interpreter.oculusOrbFocalPointY = PlayerType.localPlayer.y; // L: 3814 + Client.field725 = false; // L: 3815 + } + } + + short var10 = -1; // L: 3818 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3819 + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3820 + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3821 + if (var10 == 0) { // L: 3822 + var10 = 1792; + } else if (var10 == 1024) { // L: 3823 + var10 = 1280; + } else { + var10 = 1536; // L: 3824 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3826 + if (var10 == 0) { // L: 3827 + var10 = 256; + } else if (var10 == 1024) { // L: 3828 + var10 = 768; + } else { + var10 = 512; // L: 3829 + } + } + + byte var11 = 0; // L: 3831 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3832 + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3833 + var11 = 1; + } + + var2 = 0; // L: 3834 + if (var10 >= 0 || var11 != 0) { // L: 3835 + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * -285231223 * 1077669561 : Client.oculusOrbNormalSpeed * -1776720113 * 588425199; // L: 3836 + var2 *= 16; // L: 3837 + Client.field759 = var10; // L: 3838 + Client.field760 = var11; // L: 3839 + } + + if (Client.field692 < var2) { // L: 3841 + Client.field692 += var2 / 8; // L: 3842 + if (Client.field692 > var2) { // L: 3843 + Client.field692 = var2; + } + } else if (Client.field692 > var2) { // L: 3845 + Client.field692 = Client.field692 * 9 / 10; + } + + if (Client.field692 > 0) { // L: 3846 + var3 = Client.field692 / 16; // L: 3847 + if (Client.field759 >= 0) { // L: 3848 + var0 = Client.field759 - ViewportMouse.cameraYaw & 2047; // L: 3849 + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3850 + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3851 + TileItem.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3852 + Interpreter.oculusOrbFocalPointY += var5 * var3 / 65536; // L: 3853 + } + + if (Client.field760 != 0) { // L: 3855 + Tiles.field542 += var3 * Client.field760; // L: 3856 + if (Tiles.field542 > 0) { // L: 3857 + Tiles.field542 = 0; + } + } + } else { + Client.field759 = -1; // L: 3861 + Client.field760 = -1; // L: 3862 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3864 + LoginScreenAnimation.method1945(); // L: 3865 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && MusicPatchNode.mouseCam) { // L: 3868 + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3869 + Client.camAngleDX = var0 * 2; // L: 3870 + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 990882725 * -581221331; // L: 3871 + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3872 + Client.camAngleDY = var1 * 2; // L: 3873 + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * -2115208813 * 219319451; // L: 3874 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3877 + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3878 + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; // L: 3879 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3880 + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3881 + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; // L: 3882 + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3883 + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3884 + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3886 + Client.camAngleX += Client.camAngleDX / 2; // L: 3887 + if (Client.camAngleX < 128) { // L: 3888 + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { // L: 3889 + Client.camAngleX = 383; + } + + } // L: 3890 + + @ObfuscatedName("iw") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "218474433" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 9845 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9846 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9847 + } + + if (var1.length() > 9) { // L: 9849 + return " " + Client.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + Client.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + Client.colorStartTag(16776960) + var1 + ""; // L: 9850 9851 + } + } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 7487dc7d71..8827fab131 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -1,49 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ci") +@Implements("Interpreter") public class Interpreter { - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; - @ObfuscatedName("i") + @ObfuscatedName("m") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("z") + @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("Interpreter_intStack") static int[] Interpreter_intStack; + @ObfuscatedName("u") + @Export("Interpreter_stringStack") + static String[] Interpreter_stringStack; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1142529175 + ) + @Export("Interpreter_frameDepth") + static int Interpreter_frameDepth; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Lbm;" + ) + @Export("Interpreter_frames") + static ScriptFrame[] Interpreter_frames; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + static Widget field1122; + @ObfuscatedName("p") + @Export("Interpreter_calendar") + static java.util.Calendar Interpreter_calendar; + @ObfuscatedName("r") + @Export("Interpreter_MONTHS") + static final String[] Interpreter_MONTHS; + @ObfuscatedName("s") + static boolean field1130; + @ObfuscatedName("j") + static boolean field1128; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1375275397 + intValue = -356581693 ) - static int Interpreter_intStackSize; + static int field1119; @ObfuscatedName("g") - static String[] Interpreter_stringStack; - @ObfuscatedName("n") + static final double field1129; + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = -800989913 + intValue = -44620435 ) - static int Interpreter_frameDepth; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "[Lba;" - ) - static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("q") - static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("c") - static final String[] Interpreter_MONTHS; - @ObfuscatedName("y") - static boolean field1131; - @ObfuscatedName("v") - static boolean field1132; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -387233075 - ) - static int field1135; - @ObfuscatedName("b") - static final double field1120; + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; static { Interpreter_arrayLengths = new int[5]; // L: 68 @@ -54,9 +75,84 @@ public class Interpreter { Interpreter_frames = new ScriptFrame[50]; // L: 75 Interpreter_calendar = java.util.Calendar.getInstance(); // L: 78 Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 81 - field1131 = false; // L: 84 - field1132 = false; // L: 85 - field1135 = 0; // L: 86 - field1120 = Math.log(2.0D); // L: 90 + field1130 = false; // L: 84 + field1128 = false; // L: 85 + field1119 = 0; // L: 86 + field1129 = Math.log(2.0D); // L: 90 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-1431393393" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 106 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 107 + char var7 = var0.charAt(var6 + var1); // L: 108 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 109 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 110 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 111 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 112 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 113 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 114 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 115 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 116 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 117 + } else if (var7 == 8240) { // L: 118 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 119 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 120 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 121 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 122 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 123 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 124 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 125 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 126 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 127 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 128 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; // L: 129 + } else if (var7 == 732) { // L: 130 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 131 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 132 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 133 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 134 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 135 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 136 + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; // L: 137 + } + } + + return var5; // L: 139 } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index c1db324bdc..f111c260e1 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,23 +1,35 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("it") +@Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("InvDefinition_archive") static AbstractArchive InvDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) + @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("me") @ObfuscatedGetter( - intValue = 1545647129 + intValue = 1335589657 ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -2004662257 + ) + @Export("size") public int size; static { @@ -28,11 +40,12 @@ public class InvDefinition extends DualNode { this.size = 0; // L: 12 } // L: 14 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-1963217868" + descriptor = "(Lkb;I)V", + garbageValue = "1021098633" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 32 @@ -44,11 +57,12 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-1931159207" + descriptor = "(Lkb;IS)V", + garbageValue = "-6183" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 2) { // L: 39 this.size = var1.readUnsignedShort(); @@ -56,27 +70,33 @@ public class InvDefinition extends DualNode { } // L: 41 - @ObfuscatedName("g") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lls;", - garbageValue = "-1532284396" + descriptor = "(Lkb;Lll;I)Lll;", + garbageValue = "-1253554841" ) - public static IndexedSprite method4448() { - IndexedSprite var0 = new IndexedSprite(); // L: 178 - var0.width = class335.SpriteBuffer_spriteWidth; // L: 179 - var0.height = class335.SpriteBuffer_spriteHeight; // L: 180 - var0.xOffset = Username.SpriteBuffer_xOffsets[0]; // L: 181 - var0.yOffset = class335.SpriteBuffer_yOffsets[0]; // L: 182 - var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; // L: 183 - var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; // L: 184 - var0.palette = TaskHandler.SpriteBuffer_spritePalette; // L: 185 - var0.pixels = class92.SpriteBuffer_pixels[0]; // L: 186 - Username.SpriteBuffer_xOffsets = null; // L: 188 - class335.SpriteBuffer_yOffsets = null; // L: 189 - class335.SpriteBuffer_spriteWidths = null; // L: 190 - class335.SpriteBuffer_spriteHeights = null; // L: 191 - TaskHandler.SpriteBuffer_spritePalette = null; // L: 192 - class92.SpriteBuffer_pixels = null; // L: 193 - return var0; // L: 195 + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = WorldMapData_0.method266(var2); // L: 18 + var1 = new IterableNodeHashTable(var3); // L: 19 + } + + for (var3 = 0; var3 < var2; ++var3) { // L: 21 + boolean var4 = var0.readUnsignedByte() == 1; // L: 22 + int var5 = var0.readMedium(); // L: 23 + Object var6; + if (var4) { // L: 25 + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); // L: 26 + } + + var1.put((Node)var6, (long)var5); // L: 27 + } + + return var1; // L: 29 } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index c2cbefc6b5..d31bcdc3ea 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -1,37 +1,41 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("mh") +@Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("r") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1897659753 - ) - static int loginBoxCenter; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -2032699001 + intValue = -2050447103 ) + @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("results") int[] results; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("mm") int[] mm; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 438764975 + intValue = -48330509 ) + @Export("aa") int aa; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 704852085 + intValue = 2064502829 ) + @Export("bb") int bb; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 208618071 + intValue = -2077653301 ) + @Export("cc") int cc; public IsaacCipher(int[] var1) { @@ -42,14 +46,15 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; // L: 18 } - this.method6384(); // L: 20 + this.method6413(); // L: 20 } // L: 21 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "940858488" + garbageValue = "1820691051" ) + @Export("nextInt") public final int nextInt() { if (this.valuesRemaining == 0) { // L: 24 this.generateMoreResults(); // L: 25 @@ -59,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1337220040" + garbageValue = "112186522" ) - public final int method6394() { + public final int method6417() { if (this.valuesRemaining == 0) { // L: 32 this.generateMoreResults(); // L: 33 this.valuesRemaining = 256; // L: 34 @@ -73,11 +78,12 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "388315820" + descriptor = "(B)V", + garbageValue = "89" ) + @Export("generateMoreResults") final void generateMoreResults() { this.bb += ++this.cc; // L: 43 @@ -103,12 +109,12 @@ public final class IsaacCipher { } // L: 58 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "270001482" + garbageValue = "-2058123781" ) - final void method6384() { + final void method6413() { int var9 = -1640531527; // L: 70 int var8 = -1640531527; // L: 71 int var7 = -1640531527; // L: 72 diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 2722ffa414..1f77039141 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,29 +1,45 @@ +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("bb") +@ObfuscatedName("bv") +@Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("sf") - @ObfuscatedGetter( - longValue = 6214484709053611949L - ) - static long field553; - @ObfuscatedName("z") + @ObfuscatedName("nn") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "[Lht;" ) + static Widget[] field572; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("dk") - @ObfuscatedSignature( - descriptor = "Lln;" + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1891201755 ) - static AbstractSocket js5Socket; - @ObfuscatedName("ec") - static String worldHost; - @ObfuscatedName("k") + static int field570; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -390637403 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("hu") + @ObfuscatedGetter( + intValue = -966847555 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("b") + @Export("ids") int[] ids; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("quantities") int[] quantities; static { @@ -35,46 +51,447 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; // L: 9 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lgb;", - garbageValue = "1985186614" + descriptor = "(III)Lht;", + garbageValue = "-398427140" ) - static PacketBufferNode method1226() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = UserComparator4.getWidget(var0); // L: 205 + if (var1 == -1) { // L: 206 + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 207 208 + } } - @ObfuscatedName("jh") + @ObfuscatedName("gs") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-22" + descriptor = "(IIIII)V", + garbageValue = "535558525" ) - static final void method1213() { - PacketBufferNode var0 = Client.getPacketBufferNode(ClientPacket.field2336, Client.packetWriter.isaacCipher); // L: 10474 - Client.packetWriter.addNode(var0); // L: 10475 + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 4450 + class200.method3804(); // L: 4451 + if (Client.renderSelf) { // L: 4453 + ArchiveLoader.addPlayerToScene(PlayerType.localPlayer, false); // L: 4454 + } - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 10476 - if (var1.type == 0 || var1.type == 3) { // L: 10477 - class58.closeInterface(var1, true); + Projectile.method2226(); // L: 4457 + GrandExchangeOfferNameComparator.addNpcsToScene(true); // L: 4458 + MusicPatchNode.method3973(); // L: 4459 + GrandExchangeOfferNameComparator.addNpcsToScene(false); // L: 4460 + Login.method2200(); // L: 4461 + MouseRecorder.method1285(); // L: 4462 + Coord.setViewportShape(var0, var1, var2, var3, true); // L: 4463 + var0 = Client.viewportOffsetX; // L: 4464 + var1 = Client.viewportOffsetY; // L: 4465 + var2 = Client.viewportWidth; // L: 4466 + var3 = Client.viewportHeight; // L: 4467 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4468 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4469 + int var4; + int var5; + if (!Client.isCameraLocked) { // L: 4470 + var4 = Client.camAngleX; // L: 4471 + if (Client.field810 / 256 > var4) { // L: 4472 + var4 = Client.field810 / 256; + } + + if (Client.field926[4] && Client.field928[4] + 128 > var4) { // L: 4473 + var4 = Client.field928[4] + 128; + } + + var5 = Client.camAngleY & 2047; // L: 4474 + class7.method112(TileItem.oculusOrbFocalPointX, Tiles.field542, Interpreter.oculusOrbFocalPointY, var4, var5, MilliClock.method3587(var4), var3); // L: 4475 + } + + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + if (!Client.isCameraLocked) { // L: 4478 + if (GrandExchangeOfferAgeComparator.clientPreferences.roofsHidden) { // L: 4481 + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 4482 + } else { + label544: { + var6 = 3; // L: 4485 + if (World.cameraPitch < 310) { // L: 4486 + if (Client.oculusOrbState == 1) { // L: 4489 + var7 = TileItem.oculusOrbFocalPointX >> 7; // L: 4490 + var8 = Interpreter.oculusOrbFocalPointY >> 7; // L: 4491 + } else { + var7 = PlayerType.localPlayer.x >> 7; // L: 4494 + var8 = PlayerType.localPlayer.y >> 7; // L: 4495 + } + + var9 = cameraX >> 7; // L: 4497 + var10 = WorldMapManager.cameraZ >> 7; // L: 4498 + if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { // L: 4499 + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 4500 + break label544; // L: 4501 + } + + if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { // L: 4503 + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 4504 + break label544; // L: 4505 + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferUnitPriceComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4507 + var6 = GrandExchangeOfferUnitPriceComparator.Client_plane; + } + + if (var7 > var9) { // L: 4509 + var11 = var7 - var9; + } else { + var11 = var9 - var7; // L: 4510 + } + + if (var8 > var10) { // L: 4512 + var12 = var8 - var10; + } else { + var12 = var10 - var8; // L: 4513 + } + + if (var11 > var12) { // L: 4514 + var13 = var12 * 65536 / var11; // L: 4515 + var14 = 32768; // L: 4516 + + while (var7 != var9) { // L: 4517 + if (var9 < var7) { // L: 4518 + ++var9; + } else if (var9 > var7) { // L: 4519 + --var9; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferUnitPriceComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4520 + var6 = GrandExchangeOfferUnitPriceComparator.Client_plane; + } + + var14 += var13; // L: 4521 + if (var14 >= 65536) { // L: 4522 + var14 -= 65536; // L: 4523 + if (var10 < var8) { // L: 4524 + ++var10; + } else if (var10 > var8) { // L: 4525 + --var10; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferUnitPriceComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4526 + var6 = GrandExchangeOfferUnitPriceComparator.Client_plane; + } + } + } + } else if (var12 > 0) { // L: 4530 + var13 = var11 * 65536 / var12; // L: 4531 + var14 = 32768; // L: 4532 + + while (var8 != var10) { // L: 4533 + if (var10 < var8) { // L: 4534 + ++var10; + } else if (var10 > var8) { // L: 4535 + --var10; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferUnitPriceComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4536 + var6 = GrandExchangeOfferUnitPriceComparator.Client_plane; + } + + var14 += var13; // L: 4537 + if (var14 >= 65536) { // L: 4538 + var14 -= 65536; // L: 4539 + if (var9 < var7) { // L: 4540 + ++var9; + } else if (var9 > var7) { // L: 4541 + --var9; + } + + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferUnitPriceComparator.Client_plane][var9][var10] & 4) != 0) { // L: 4542 + var6 = GrandExchangeOfferUnitPriceComparator.Client_plane; + } + } + } + } + } + + if (PlayerType.localPlayer.x >= 0 && PlayerType.localPlayer.y >= 0 && PlayerType.localPlayer.x < 13312 && PlayerType.localPlayer.y < 13312) { // L: 4547 + if ((Tiles.Tiles_renderFlags[GrandExchangeOfferUnitPriceComparator.Client_plane][PlayerType.localPlayer.x >> 7][PlayerType.localPlayer.y >> 7] & 4) != 0) { // L: 4551 + var6 = GrandExchangeOfferUnitPriceComparator.Client_plane; + } + + var5 = var6; // L: 4552 + } else { + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 4548 + } + } + } + + var4 = var5; // L: 4554 + } else { + if (GrandExchangeOfferAgeComparator.clientPreferences.roofsHidden) { // L: 4559 + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 4560 + } else { + var6 = GrandExchangeOfferWorldComparator.getTileHeight(cameraX, WorldMapManager.cameraZ, GrandExchangeOfferUnitPriceComparator.Client_plane); // L: 4563 + if (var6 - ChatChannel.cameraY < 800 && (Tiles.Tiles_renderFlags[GrandExchangeOfferUnitPriceComparator.Client_plane][cameraX >> 7][WorldMapManager.cameraZ >> 7] & 4) != 0) { // L: 4564 + var5 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 4565 + } else { + var5 = 3; // L: 4568 + } + } + + var4 = var5; // L: 4570 + } + + var5 = cameraX; // L: 4572 + var6 = ChatChannel.cameraY; // L: 4573 + var7 = WorldMapManager.cameraZ; // L: 4574 + var8 = World.cameraPitch; // L: 4575 + var9 = ViewportMouse.cameraYaw; // L: 4576 + + for (var10 = 0; var10 < 5; ++var10) { // L: 4577 + if (Client.field926[var10]) { // L: 4578 + var11 = (int)(Math.random() * (double)(Client.field927[var10] * 2 + 1) - (double)Client.field927[var10] + Math.sin((double)Client.field918[var10] * ((double)Client.field898[var10] / 100.0D)) * (double)Client.field928[var10]); // L: 4579 + if (var10 == 0) { // L: 4580 + cameraX += var11; + } + + if (var10 == 1) { // L: 4581 + ChatChannel.cameraY += var11; + } + + if (var10 == 2) { // L: 4582 + WorldMapManager.cameraZ += var11; + } + + if (var10 == 3) { // L: 4583 + ViewportMouse.cameraYaw = var11 + ViewportMouse.cameraYaw & 2047; + } + + if (var10 == 4) { // L: 4584 + World.cameraPitch += var11; // L: 4585 + if (World.cameraPitch < 128) { // L: 4586 + World.cameraPitch = 128; + } + + if (World.cameraPitch > 383) { // L: 4587 + World.cameraPitch = 383; + } + } } } - if (Client.meslayerContinueWidget != null) { // L: 10479 - class52.invalidateWidget(Client.meslayerContinueWidget); // L: 10480 - Client.meslayerContinueWidget = null; // L: 10481 + var10 = MouseHandler.MouseHandler_x; // L: 4591 + var11 = MouseHandler.MouseHandler_y; // L: 4592 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4593 + var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4594 + var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4595 } - } // L: 10483 - - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-158946213" - ) - static void method1225() { - if (Client.oculusOrbState == 1) { // L: 10880 - Client.field759 = true; // L: 10881 + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4597 + var12 = var10 - var0; // L: 4598 + var13 = var11 - var1; // L: 4599 + ViewportMouse.ViewportMouse_x = var12; // L: 4601 + ViewportMouse.ViewportMouse_y = var13; // L: 4602 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 4603 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 4604 + ViewportMouse.ViewportMouse_false0 = false; // L: 4605 + } else { + class23.method252(); // L: 4609 } - } // L: 10883 + FriendSystem.playPcmPlayers(); // L: 4611 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4612 + FriendSystem.playPcmPlayers(); // L: 4613 + var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4614 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4615 + ModeWhere.scene.draw(cameraX, ChatChannel.cameraY, WorldMapManager.cameraZ, World.cameraPitch, ViewportMouse.cameraYaw, var4); // L: 4616 + Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4617 + FriendSystem.playPcmPlayers(); // L: 4618 + ModeWhere.scene.clearTempGameObjects(); // L: 4619 + Client.overheadTextCount = 0; // L: 4621 + boolean var30 = false; // L: 4622 + var14 = -1; // L: 4623 + int var15 = -1; // L: 4624 + int var16 = Players.Players_count; // L: 4625 + int[] var17 = Players.Players_indices; // L: 4626 + + int var18; + for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { // L: 4627 + Object var29; + if (var18 < var16) { // L: 4629 + var29 = Client.players[var17[var18]]; // L: 4630 + if (var17[var18] == Client.combatTargetPlayerIndex) { // L: 4631 + var30 = true; // L: 4632 + var14 = var18; // L: 4633 + continue; + } + + if (var29 == PlayerType.localPlayer) { // L: 4636 + var15 = var18; // L: 4637 + continue; // L: 4638 + } + } else { + var29 = Client.npcs[Client.npcIndices[var18 - var16]]; // L: 4641 + } + + class1.drawActor2d((Actor)var29, var18, var0, var1, var2, var3); // L: 4642 + } + + if (Client.renderSelf && var15 != -1) { // L: 4644 + class1.drawActor2d(PlayerType.localPlayer, var15, var0, var1, var2, var3); // L: 4645 + } + + if (var30) { // L: 4647 + class1.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); // L: 4648 + } + + for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { // L: 4650 + int var19 = Client.overheadTextXs[var18]; // L: 4651 + int var20 = Client.overheadTextYs[var18]; // L: 4652 + int var21 = Client.overheadTextXOffsets[var18]; // L: 4653 + int var22 = Client.overheadTextAscents[var18]; // L: 4654 + boolean var23 = true; // L: 4655 + + while (var23) { + var23 = false; // L: 4657 + + for (int var28 = 0; var28 < var18; ++var28) { // L: 4658 + if (var20 + 2 > Client.overheadTextYs[var28] - Client.overheadTextAscents[var28] && var20 - var22 < Client.overheadTextYs[var28] + 2 && var19 - var21 < Client.overheadTextXOffsets[var28] + Client.overheadTextXs[var28] && var19 + var21 > Client.overheadTextXs[var28] - Client.overheadTextXOffsets[var28] && Client.overheadTextYs[var28] - Client.overheadTextAscents[var28] < var20) { // L: 4659 4660 + var20 = Client.overheadTextYs[var28] - Client.overheadTextAscents[var28]; // L: 4661 + var23 = true; // L: 4662 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var18]; // L: 4667 + Client.viewportTempY = Client.overheadTextYs[var18] = var20; // L: 4668 + String var24 = Client.overheadText[var18]; // L: 4669 + if (Client.chatEffects == 0) { // L: 4670 + int var25 = 16776960; // L: 4671 + if (Client.overheadTextColors[var18] < 6) { // L: 4672 + var25 = Client.field896[Client.overheadTextColors[var18]]; + } + + if (Client.overheadTextColors[var18] == 6) { // L: 4673 + var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var18] == 7) { // L: 4674 + var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var18] == 8) { // L: 4675 + var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var26; + if (Client.overheadTextColors[var18] == 9) { // L: 4676 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4677 + if (var26 < 50) { // L: 4678 + var25 = var26 * 1280 + 16711680; + } else if (var26 < 100) { // L: 4679 + var25 = 16776960 - (var26 - 50) * 327680; + } else if (var26 < 150) { // L: 4680 + var25 = (var26 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var18] == 10) { // L: 4682 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4683 + if (var26 < 50) { // L: 4684 + var25 = var26 * 5 + 16711680; + } else if (var26 < 100) { // L: 4685 + var25 = 16711935 - (var26 - 50) * 327680; + } else if (var26 < 150) { // L: 4686 + var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; + } + } + + if (Client.overheadTextColors[var18] == 11) { // L: 4688 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4689 + if (var26 < 50) { // L: 4690 + var25 = 16777215 - var26 * 327685; + } else if (var26 < 100) { // L: 4691 + var25 = (var26 - 50) * 327685 + 65280; + } else if (var26 < 150) { // L: 4692 + var25 = 16777215 - (var26 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var18] == 0) { // L: 4694 + ReflectionCheck.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); + } + + if (Client.overheadTextEffects[var18] == 1) { // L: 4695 + ReflectionCheck.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 2) { // L: 4696 + ReflectionCheck.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 3) { // L: 4697 + ReflectionCheck.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); + } + + if (Client.overheadTextEffects[var18] == 4) { // L: 4698 + var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (ReflectionCheck.fontBold12.stringWidth(var24) + 100) / 150; // L: 4699 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4700 + ReflectionCheck.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); // L: 4701 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4702 + } + + if (Client.overheadTextEffects[var18] == 5) { // L: 4704 + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4705 + int var27 = 0; // L: 4706 + if (var26 < 25) { // L: 4707 + var27 = var26 - 25; + } else if (var26 > 125) { // L: 4708 + var27 = var26 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - ReflectionCheck.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4709 + ReflectionCheck.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); // L: 4710 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4711 + } + } else { + ReflectionCheck.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4715 + } + } + + if (Client.hintArrowType == 2) { // L: 4720 + class13.worldToScreen((Client.hintArrowX - FloorDecoration.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - WorldMapData_0.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4721 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4722 + class337.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field743); // L: 4724 + WorldMapScaleHandler.method864(var0, var1, var2, var3); // L: 4725 + cameraX = var5; // L: 4726 + ChatChannel.cameraY = var6; // L: 4727 + WorldMapManager.cameraZ = var7; // L: 4728 + World.cameraPitch = var8; // L: 4729 + ViewportMouse.cameraYaw = var9; // L: 4730 + if (Client.isLoading) { // L: 4731 + byte var31 = 0; // L: 4734 + var14 = var31 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4735 + if (var14 == 0) { // L: 4739 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4741 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4742 + AbstractWorldMapData.drawLoadingMessage("Loading - please wait.", false); // L: 4743 + } + + } // L: 4745 } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index ae93290d8b..0ce19bd94f 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -1,238 +1,284 @@ +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("jq") +@ObfuscatedName("jk") +@Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("w") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("fn") - @ObfuscatedSignature( - descriptor = "Lkr;" - ) - static Font fontPlain12; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -2127308741 - ) - public int id; @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1602793113 + @ObfuscatedSignature( + descriptor = "Liw;" ) - int model; - @ObfuscatedName("c") - public String name; - @ObfuscatedName("f") - short[] recolorFrom; - @ObfuscatedName("y") - short[] recolorTo; - @ObfuscatedName("v") - short[] retextureFrom; - @ObfuscatedName("j") - short[] retextureTo; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1758314265 + @Export("ItemDefinition_archive") + public static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lev;" ) - public int zoom2d; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1530794933 + @Export("ItemDefinition_cached") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lev;" ) - public int xan2d; + @Export("ItemDefinition_cachedModels") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("ItemDefinition_cachedSprites") + public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 205656235 + ) + @Export("id") + public int id; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 86096515 + intValue = -1548040607 ) + @Export("model") + int model; + @ObfuscatedName("r") + @Export("name") + public String name; + @ObfuscatedName("y") + @Export("recolorFrom") + short[] recolorFrom; + @ObfuscatedName("s") + @Export("recolorTo") + short[] recolorTo; + @ObfuscatedName("j") + @Export("retextureFrom") + short[] retextureFrom; + @ObfuscatedName("w") + @Export("retextureTo") + short[] retextureTo; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1017963797 + ) + @Export("zoom2d") + public int zoom2d; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1308967773 + ) + @Export("xan2d") + public int xan2d; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -938843677 + ) + @Export("yan2d") public int yan2d; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1159522461 + intValue = -1690291033 ) + @Export("zan2d") public int zan2d; - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1451755111 + intValue = 452833685 ) + @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 685841117 + intValue = 1321777207 ) + @Export("offsetY2d") public int offsetY2d; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -85010485 + intValue = -743597029 ) + @Export("isStackable") public int isStackable; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1232545811 + intValue = -1842645075 ) + @Export("price") public int price; @ObfuscatedName("ao") + @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("ae") + @ObfuscatedName("af") + @Export("groundActions") public String[] groundActions; - @ObfuscatedName("an") + @ObfuscatedName("av") + @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1175273971 + intValue = 2047863769 ) + @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 1901023651 - ) - int maleModel; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 50964429 - ) - int maleModel1; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 2010056683 - ) - int maleOffset; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 711077729 - ) - int femaleModel; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = -806873799 - ) - int femaleModel1; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = 404192005 - ) - int femaleOffset; @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -312638611 + intValue = -2147145769 ) - int maleModel2; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = -440294405 - ) - int femaleModel2; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -2008584399 - ) - int maleHeadModel; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = -2121233033 - ) - int maleHeadModel2; + @Export("maleModel") + int maleModel; @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1514421507 + intValue = 35198089 ) - int femaleHeadModel; - @ObfuscatedName("ad") + @Export("maleModel1") + int maleModel1; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1568432281 + intValue = -40962547 ) - int femaleHeadModel2; + @Export("maleOffset") + int maleOffset; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 357069235 + ) + @Export("femaleModel") + int femaleModel; @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = 1851359943 + ) + @Export("femaleModel1") + int femaleModel1; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -293226181 + ) + @Export("femaleOffset") + int femaleOffset; + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = -1259301301 + ) + @Export("maleModel2") + int maleModel2; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -450828565 + ) + @Export("femaleModel2") + int femaleModel2; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = -1669818449 + ) + @Export("maleHeadModel") + int maleHeadModel; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = -11483635 + ) + @Export("maleHeadModel2") + int maleHeadModel2; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = 71110901 + ) + @Export("femaleHeadModel") + int femaleHeadModel; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = -1829168075 + ) + @Export("femaleHeadModel2") + int femaleHeadModel2; + @ObfuscatedName("at") + @Export("countobj") int[] countobj; - @ObfuscatedName("ay") + @ObfuscatedName("as") + @Export("countco") int[] countco; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1332734959 + intValue = 293896329 ) + @Export("note") public int note; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1348741783 + intValue = -154349243 ) + @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("af") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 645309775 + intValue = 1856530467 ) + @Export("resizeX") int resizeX; - @ObfuscatedName("ak") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -96685405 + intValue = -1750294835 ) + @Export("resizeY") int resizeY; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -948017029 + intValue = 1174964603 ) + @Export("resizeZ") int resizeZ; - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -1509364621 + intValue = -1557535821 ) + @Export("ambient") public int ambient; - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 178466347 + intValue = 1535796637 ) + @Export("contrast") public int contrast; - @ObfuscatedName("bz") - @ObfuscatedGetter( - intValue = 165771595 - ) - public int team; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - IterableNodeHashTable params; - @ObfuscatedName("bh") - public boolean isTradable; - @ObfuscatedName("bi") - @ObfuscatedGetter( - intValue = 1906961775 - ) - int unnotedId; - @ObfuscatedName("bg") - @ObfuscatedGetter( - intValue = 612376009 - ) - int notedId; - @ObfuscatedName("br") - @ObfuscatedGetter( - intValue = -956191485 - ) - public int placeholder; @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -2061792563 + intValue = 386256383 ) + @Export("team") + public int team; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + @Export("params") + IterableNodeHashTable params; + @ObfuscatedName("bc") + @Export("isTradable") + public boolean isTradable; + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -1196685039 + ) + @Export("unnotedId") + int unnotedId; + @ObfuscatedName("bl") + @ObfuscatedGetter( + intValue = -1548503311 + ) + @Export("notedId") + int notedId; + @ObfuscatedName("bn") + @ObfuscatedGetter( + intValue = 1444215613 + ) + @Export("placeholder") + public int placeholder; + @ObfuscatedName("bo") + @ObfuscatedGetter( + intValue = 1795160485 + ) + @Export("placeholderTemplate") public int placeholderTemplate; static { @@ -282,1035 +328,618 @@ public class ItemDefinition extends DualNode { this.placeholderTemplate = -1; // L: 79 } // L: 81 - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1532230322" + garbageValue = "-27945294" ) + @Export("post") void post() { - } // L: 123 + } // L: 115 - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-1512040719" + descriptor = "(Lkb;B)V", + garbageValue = "8" ) + @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 127 - if (var2 == 0) { // L: 128 - return; // L: 131 + int var2 = var1.readUnsignedByte(); // L: 119 + if (var2 == 0) { // L: 120 + return; // L: 123 } - this.decodeNext(var1, var2); // L: 129 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-2035131194" - ) - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 134 - this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 135 - this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 136 - this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 137 - this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 138 - this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 139 - this.offsetX2d = var1.readUnsignedShort(); // L: 140 - if (this.offsetX2d > 32767) { // L: 141 - this.offsetX2d -= 65536; - } - } else if (var2 == 8) { // L: 143 - this.offsetY2d = var1.readUnsignedShort(); // L: 144 - if (this.offsetY2d > 32767) { - this.offsetY2d -= 65536; // L: 145 - } - } else if (var2 == 11) { // L: 147 - this.isStackable = 1; - } else if (var2 == 12) { // L: 148 - this.price = var1.readInt(); - } else if (var2 == 16) { // L: 149 - this.isMembersOnly = true; - } else if (var2 == 23) { // L: 150 - this.maleModel = var1.readUnsignedShort(); // L: 151 - this.maleOffset = var1.readUnsignedByte(); // L: 152 - } else if (var2 == 24) { // L: 154 - this.maleModel1 = var1.readUnsignedShort(); - } else if (var2 == 25) { // L: 155 - this.femaleModel = var1.readUnsignedShort(); // L: 156 - this.femaleOffset = var1.readUnsignedByte(); // L: 157 - } else if (var2 == 26) { // L: 159 - this.femaleModel1 = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { // L: 160 - this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 161 - if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 162 - this.groundActions[var2 - 30] = null; - } - } else if (var2 >= 35 && var2 < 40) { // L: 164 - this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); - } else { - int var3; - int var4; - if (var2 == 40) { // L: 165 - var3 = var1.readUnsignedByte(); // L: 166 - this.recolorFrom = new short[var3]; // L: 167 - this.recolorTo = new short[var3]; // L: 168 - - for (var4 = 0; var4 < var3; ++var4) { // L: 169 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 170 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 171 - } - } else if (var2 == 41) { // L: 174 - var3 = var1.readUnsignedByte(); // L: 175 - this.retextureFrom = new short[var3]; // L: 176 - this.retextureTo = new short[var3]; // L: 177 - - for (var4 = 0; var4 < var3; ++var4) { // L: 178 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 179 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 180 - } - } else if (var2 == 42) { // L: 183 - this.shiftClickIndex = var1.readByte(); // L: 184 - } else if (var2 == 65) { // L: 186 - this.isTradable = true; - } else if (var2 == 78) { // L: 187 - this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { // L: 188 - this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { // L: 189 - this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { // L: 190 - this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { // L: 191 - this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { // L: 192 - this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 95) { // L: 193 - this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 194 - this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 195 - this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { // L: 196 - if (this.countobj == null) { // L: 197 - this.countobj = new int[10]; // L: 198 - this.countco = new int[10]; // L: 199 - } - - this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 201 - this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 202 - } else if (var2 == 110) { // L: 204 - this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { // L: 205 - this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { // L: 206 - this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { // L: 207 - this.ambient = var1.readByte(); - } else if (var2 == 114) { // L: 208 - this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { // L: 209 - this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { // L: 210 - this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { // L: 211 - this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { // L: 212 - this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { // L: 213 - this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { // L: 214 - this.params = PacketWriter.readStringIntParameters(var1, this.params); - } - } - - } // L: 216 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljq;Ljq;I)V", - garbageValue = "2102368712" - ) - void genCert(ItemDefinition var1, ItemDefinition var2) { - this.model = var1.model; // L: 219 - this.zoom2d = var1.zoom2d; // L: 220 - this.xan2d = var1.xan2d; // L: 221 - this.yan2d = var1.yan2d; // L: 222 - this.zan2d = var1.zan2d; // L: 223 - this.offsetX2d = var1.offsetX2d; // L: 224 - this.offsetY2d = var1.offsetY2d; // L: 225 - this.recolorFrom = var1.recolorFrom; // L: 226 - this.recolorTo = var1.recolorTo; // L: 227 - this.retextureFrom = var1.retextureFrom; // L: 228 - this.retextureTo = var1.retextureTo; // L: 229 - this.name = var2.name; // L: 230 - this.isMembersOnly = var2.isMembersOnly; // L: 231 - this.price = var2.price; // L: 232 - this.isStackable = 1; // L: 233 - } // L: 234 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljq;Ljq;I)V", - garbageValue = "1918043668" - ) - void genBought(ItemDefinition var1, ItemDefinition var2) { - this.model = var1.model; // L: 237 - this.zoom2d = var1.zoom2d; // L: 238 - this.xan2d = var1.xan2d; // L: 239 - this.yan2d = var1.yan2d; // L: 240 - this.zan2d = var1.zan2d; // L: 241 - this.offsetX2d = var1.offsetX2d; // L: 242 - this.offsetY2d = var1.offsetY2d; // L: 243 - this.recolorFrom = var2.recolorFrom; // L: 244 - this.recolorTo = var2.recolorTo; // L: 245 - this.retextureFrom = var2.retextureFrom; // L: 246 - this.retextureTo = var2.retextureTo; // L: 247 - this.name = var2.name; // L: 248 - this.isMembersOnly = var2.isMembersOnly; // L: 249 - this.isStackable = var2.isStackable; // L: 250 - this.maleModel = var2.maleModel; // L: 251 - this.maleModel1 = var2.maleModel1; // L: 252 - this.maleModel2 = var2.maleModel2; // L: 253 - this.femaleModel = var2.femaleModel; // L: 254 - this.femaleModel1 = var2.femaleModel1; // L: 255 - this.femaleModel2 = var2.femaleModel2; // L: 256 - this.maleHeadModel = var2.maleHeadModel; // L: 257 - this.maleHeadModel2 = var2.maleHeadModel2; // L: 258 - this.femaleHeadModel = var2.femaleHeadModel; // L: 259 - this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 260 - this.team = var2.team; // L: 261 - this.groundActions = var2.groundActions; // L: 262 - this.inventoryActions = new String[5]; // L: 263 - if (var2.inventoryActions != null) { // L: 264 - for (int var3 = 0; var3 < 4; ++var3) { - this.inventoryActions[var3] = var2.inventoryActions[var3]; - } - } - - this.inventoryActions[4] = "Discard"; // L: 265 - this.price = 0; // L: 266 - } // L: 267 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Ljq;Ljq;B)V", - garbageValue = "0" - ) - void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { - this.model = var1.model; // L: 270 - this.zoom2d = var1.zoom2d; // L: 271 - this.xan2d = var1.xan2d; // L: 272 - this.yan2d = var1.yan2d; // L: 273 - this.zan2d = var1.zan2d; // L: 274 - this.offsetX2d = var1.offsetX2d; // L: 275 - this.offsetY2d = var1.offsetY2d; // L: 276 - this.recolorFrom = var1.recolorFrom; // L: 277 - this.recolorTo = var1.recolorTo; // L: 278 - this.retextureFrom = var1.retextureFrom; // L: 279 - this.retextureTo = var1.retextureTo; // L: 280 - this.isStackable = var1.isStackable; // L: 281 - this.name = var2.name; // L: 282 - this.price = 0; // L: 283 - this.isMembersOnly = false; // L: 284 - this.isTradable = false; // L: 285 - } // L: 286 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Lee;", - garbageValue = "361581400" - ) - public final ModelData getModelData(int var1) { - int var3; - if (this.countobj != null && var1 > 1) { // L: 289 - int var2 = -1; // L: 290 - - for (var3 = 0; var3 < 10; ++var3) { // L: 291 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 292 - var2 = this.countobj[var3]; - } - } - - if (var2 != -1) { // L: 294 - return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2).getModelData(1); - } - } - - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 296 - if (var4 == null) { // L: 297 - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 298 - var4.resize(this.resizeX, this.resizeY, this.resizeZ); - } - - if (this.recolorFrom != null) { // L: 299 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 300 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 301 - } - } - - if (this.retextureFrom != null) { // L: 304 - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 305 - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 306 - } - } - - return var4; // L: 309 + this.decodeNext(var1, var2); // L: 121 } } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Ler;", - garbageValue = "1340452049" + descriptor = "(Lkb;IB)V", + garbageValue = "1" ) - public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { // L: 313 - int var2 = -1; // L: 314 + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 126 + this.model = var1.readUnsignedShort(); + } else if (var2 == 2) { // L: 127 + this.name = var1.readStringCp1252NullTerminated(); + } else if (var2 == 4) { // L: 128 + this.zoom2d = var1.readUnsignedShort(); + } else if (var2 == 5) { // L: 129 + this.xan2d = var1.readUnsignedShort(); + } else if (var2 == 6) { // L: 130 + this.yan2d = var1.readUnsignedShort(); + } else if (var2 == 7) { // L: 131 + this.offsetX2d = var1.readUnsignedShort(); // L: 132 + if (this.offsetX2d > 32767) { // L: 133 + this.offsetX2d -= 65536; + } + } else if (var2 == 8) { // L: 135 + this.offsetY2d = var1.readUnsignedShort(); // L: 136 + if (this.offsetY2d > 32767) { // L: 137 + this.offsetY2d -= 65536; + } + } else if (var2 == 11) { // L: 139 + this.isStackable = 1; + } else if (var2 == 12) { // L: 140 + this.price = var1.readInt(); + } else if (var2 == 16) { // L: 141 + this.isMembersOnly = true; + } else if (var2 == 23) { // L: 142 + this.maleModel = var1.readUnsignedShort(); // L: 143 + this.maleOffset = var1.readUnsignedByte(); // L: 144 + } else if (var2 == 24) { // L: 146 + this.maleModel1 = var1.readUnsignedShort(); + } else if (var2 == 25) { // L: 147 + this.femaleModel = var1.readUnsignedShort(); // L: 148 + this.femaleOffset = var1.readUnsignedByte(); // L: 149 + } else if (var2 == 26) { // L: 151 + this.femaleModel1 = var1.readUnsignedShort(); + } else if (var2 >= 30 && var2 < 35) { // L: 152 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 153 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 154 + this.groundActions[var2 - 30] = null; + } + } else if (var2 >= 35 && var2 < 40) { // L: 156 + this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); + } else { + int var3; + int var4; + if (var2 == 40) { // L: 157 + var3 = var1.readUnsignedByte(); // L: 158 + this.recolorFrom = new short[var3]; // L: 159 + this.recolorTo = new short[var3]; // L: 160 - for (int var3 = 0; var3 < 10; ++var3) { // L: 315 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 316 + for (var4 = 0; var4 < var3; ++var4) { // L: 161 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 162 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 163 + } + } else if (var2 == 41) { // L: 166 + var3 = var1.readUnsignedByte(); // L: 167 + this.retextureFrom = new short[var3]; // L: 168 + this.retextureTo = new short[var3]; // L: 169 + + for (var4 = 0; var4 < var3; ++var4) { // L: 170 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 172 + } + } else if (var2 == 42) { // L: 175 + this.shiftClickIndex = var1.readByte(); // L: 176 + } else if (var2 == 65) { // L: 178 + this.isTradable = true; + } else if (var2 == 78) { // L: 179 + this.maleModel2 = var1.readUnsignedShort(); + } else if (var2 == 79) { // L: 180 + this.femaleModel2 = var1.readUnsignedShort(); + } else if (var2 == 90) { // L: 181 + this.maleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 91) { // L: 182 + this.femaleHeadModel = var1.readUnsignedShort(); + } else if (var2 == 92) { // L: 183 + this.maleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 93) { // L: 184 + this.femaleHeadModel2 = var1.readUnsignedShort(); + } else if (var2 == 95) { // L: 185 + this.zan2d = var1.readUnsignedShort(); + } else if (var2 == 97) { // L: 186 + this.note = var1.readUnsignedShort(); + } else if (var2 == 98) { // L: 187 + this.noteTemplate = var1.readUnsignedShort(); + } else if (var2 >= 100 && var2 < 110) { // L: 188 + if (this.countobj == null) { // L: 189 + this.countobj = new int[10]; // L: 190 + this.countco = new int[10]; // L: 191 + } + + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 193 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 194 + } else if (var2 == 110) { // L: 196 + this.resizeX = var1.readUnsignedShort(); + } else if (var2 == 111) { // L: 197 + this.resizeY = var1.readUnsignedShort(); + } else if (var2 == 112) { // L: 198 + this.resizeZ = var1.readUnsignedShort(); + } else if (var2 == 113) { // L: 199 + this.ambient = var1.readByte(); + } else if (var2 == 114) { // L: 200 + this.contrast = var1.readByte() * 5; + } else if (var2 == 115) { // L: 201 + this.team = var1.readUnsignedByte(); + } else if (var2 == 139) { // L: 202 + this.unnotedId = var1.readUnsignedShort(); + } else if (var2 == 140) { // L: 203 + this.notedId = var1.readUnsignedShort(); + } else if (var2 == 148) { // L: 204 + this.placeholder = var1.readUnsignedShort(); + } else if (var2 == 149) { // L: 205 + this.placeholderTemplate = var1.readUnsignedShort(); + } else if (var2 == 249) { // L: 206 + this.params = InvDefinition.readStringIntParameters(var1, this.params); + } + } + + } // L: 208 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljk;Ljk;S)V", + garbageValue = "-24107" + ) + @Export("genCert") + void genCert(ItemDefinition var1, ItemDefinition var2) { + this.model = var1.model; // L: 211 + this.zoom2d = var1.zoom2d; // L: 212 + this.xan2d = var1.xan2d; // L: 213 + this.yan2d = var1.yan2d; // L: 214 + this.zan2d = var1.zan2d; // L: 215 + this.offsetX2d = var1.offsetX2d; // L: 216 + this.offsetY2d = var1.offsetY2d; // L: 217 + this.recolorFrom = var1.recolorFrom; // L: 218 + this.recolorTo = var1.recolorTo; // L: 219 + this.retextureFrom = var1.retextureFrom; // L: 220 + this.retextureTo = var1.retextureTo; // L: 221 + this.name = var2.name; // L: 222 + this.isMembersOnly = var2.isMembersOnly; // L: 223 + this.price = var2.price; // L: 224 + this.isStackable = 1; // L: 225 + } // L: 226 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Ljk;Ljk;I)V", + garbageValue = "-1330736230" + ) + @Export("genBought") + void genBought(ItemDefinition var1, ItemDefinition var2) { + this.model = var1.model; // L: 229 + this.zoom2d = var1.zoom2d; // L: 230 + this.xan2d = var1.xan2d; // L: 231 + this.yan2d = var1.yan2d; // L: 232 + this.zan2d = var1.zan2d; // L: 233 + this.offsetX2d = var1.offsetX2d; // L: 234 + this.offsetY2d = var1.offsetY2d; // L: 235 + this.recolorFrom = var2.recolorFrom; // L: 236 + this.recolorTo = var2.recolorTo; // L: 237 + this.retextureFrom = var2.retextureFrom; // L: 238 + this.retextureTo = var2.retextureTo; // L: 239 + this.name = var2.name; // L: 240 + this.isMembersOnly = var2.isMembersOnly; // L: 241 + this.isStackable = var2.isStackable; // L: 242 + this.maleModel = var2.maleModel; // L: 243 + this.maleModel1 = var2.maleModel1; // L: 244 + this.maleModel2 = var2.maleModel2; // L: 245 + this.femaleModel = var2.femaleModel; // L: 246 + this.femaleModel1 = var2.femaleModel1; // L: 247 + this.femaleModel2 = var2.femaleModel2; // L: 248 + this.maleHeadModel = var2.maleHeadModel; // L: 249 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 250 + this.femaleHeadModel = var2.femaleHeadModel; // L: 251 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 252 + this.team = var2.team; // L: 253 + this.groundActions = var2.groundActions; // L: 254 + this.inventoryActions = new String[5]; // L: 255 + if (var2.inventoryActions != null) { // L: 256 + for (int var3 = 0; var3 < 4; ++var3) { + this.inventoryActions[var3] = var2.inventoryActions[var3]; + } + } + + this.inventoryActions[4] = "Discard"; // L: 257 + this.price = 0; // L: 258 + } // L: 259 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljk;Ljk;B)V", + garbageValue = "67" + ) + @Export("genPlaceholder") + void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { + this.model = var1.model; // L: 262 + this.zoom2d = var1.zoom2d; // L: 263 + this.xan2d = var1.xan2d; // L: 264 + this.yan2d = var1.yan2d; // L: 265 + this.zan2d = var1.zan2d; // L: 266 + this.offsetX2d = var1.offsetX2d; // L: 267 + this.offsetY2d = var1.offsetY2d; // L: 268 + this.recolorFrom = var1.recolorFrom; // L: 269 + this.recolorTo = var1.recolorTo; // L: 270 + this.retextureFrom = var1.retextureFrom; // L: 271 + this.retextureTo = var1.retextureTo; // L: 272 + this.isStackable = var1.isStackable; // L: 273 + this.name = var2.name; // L: 274 + this.price = 0; // L: 275 + this.isMembersOnly = false; // L: 276 + this.isTradable = false; // L: 277 + } // L: 278 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Len;", + garbageValue = "-1204595324" + ) + @Export("getModelData") + public final ModelData getModelData(int var1) { + int var3; + if (this.countobj != null && var1 > 1) { // L: 281 + int var2 = -1; // L: 282 + + for (var3 = 0; var3 < 10; ++var3) { // L: 283 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 284 var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 318 - return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2).getModel(1); + if (var2 != -1) { // L: 286 + return AbstractWorldMapData.ItemDefinition_get(var2).getModelData(1); } } - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 320 - if (var5 != null) { // L: 321 + ModelData var4 = ModelData.ModelData_get(UserComparator9.ItemDefinition_modelArchive, this.model, 0); // L: 288 + if (var4 == null) { // L: 289 + return null; + } else { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 290 + var4.resize(this.resizeX, this.resizeY, this.resizeZ); + } + + if (this.recolorFrom != null) { // L: 291 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 292 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 293 + } + } + + if (this.retextureFrom != null) { // L: 296 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 297 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 298 + } + } + + return var4; // L: 301 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)Leh;", + garbageValue = "1180812329" + ) + @Export("getModel") + public final Model getModel(int var1) { + if (this.countobj != null && var1 > 1) { // L: 305 + int var2 = -1; // L: 306 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 307 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 308 + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { // L: 310 + return AbstractWorldMapData.ItemDefinition_get(var2).getModel(1); + } + } + + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 312 + if (var5 != null) { // L: 313 return var5; } else { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 322 - if (var6 == null) { // L: 323 + ModelData var6 = ModelData.ModelData_get(UserComparator9.ItemDefinition_modelArchive, this.model, 0); // L: 314 + if (var6 == null) { // L: 315 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 324 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 316 var6.resize(this.resizeX, this.resizeY, this.resizeZ); } int var4; - if (this.recolorFrom != null) { // L: 325 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 326 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 327 + if (this.recolorFrom != null) { // L: 317 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 318 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 319 } } - if (this.retextureFrom != null) { // L: 330 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 331 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 332 + if (this.retextureFrom != null) { // L: 322 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 323 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 324 } } - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 335 - var5.isSingleTile = true; // L: 336 - ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 337 - return var5; // L: 338 + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 327 + var5.isSingleTile = true; // L: 328 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 329 + return var5; // L: 330 } } } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IB)Ljk;", + garbageValue = "-89" + ) + @Export("getCountObj") + public ItemDefinition getCountObj(int var1) { + if (this.countobj != null && var1 > 1) { // L: 334 + int var2 = -1; // L: 335 + + for (int var3 = 0; var3 < 10; ++var3) { // L: 336 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 337 + var2 = this.countobj[var3]; + } + } + + if (var2 != -1) { // L: 339 + return AbstractWorldMapData.ItemDefinition_get(var2); + } + } + + return this; // L: 341 + } + @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Ljq;", - garbageValue = "-1034116663" - ) - public ItemDefinition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { // L: 342 - int var2 = -1; // L: 343 - - for (int var3 = 0; var3 < 10; ++var3) { // L: 344 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; // L: 345 - } - } - - if (var2 != -1) { // L: 347 - return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2); - } - } - - return this; // L: 349 - } - - @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "-627527711" + garbageValue = "1324759771" ) + @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; // L: 427 - int var3 = this.maleModel1; // L: 428 - int var4 = this.maleModel2; // L: 429 - if (var1) { // L: 430 - var2 = this.femaleModel; // L: 431 - var3 = this.femaleModel1; // L: 432 - var4 = this.femaleModel2; // L: 433 + int var2 = this.maleModel; // L: 419 + int var3 = this.maleModel1; // L: 420 + int var4 = this.maleModel2; // L: 421 + if (var1) { // L: 422 + var2 = this.femaleModel; // L: 423 + var3 = this.femaleModel1; // L: 424 + var4 = this.femaleModel2; // L: 425 } - if (var2 == -1) { // L: 435 + if (var2 == -1) { // L: 427 return true; } else { - boolean var5 = true; // L: 436 - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 437 + boolean var5 = true; // L: 428 + if (!UserComparator9.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 429 var5 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 438 + if (var3 != -1 && !UserComparator9.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 430 var5 = false; } - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 439 + if (var4 != -1 && !UserComparator9.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 431 var5 = false; } - return var5; // L: 440 + return var5; // L: 432 } } - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(ZI)Lee;", - garbageValue = "887428237" + descriptor = "(ZI)Len;", + garbageValue = "-1992916020" ) - public final ModelData method4760(boolean var1) { - int var2 = this.maleModel; // L: 444 - int var3 = this.maleModel1; // L: 445 - int var4 = this.maleModel2; // L: 446 - if (var1) { // L: 447 - var2 = this.femaleModel; // L: 448 - var3 = this.femaleModel1; // L: 449 - var4 = this.femaleModel2; // L: 450 + public final ModelData method4820(boolean var1) { + int var2 = this.maleModel; // L: 436 + int var3 = this.maleModel1; // L: 437 + int var4 = this.maleModel2; // L: 438 + if (var1) { // L: 439 + var2 = this.femaleModel; // L: 440 + var3 = this.femaleModel1; // L: 441 + var4 = this.femaleModel2; // L: 442 } - if (var2 == -1) { // L: 452 + if (var2 == -1) { // L: 444 return null; } else { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 453 - if (var3 != -1) { // L: 454 - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 455 - if (var4 != -1) { // L: 456 - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 457 - ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 458 - var5 = new ModelData(var8, 3); // L: 459 + ModelData var5 = ModelData.ModelData_get(UserComparator9.ItemDefinition_modelArchive, var2, 0); // L: 445 + if (var3 != -1) { // L: 446 + ModelData var6 = ModelData.ModelData_get(UserComparator9.ItemDefinition_modelArchive, var3, 0); // L: 447 + if (var4 != -1) { // L: 448 + ModelData var7 = ModelData.ModelData_get(UserComparator9.ItemDefinition_modelArchive, var4, 0); // L: 449 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 450 + var5 = new ModelData(var8, 3); // L: 451 } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 462 - var5 = new ModelData(var10, 2); // L: 463 + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 454 + var5 = new ModelData(var10, 2); // L: 455 } } - if (!var1 && this.maleOffset != 0) { // L: 466 + if (!var1 && this.maleOffset != 0) { // L: 458 var5.changeOffset(0, this.maleOffset, 0); } - if (var1 && this.femaleOffset != 0) { // L: 467 + if (var1 && this.femaleOffset != 0) { // L: 459 var5.changeOffset(0, this.femaleOffset, 0); } int var9; - if (this.recolorFrom != null) { // L: 468 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 469 - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 470 + if (this.recolorFrom != null) { // L: 460 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 461 + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 462 } } - if (this.retextureFrom != null) { // L: 473 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 474 - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 475 + if (this.retextureFrom != null) { // L: 465 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 466 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 467 } } - return var5; // L: 478 + return var5; // L: 470 } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "936958354" + descriptor = "(ZB)Z", + garbageValue = "26" ) - public final boolean method4805(boolean var1) { - int var2 = this.maleHeadModel; // L: 482 - int var3 = this.maleHeadModel2; // L: 483 - if (var1) { // L: 484 - var2 = this.femaleHeadModel; // L: 485 - var3 = this.femaleHeadModel2; // L: 486 + public final boolean method4809(boolean var1) { + int var2 = this.maleHeadModel; // L: 474 + int var3 = this.maleHeadModel2; // L: 475 + if (var1) { // L: 476 + var2 = this.femaleHeadModel; // L: 477 + var3 = this.femaleHeadModel2; // L: 478 } - if (var2 == -1) { // L: 488 + if (var2 == -1) { // L: 480 return true; } else { - boolean var4 = true; // L: 489 - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 490 + boolean var4 = true; // L: 481 + if (!UserComparator9.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 482 var4 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 491 + if (var3 != -1 && !UserComparator9.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 483 var4 = false; } - return var4; // L: 492 - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ZB)Lee;", - garbageValue = "0" - ) - public final ModelData method4762(boolean var1) { - int var2 = this.maleHeadModel; // L: 496 - int var3 = this.maleHeadModel2; // L: 497 - if (var1) { // L: 498 - var2 = this.femaleHeadModel; // L: 499 - var3 = this.femaleHeadModel2; // L: 500 - } - - if (var2 == -1) { // L: 502 - return null; - } else { - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 503 - if (var3 != -1) { // L: 504 - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 505 - ModelData[] var6 = new ModelData[]{var4, var5}; // L: 506 - var4 = new ModelData(var6, 2); // L: 507 - } - - int var7; - if (this.recolorFrom != null) { // L: 509 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 510 - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 511 - } - } - - if (this.retextureFrom != null) { // L: 514 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 515 - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 516 - } - } - - return var4; // L: 519 + return var4; // L: 484 } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "678325185" + descriptor = "(ZB)Len;", + garbageValue = "0" ) - public int getIntParam(int var1, int var2) { - return Username.method5309(this.params, var1, var2); // L: 523 + public final ModelData method4822(boolean var1) { + int var2 = this.maleHeadModel; // L: 488 + int var3 = this.maleHeadModel2; // L: 489 + if (var1) { // L: 490 + var2 = this.femaleHeadModel; // L: 491 + var3 = this.femaleHeadModel2; // L: 492 + } + + if (var2 == -1) { // L: 494 + return null; + } else { + ModelData var4 = ModelData.ModelData_get(UserComparator9.ItemDefinition_modelArchive, var2, 0); // L: 495 + if (var3 != -1) { // L: 496 + ModelData var5 = ModelData.ModelData_get(UserComparator9.ItemDefinition_modelArchive, var3, 0); // L: 497 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 498 + var4 = new ModelData(var6, 2); // L: 499 + } + + int var7; + if (this.recolorFrom != null) { // L: 501 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 502 + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 503 + } + } + + if (this.retextureFrom != null) { // L: 506 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 507 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 508 + } + } + + return var4; // L: 511 + } } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "6" + descriptor = "(III)I", + garbageValue = "2072202585" ) - public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 528 - String var3; - if (var4 == null) { // L: 530 - var3 = var2; // L: 531 + @Export("getIntParam") + public int getIntParam(int var1, int var2) { + IterableNodeHashTable var4 = this.params; // L: 516 + int var3; + if (var4 == null) { // L: 518 + var3 = var2; // L: 519 } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 534 - if (var5 == null) { // L: 535 - var3 = var2; // L: 536 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 522 + if (var5 == null) { // L: 523 + var3 = var2; // L: 524 } else { - var3 = (String)var5.obj; // L: 539 + var3 = var5.integer; // L: 527 } } - return var3; // L: 541 + return var3; // L: 529 } - @ObfuscatedName("p") + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1152059267" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return WorldMapSection0.method307(this.params, var1, var2); // L: 533 + } + + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-17" + garbageValue = "102" ) + @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 545 - if (this.shiftClickIndex >= 0) { // L: 546 - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1175273971 * 2965307 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 537 + if (this.shiftClickIndex >= 0) { // L: 538 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 2047863769 * -1595677591 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 547 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 539 } } else { return -1; } } - @ObfuscatedName("g") + @ObfuscatedName("jv") @ObfuscatedSignature( - descriptor = "(Lkr;Lkr;I)V", - garbageValue = "-2013337959" + descriptor = "(I)V", + garbageValue = "-1917575667" ) - static void method4823(Font var0, Font var1) { - Archive var3; - int var4; - int var5; - if (MidiPcmStream.worldSelectBackSprites == null) { // L: 1462 - var3 = Huffman.archive8; // L: 1464 - var4 = var3.getGroupId("sl_back"); // L: 1466 - var5 = var3.getFileId(var4, ""); // L: 1467 - Sprite[] var2 = GameBuild.method4214(var3, var4, var5); // L: 1468 - MidiPcmStream.worldSelectBackSprites = var2; // L: 1470 - } + static void method4874() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11035 + int var1 = var0.group; // L: 11036 + if (ScriptFrame.loadInterface(var1)) { // L: 11037 + boolean var2 = true; // L: 11038 + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11039 - IndexedSprite[] var25; - if (AbstractWorldMapIcon.worldSelectFlagSprites == null) { // L: 1472 - var3 = Huffman.archive8; // L: 1474 - var4 = var3.getGroupId("sl_flags"); // L: 1476 - var5 = var3.getFileId(var4, ""); // L: 1477 - var25 = UserComparator5.method3515(var3, var4, var5); // L: 1478 - AbstractWorldMapIcon.worldSelectFlagSprites = var25; // L: 1480 - } - - if (MusicPatchNode.worldSelectArrows == null) { // L: 1482 - var3 = Huffman.archive8; // L: 1484 - var4 = var3.getGroupId("sl_arrows"); // L: 1486 - var5 = var3.getFileId(var4, ""); // L: 1487 - var25 = UserComparator5.method3515(var3, var4, var5); // L: 1488 - MusicPatchNode.worldSelectArrows = var25; // L: 1490 - } - - if (Login.worldSelectStars == null) { // L: 1492 - var3 = Huffman.archive8; // L: 1494 - var4 = var3.getGroupId("sl_stars"); // L: 1496 - var5 = var3.getFileId(var4, ""); // L: 1497 - var25 = UserComparator5.method3515(var3, var4, var5); // L: 1498 - Login.worldSelectStars = var25; // L: 1500 - } - - if (WorldMapIcon_0.worldSelectLeftSprite == null) { // L: 1502 - WorldMapIcon_0.worldSelectLeftSprite = class234.SpriteBuffer_getIndexedSpriteByName(Huffman.archive8, "leftarrow", ""); - } - - if (ArchiveDiskActionHandler.worldSelectRightSprite == null) { // L: 1503 - ArchiveDiskActionHandler.worldSelectRightSprite = class234.SpriteBuffer_getIndexedSpriteByName(Huffman.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1504 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1505 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1506 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1507 - if (Login.worldSelectStars != null) { // L: 1508 - Login.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1509 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1510 - Login.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1511 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1512 - } - - if (MusicPatchNode.worldSelectArrows != null) { // L: 1514 - int var22 = Login.xPadding + 280; // L: 1515 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1516 - MusicPatchNode.worldSelectArrows[2].drawAt(var22, 4); - } else { - MusicPatchNode.worldSelectArrows[0].drawAt(var22, 4); // L: 1517 - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1518 - MusicPatchNode.worldSelectArrows[3].drawAt(var22 + 15, 4); - } else { - MusicPatchNode.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1519 - } - - var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1520 - int var23 = Login.xPadding + 390; // L: 1521 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1522 - MusicPatchNode.worldSelectArrows[2].drawAt(var23, 4); - } else { - MusicPatchNode.worldSelectArrows[0].drawAt(var23, 4); // L: 1523 - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1524 - MusicPatchNode.worldSelectArrows[3].drawAt(var23 + 15, 4); - } else { - MusicPatchNode.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1525 - } - - var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1526 - var4 = Login.xPadding + 500; // L: 1527 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1528 - MusicPatchNode.worldSelectArrows[2].drawAt(var4, 4); - } else { - MusicPatchNode.worldSelectArrows[0].drawAt(var4, 4); // L: 1529 - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1530 - MusicPatchNode.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - MusicPatchNode.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1531 - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1532 - var5 = Login.xPadding + 610; // L: 1533 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1534 - MusicPatchNode.worldSelectArrows[2].drawAt(var5, 4); - } else { - MusicPatchNode.worldSelectArrows[0].drawAt(var5, 4); // L: 1535 - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1536 - MusicPatchNode.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - MusicPatchNode.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1537 - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1538 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1540 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1541 - Login.hoveredWorldIndex = -1; // L: 1542 - if (MidiPcmStream.worldSelectBackSprites != null) { // L: 1543 - byte var27 = 88; // L: 1544 - byte var28 = 19; // L: 1545 - var4 = 765 / (var27 + 1) - 1; // L: 1546 - var5 = 480 / (var28 + 1); // L: 1547 - - int var6; - int var7; - do { - var6 = var5; // L: 1549 - var7 = var4; // L: 1550 - if (var5 * (var4 - 1) >= World.World_count) { // L: 1551 - --var4; - } - - if (var4 * (var5 - 1) >= World.World_count) { // L: 1552 - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { // L: 1553 - --var5; - } - } while(var5 != var6 || var4 != var7); // L: 1554 - - var6 = (765 - var27 * var4) / (var4 + 1); // L: 1556 - if (var6 > 5) { // L: 1557 - var6 = 5; - } - - var7 = (480 - var28 * var5) / (var5 + 1); // L: 1558 - if (var7 > 5) { // L: 1559 - var7 = 5; - } - - int var8 = (765 - var27 * var4 - var6 * (var4 - 1)) / 2; // L: 1560 - int var9 = (480 - var5 * var28 - var7 * (var5 - 1)) / 2; // L: 1561 - int var10 = (var5 + World.World_count - 1) / var5; // L: 1562 - Login.worldSelectPagesCount = var10 - var4; // L: 1563 - if (WorldMapIcon_0.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1564 - WorldMapIcon_0.worldSelectLeftSprite.drawAt(8, GameShell.canvasHeight / 2 - WorldMapIcon_0.worldSelectLeftSprite.subHeight / 2); // L: 1565 - } - - if (ArchiveDiskActionHandler.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1567 - ArchiveDiskActionHandler.worldSelectRightSprite.drawAt(FloorDecoration.canvasWidth - ArchiveDiskActionHandler.worldSelectRightSprite.subWidth - 8, GameShell.canvasHeight / 2 - ArchiveDiskActionHandler.worldSelectRightSprite.subHeight / 2); // L: 1568 - } - - int var11 = var9 + 23; // L: 1570 - int var12 = var8 + Login.xPadding; // L: 1571 - int var13 = 0; // L: 1572 - boolean var14 = false; // L: 1573 - int var15 = Login.worldSelectPage; // L: 1574 - - int var16; - for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1575 1576 - World var17 = AbstractByteArrayCopier.World_worlds[var16]; // L: 1579 - boolean var18 = true; // L: 1580 - String var19 = Integer.toString(var17.population); // L: 1581 - if (var17.population == -1) { // L: 1582 - var19 = "OFF"; // L: 1583 - var18 = false; // L: 1584 - } else if (var17.population > 1980) { // L: 1586 - var19 = "FULL"; // L: 1587 - var18 = false; // L: 1588 - } - - int var21 = 0; // L: 1591 - byte var20; - if (var17.isBeta()) { // L: 1592 - if (var17.isMembersOnly()) { // L: 1593 - var20 = 7; - } else { - var20 = 6; // L: 1594 + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11040 + if (var3[var4] != null) { // L: 11041 + var2 = var3[var4].isIf3; // L: 11042 + break; } - } else if (var17.isDeadman()) { // L: 1596 - var21 = 16711680; // L: 1597 - if (var17.isMembersOnly()) { // L: 1598 - var20 = 5; - } else { - var20 = 4; // L: 1599 + } + + if (!var2) { // L: 11046 + var4 = (int)var0.key; // L: 11047 + Widget var5 = UserComparator4.getWidget(var4); // L: 11048 + if (var5 != null) { // L: 11049 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var5); } - } else if (var17.method1826()) { // L: 1601 - if (var17.isMembersOnly()) { // L: 1602 - var20 = 9; - } else { - var20 = 8; // L: 1603 - } - } else if (var17.isPvp()) { // L: 1605 - if (var17.isMembersOnly()) { // L: 1606 - var20 = 3; - } else { - var20 = 2; // L: 1607 - } - } else if (var17.isMembersOnly()) { // L: 1610 - var20 = 1; - } else { - var20 = 0; // L: 1611 } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var27 && MouseHandler.MouseHandler_y < var11 + var28 && var18) { // L: 1613 - Login.hoveredWorldIndex = var16; // L: 1614 - MidiPcmStream.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); // L: 1615 - var14 = true; // L: 1616 - } else { - MidiPcmStream.worldSelectBackSprites[var20].drawAt(var12, var11); // L: 1618 - } - - if (AbstractWorldMapIcon.worldSelectFlagSprites != null) { // L: 1619 - AbstractWorldMapIcon.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var17.id), var12 + 15, var28 / 2 + var11 + 5, var21, -1); // L: 1620 - var1.drawCentered(var19, var12 + 60, var28 / 2 + var11 + 5, 268435455, -1); // L: 1621 - var11 = var11 + var7 + var28; // L: 1622 - ++var13; // L: 1623 - if (var13 >= var5) { - var11 = var9 + 23; // L: 1624 - var12 = var12 + var6 + var27; // L: 1625 - var13 = 0; // L: 1626 - ++var15; // L: 1627 - } - } - - if (var14) { // L: 1630 - var16 = var1.stringWidth(AbstractByteArrayCopier.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1631 - int var24 = var1.ascent + 8; // L: 1632 - int var26 = MouseHandler.MouseHandler_y + 25; // L: 1633 - if (var24 + var26 > 480) { // L: 1634 - var26 = MouseHandler.MouseHandler_y - 25 - var24; // L: 1635 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var26, var16, var24, 16777120); // L: 1637 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var26, var16, var24, 0); // L: 1638 - var1.drawCentered(AbstractByteArrayCopier.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var26 + var1.ascent + 4, 0, -1); // L: 1639 } } - WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 1642 - } // L: 1643 - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "137776557" - ) - static int method4793(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3273 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptFrame.loadWorlds() ? 1 : 0; // L: 3274 - return 1; // L: 3275 - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3277 - var9 = Decimator.worldListStart(); // L: 3278 - if (var9 != null) { // L: 3279 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3280 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3281 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.activity; // L: 3282 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3283 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3284 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.host; // L: 3285 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3288 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3289 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3290 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3291 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3292 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3293 - } - - return 1; // L: 3295 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3297 - var9 = WorldMapEvent.getNextWorldListWorld(); // L: 3298 - if (var9 != null) { // L: 3299 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3300 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3301 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.activity; // L: 3302 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3303 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3304 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.host; // L: 3305 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3308 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3309 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3310 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3311 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3312 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3313 - } - - return 1; // L: 3315 - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3317 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3318 - var7 = null; // L: 3319 - - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3320 - if (var3 == AbstractByteArrayCopier.World_worlds[var8].id) { // L: 3321 - var7 = AbstractByteArrayCopier.World_worlds[var8]; // L: 3322 - break; - } - } - - if (var7 != null) { // L: 3326 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3327 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3328 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.activity; // L: 3329 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3330 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3331 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.host; // L: 3332 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3335 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3336 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3337 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3338 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3339 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3340 - } - - return 1; // L: 3342 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3344 - Interpreter.Interpreter_intStackSize -= 4; // L: 3345 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3346 - boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3347 - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3348 - boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; // L: 3349 - TilePaint.sortWorldList(var3, var10, var8, var6); // L: 3350 - return 1; // L: 3351 - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3353 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3374 - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3375 - return 1; // L: 3376 - } else { - int var4; - ParamDefinition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3378 - Interpreter.Interpreter_intStackSize -= 2; // L: 3379 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3380 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3381 - var5 = PlayerAppearance.getParamDefinition(var4); // L: 3382 - if (var5.isString()) { // L: 3383 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Skeleton.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3384 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Skeleton.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3387 - } - - return 1; // L: 3389 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3391 - Interpreter.Interpreter_intStackSize -= 2; // L: 3392 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3393 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3394 - var5 = PlayerAppearance.getParamDefinition(var4); // L: 3395 - if (var5.isString()) { // L: 3396 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = MidiPcmStream.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3397 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MidiPcmStream.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3400 - } - - return 1; // L: 3402 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3404 - Interpreter.Interpreter_intStackSize -= 2; // L: 3405 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3406 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3407 - var5 = PlayerAppearance.getParamDefinition(var4); // L: 3408 - if (var5.isString()) { // L: 3409 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3410 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3413 - } - - return 1; // L: 3415 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3417 - Interpreter.Interpreter_intStackSize -= 2; // L: 3418 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3419 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3420 - var5 = PlayerAppearance.getParamDefinition(var4); // L: 3421 - if (var5.isString()) { // L: 3422 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = NetSocket.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3423 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NetSocket.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3426 - } - - return 1; // L: 3428 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3430 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3431 - return 1; // L: 3432 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3434 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3435 - return 1; // L: 3436 - } else if (var0 == 6520) { // L: 3438 - return 1; // L: 3439 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3441 - return 1; // L: 3442 - } else if (var0 == 6522) { // L: 3444 - --Varps.Interpreter_stringStackSize; // L: 3445 - --Interpreter.Interpreter_intStackSize; // L: 3446 - return 1; // L: 3447 - } else if (var0 == 6523) { // L: 3449 - --Varps.Interpreter_stringStackSize; // L: 3450 - --Interpreter.Interpreter_intStackSize; // L: 3451 - return 1; // L: 3452 - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3454 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3455 - return 1; // L: 3456 - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3458 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3459 - return 1; // L: 3460 - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3462 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3463 - return 1; // L: 3464 - } else { - return 2; // L: 3466 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3354 - if (var3 >= 0 && var3 < World.World_count) { // L: 3355 - var7 = AbstractByteArrayCopier.World_worlds[var3]; // L: 3356 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3357 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3358 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.activity; // L: 3359 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3360 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3361 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.host; // L: 3362 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3365 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3366 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3367 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3368 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3369 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3370 - } - - return 1; // L: 3372 - } - } - } - } + } // L: 11053 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 40380e042b..120bed609b 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -1,18 +1,23 @@ import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") +@ObfuscatedName("jt") +@Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgp;" ) + @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgp;" ) + @Export("head") DualNode head; public IterableDualNodeQueue() { @@ -21,7 +26,8 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { // L: 16 this.sentinel.previousDual.removeDual(); // L: 17 @@ -29,10 +35,11 @@ public class IterableDualNodeQueue implements Iterable { } // L: 19 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgs;)V" + descriptor = "(Lgp;)V" ) + @Export("add") public void add(DualNode var1) { if (var1.nextDual != null) { // L: 22 var1.removeDual(); @@ -44,10 +51,11 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Lgs;" + descriptor = "()Lgp;" ) + @Export("removeLast") public DualNode removeLast() { DualNode var1 = this.sentinel.previousDual; // L: 38 if (var1 == this.sentinel) { @@ -58,18 +66,20 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lgs;" + descriptor = "()Lgp;" ) + @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); // L: 45 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lgs;)Lgs;" + descriptor = "(Lgp;)Lgp;" ) + @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; if (var1 == null) { // L: 50 @@ -87,10 +97,11 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lgs;" + descriptor = "()Lgp;" ) + @Export("previous") public DualNode previous() { DualNode var1 = this.head; // L: 61 if (var1 == this.sentinel) { // L: 62 @@ -106,10 +117,11 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); // L: 71 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgs;Lgs;)V" + descriptor = "(Lgp;Lgp;)V" ) + @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { if (var0.nextDual != null) { // L: 30 var0.removeDual(); diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 2a2ec400aa..4a4c987280 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -1,27 +1,33 @@ import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jb") +@Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljt;" ) + @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgp;" ) + @Export("head") DualNode head; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgs;" + descriptor = "Lgp;" ) + @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Ljh;)V" + descriptor = "(Ljt;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; // L: 9 @@ -30,11 +36,6 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = null; // L: 14 } // L: 15 - public void remove() { - this.last.removeDual(); // L: 34 - this.last = null; // L: 35 - } // L: 36 - public Object next() { DualNode var1 = this.head; // L: 18 if (var1 == this.queue.sentinel) { // L: 19 @@ -51,4 +52,13 @@ public class IterableDualNodeQueueIterator implements Iterator { public boolean hasNext() { return this.queue.sentinel != this.head; // L: 29 } + + public void remove() { + if (this.last == null) { // L: 33 + throw new IllegalStateException(); + } else { + this.last.removeDual(); // L: 34 + this.last = null; // L: 35 + } + } // L: 36 } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 3cb860c4b8..da0c2fd853 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -1,20 +1,24 @@ import java.util.Collection; import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("js") +@Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("sentinel") Node sentinel; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) - Node field3554; + Node field3555; public IterableNodeDeque() { this.sentinel = new Node(); // L: 7 @@ -22,7 +26,8 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { // L: 16 this.sentinel.previous.remove(); // L: 17 @@ -30,10 +35,11 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 19 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgw;)V" + descriptor = "(Lgn;)V" ) + @Export("addFirst") public void addFirst(Node var1) { if (var1.next != null) { // L: 22 var1.remove(); @@ -45,10 +51,11 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 26 } // L: 27 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgw;)V" + descriptor = "(Lgn;)V" ) + @Export("addLast") public void addLast(Node var1) { if (var1.next != null) { // L: 30 var1.remove(); @@ -60,19 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 34 } // L: 35 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("last") public Node last() { - return this.method4946((Node)null); // L: 46 + return this.method5006((Node)null); // L: 46 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lgw;)Lgw;" + descriptor = "(Lgn;)Lgn;" ) - Node method4946(Node var1) { + Node method5006(Node var1) { Node var2; if (var1 == null) { // L: 51 var2 = this.sentinel.previous; @@ -81,31 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { // L: 53 - this.field3554 = null; // L: 54 + this.field3555 = null; // L: 54 return null; // L: 55 } else { - this.field3554 = var2.previous; // L: 57 + this.field3555 = var2.previous; // L: 57 return var2; // L: 58 } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("previous") public Node previous() { - Node var1 = this.field3554; // L: 62 + Node var1 = this.field3555; // L: 62 if (var1 == this.sentinel) { // L: 63 - this.field3554 = null; // L: 64 + this.field3555 = null; // L: 64 return null; // L: 65 } else { - this.field3554 = var1.previous; // L: 67 + this.field3555 = var1.previous; // L: 67 return var1; // L: 68 } } - @ObfuscatedName("w") - int method4944() { + @ObfuscatedName("c") + int method4989() { int var1 = 0; // L: 72 for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 @@ -115,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 78 } - @ObfuscatedName("g") - public boolean method4945() { + @ObfuscatedName("u") + public boolean method4990() { return this.sentinel.previous == this.sentinel; // L: 82 } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()[Lgw;" + descriptor = "()[Lgn;" ) - Node[] method4996() { - Node[] var1 = new Node[this.method4944()]; // L: 86 + Node[] method4991() { + Node[] var1 = new Node[this.method4989()]; // L: 86 int var2 = 0; // L: 87 for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 @@ -135,69 +144,29 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 93 } - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lgw;)Z" + descriptor = "(Lgn;)Z" ) - boolean method4951(Node var1) { + boolean method4987(Node var1) { this.addFirst(var1); // L: 127 return true; // L: 128 } - public boolean addAll(Collection var1) { - throw new RuntimeException(); // L: 140 - } - - public int size() { - return this.method4944(); // L: 101 - } - - public boolean contains(Object var1) { - throw new RuntimeException(); // L: 109 - } - - public boolean containsAll(Collection var1) { - throw new RuntimeException(); // L: 136 - } - public boolean removeAll(Collection var1) { throw new RuntimeException(); // L: 144 } - public boolean retainAll(Collection var1) { - throw new RuntimeException(); // L: 148 - } - - public void clear() { - this.rsClear(); // L: 152 - } // L: 153 - - public boolean equals(Object var1) { - return super.equals(var1); // L: 160 - } - - public int hashCode() { - return super.hashCode(); // L: 164 - } - - public boolean isEmpty() { - return this.method4945(); // L: 105 - } - - public boolean remove(Object var1) { - throw new RuntimeException(); // L: 132 - } - public Iterator iterator() { return new IterableNodeDequeDescendingIterator(this); // L: 97 } - public boolean add(Object var1) { - return this.method4951((Node)var1); // L: 156 + public boolean contains(Object var1) { + throw new RuntimeException(); // L: 109 } public Object[] toArray() { - return this.method4996(); // L: 113 + return this.method4991(); // L: 113 } public Object[] toArray(Object[] var1) { @@ -210,10 +179,51 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 123 } - @ObfuscatedName("t") + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 132 + } + + public boolean addAll(Collection var1) { + throw new RuntimeException(); // L: 140 + } + + public void clear() { + this.rsClear(); // L: 152 + } // L: 153 + + public int size() { + return this.method4989(); // L: 101 + } + + public int hashCode() { + return super.hashCode(); // L: 164 + } + + public boolean equals(Object var1) { + return super.equals(var1); // L: 160 + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); // L: 136 + } + + public boolean add(Object var1) { + return this.method4987((Node)var1); // L: 156 + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); // L: 148 + } + + public boolean isEmpty() { + return this.method4990(); // L: 105 + } + + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lgw;Lgw;)V" + descriptor = "(Lgn;Lgn;)V" ) + @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { if (var0.next != null) { // L: 38 var0.remove(); diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index ba943bcb7e..e842a8b5f6 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -1,63 +1,57 @@ import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("jc") +@Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljs;" ) + @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) - Node field3562; - @ObfuscatedName("s") + Node field3563; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Ljv;)V" + descriptor = "(Ljs;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; // L: 9 this.setDeque(var1); // L: 12 } // L: 13 - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljv;)V" + descriptor = "(Ljs;)V" ) + @Export("setDeque") void setDeque(IterableNodeDeque var1) { this.deque = var1; // L: 16 this.start(); // L: 17 } // L: 18 - @ObfuscatedName("w") + @ObfuscatedName("o") + @Export("start") void start() { - this.field3562 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.field3563 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 } // L: 23 - public Object next() { - Node var1 = this.field3562; // L: 26 - if (var1 == this.deque.sentinel) { // L: 27 - var1 = null; // L: 28 - this.field3562 = null; // L: 29 - } else { - this.field3562 = var1.previous; // L: 31 - } - - this.last = var1; // L: 32 - return var1; // L: 33 - } - public boolean hasNext() { - return this.deque.sentinel != this.field3562; // L: 37 + return this.deque.sentinel != this.field3563; // L: 37 } public void remove() { @@ -68,4 +62,17 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.last = null; // L: 43 } } // L: 44 + + public Object next() { + Node var1 = this.field3563; // L: 26 + if (var1 == this.deque.sentinel) { // L: 27 + var1 = null; // L: 28 + this.field3563 = null; // L: 29 + } else { + this.field3563 = var1.previous; // L: 31 + } + + this.last = var1; // L: 32 + return var1; // L: 33 + } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 8ac3b1bed4..573e38c3bd 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -1,27 +1,35 @@ import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("ll") +@Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("size") int size; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lgw;" + descriptor = "[Lgn;" ) + @Export("buckets") Node[] buckets; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("currentGet") Node currentGet; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("current") Node current; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("index") int index; public IterableNodeHashTable(int var1) { @@ -37,10 +45,11 @@ public final class IterableNodeHashTable implements Iterable { } // L: 21 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(J)Lgw;" + descriptor = "(J)Lgn;" ) + @Export("get") public Node get(long var1) { Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24 @@ -56,10 +65,11 @@ public final class IterableNodeHashTable implements Iterable { return null; // L: 35 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgw;J)V" + descriptor = "(Lgn;J)V" ) + @Export("put") public void put(Node var1, long var2) { if (var1.next != null) { // L: 39 var1.remove(); @@ -73,7 +83,8 @@ public final class IterableNodeHashTable implements Iterable { var1.key = var2; // L: 45 } // L: 46 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 Node var2 = this.buckets[var1]; // L: 50 @@ -92,19 +103,21 @@ public final class IterableNodeHashTable implements Iterable { this.current = null; // L: 58 } // L: 59 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("first") public Node first() { this.index = 0; // L: 62 return this.next(); // L: 63 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("next") public Node next() { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67 diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 7aa0e5ba80..c6161722b8 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -1,29 +1,36 @@ import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("ls") +@Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) + @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("head") Node head; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("index") int index; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Llq;)V" + descriptor = "(Lll;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; // L: 10 @@ -31,13 +38,36 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); // L: 14 } // L: 15 - @ObfuscatedName("x") + @ObfuscatedName("e") + @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; // L: 18 this.index = 1; // L: 19 this.last = null; // L: 20 } // L: 21 + public Object next() { + Node var1; + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 + var1 = this.head; // L: 25 + this.head = var1.previous; // L: 26 + this.last = var1; // L: 27 + return var1; // L: 28 + } else { + do { + if (this.index >= this.hashTable.size) { // L: 30 + return null; // L: 38 + } + + var1 = this.hashTable.buckets[this.index++].previous; // L: 31 + } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 + + this.head = var1.previous; // L: 33 + this.last = var1; // L: 34 + return var1; // L: 35 + } + } + public boolean hasNext() { if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 return true; @@ -63,26 +93,4 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; // L: 58 } } // L: 59 - - public Object next() { - Node var1; - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 - var1 = this.head; // L: 25 - this.head = var1.previous; // L: 26 - this.last = var1; // L: 27 - return var1; // L: 28 - } else { - do { - if (this.index >= this.hashTable.size) { // L: 30 - return null; // L: 38 - } - - var1 = this.hashTable.buckets[this.index++].previous; // L: 31 - } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 - - this.head = var1.previous; // L: 33 - this.last = var1; // L: 34 - return var1; // L: 35 - } - } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index a853e9bda0..8a61d5ac9d 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -1,35 +1,45 @@ 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("fn") +@ObfuscatedName("fp") +@Implements("JagexCache") public class JagexCache { - @ObfuscatedName("t") - static File JagexCache_locationFile; - @ObfuscatedName("i") + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = 8604224012951228081L + ) + public static long field2081; + @ObfuscatedName("z") + @Export("cacheDir") static File cacheDir; - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lmz;" ) - public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("h") + @Export("JagexCache_randomDat") + static BufferedFile JagexCache_randomDat; + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "Lmz;" ) + @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lmz;" ) + @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "[Lmz;" ) + @Export("JagexCache_idxFiles") public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("r") - public static String field2094; static { JagexCache_randomDat = null; // L: 22 @@ -37,221 +47,87 @@ public class JagexCache { JagexCache_idx255File = null; // L: 24 } - @ObfuscatedName("iz") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1010534169" + descriptor = "(II)I", + garbageValue = "2128303847" ) - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 8289 - StructDefinition.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 8290 - } - - long var4 = -1L; // L: 8293 - long var6 = -1L; // L: 8294 - int var8 = 0; - - while (true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 8299 - if (var8 >= var10) { // L: 8301 - if (var4 != -1L) { // L: 8444 - var8 = TileItem.Entity_unpackSceneX(var4); // L: 8445 - int var9 = (int)(var4 >>> 7 & 127L); // L: 8448 - Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 8451 - VarpDefinition.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 8452 - } - - return; // L: 8454 - } - - long var27 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8304 - if (var6 != var27) { // L: 8307 - label326: { - var6 = var27; // L: 8308 - int var15 = WorldMapIcon_1.getSceneXForObjectUnderMouse(var8); // L: 8309 - long var18 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8313 - int var17 = (int)(var18 >>> 7 & 127L); // L: 8315 - var17 = var17; // L: 8319 - long var20 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8323 - int var19 = (int)(var20 >>> 14 & 3L); // L: 8325 - int var30 = Frames.getEntityIdUnderMouse(var8); // L: 8330 - if (var19 == 2 && ScriptEvent.scene.getObjectFlags(Huffman.Client_plane, var15, var17, var27) >= 0) { // L: 8331 8332 - ObjectDefinition var21 = MidiPcmStream.getObjectDefinition(var30); // L: 8333 - if (var21.transforms != null) { // L: 8334 - var21 = var21.transform(); - } - - if (var21 == null) { // L: 8335 - break label326; - } - - if (Client.isItemSelected == 1) { // L: 8336 - StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(65535) + var21.name, 1, var30, var15, var17); // L: 8337 - } else if (Client.isSpellSelected) { // L: 8340 - if ((UserComparator8.selectedSpellFlags & 4) == 4) { // L: 8341 - StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(65535) + var21.name, 2, var30, var15, var17); // L: 8342 - } - } else { - String[] var22 = var21.actions; // L: 8347 - if (var22 != null) { // L: 8348 - for (int var23 = 4; var23 >= 0; --var23) { // L: 8349 - if (var22[var23] != null) { // L: 8350 - short var24 = 0; // L: 8351 - if (var23 == 0) { // L: 8352 - var24 = 3; - } - - if (var23 == 1) { // L: 8353 - var24 = 4; - } - - if (var23 == 2) { // L: 8354 - var24 = 5; - } - - if (var23 == 3) { // L: 8355 - var24 = 6; - } - - if (var23 == 4) { // L: 8356 - var24 = 1001; - } - - StructDefinition.insertMenuItemNoShift(var22[var23], WorldMapAreaData.colorStartTag(65535) + var21.name, var24, var30, var15, var17); // L: 8357 - } - } - } - - StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(65535) + var21.name, 1002, var21.id, var15, var17); // L: 8362 - } - } - - Player var25; - int var31; - NPC var32; - int var39; - int[] var40; - if (var19 == 1) { // L: 8367 - NPC var35 = Client.npcs[var30]; // L: 8368 - if (var35 == null) { // L: 8369 - break label326; - } - - if (var35.definition.size == 1 && (var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 8370 - for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 8371 - var32 = Client.npcs[Client.npcIndices[var31]]; // L: 8372 - if (var32 != null && var35 != var32 && var32.definition.size == 1 && var35.x == var32.x && var35.y == var32.y) { // L: 8373 - GrandExchangeEvents.addNpcToMenu(var32.definition, Client.npcIndices[var31], var15, var17); - } - } - - var31 = Players.Players_count; // L: 8375 - var40 = Players.Players_indices; // L: 8376 - - for (var39 = 0; var39 < var31; ++var39) { // L: 8377 - var25 = Client.players[var40[var39]]; // L: 8378 - if (var25 != null && var35.x == var25.x && var25.y == var35.y) { // L: 8379 - VarpDefinition.addPlayerToMenu(var25, var40[var39], var15, var17); - } - } - } - - GrandExchangeEvents.addNpcToMenu(var35.definition, var30, var15, var17); // L: 8382 - } - - if (var19 == 0) { // L: 8384 - Player var36 = Client.players[var30]; // L: 8385 - if (var36 == null) { // L: 8386 - break label326; - } - - if ((var36.x & 127) == 64 && (var36.y & 127) == 64) { // L: 8387 - for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 8388 - var32 = Client.npcs[Client.npcIndices[var31]]; // L: 8389 - if (var32 != null && var32.definition.size == 1 && var32.x == var36.x && var36.y == var32.y) { // L: 8390 - GrandExchangeEvents.addNpcToMenu(var32.definition, Client.npcIndices[var31], var15, var17); - } - } - - var31 = Players.Players_count; // L: 8392 - var40 = Players.Players_indices; // L: 8393 - - for (var39 = 0; var39 < var31; ++var39) { // L: 8394 - var25 = Client.players[var40[var39]]; // L: 8395 - if (var25 != null && var36 != var25 && var25.x == var36.x && var36.y == var25.y) { // L: 8396 - VarpDefinition.addPlayerToMenu(var25, var40[var39], var15, var17); - } - } - } - - if (var30 != Client.combatTargetPlayerIndex) { // L: 8399 - VarpDefinition.addPlayerToMenu(var36, var30, var15, var17); - } else { - var4 = var27; // L: 8400 - } - } - - if (var19 == 3) { // L: 8402 - NodeDeque var38 = Client.groundItems[Huffman.Client_plane][var15][var17]; // L: 8403 - if (var38 != null) { // L: 8404 - for (TileItem var37 = (TileItem)var38.first(); var37 != null; var37 = (TileItem)var38.next()) { // L: 8405 8406 8439 - ItemDefinition var41 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var37.id); // L: 8407 - if (Client.isItemSelected == 1) { // L: 8408 - StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var41.name, 16, var37.id, var15, var17); // L: 8409 - } else if (Client.isSpellSelected) { // L: 8412 - if ((UserComparator8.selectedSpellFlags & 1) == 1) { // L: 8413 - StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var41.name, 17, var37.id, var15, var17); // L: 8414 - } - } else { - String[] var33 = var41.groundActions; // L: 8419 - - for (int var34 = 4; var34 >= 0; --var34) { // L: 8420 - if (var33 != null && var33[var34] != null) { // L: 8421 - byte var26 = 0; // L: 8422 - if (var34 == 0) { // L: 8423 - var26 = 18; - } - - if (var34 == 1) { // L: 8424 - var26 = 19; - } - - if (var34 == 2) { // L: 8425 - var26 = 20; - } - - if (var34 == 3) { // L: 8426 - var26 = 21; - } - - if (var34 == 4) { // L: 8427 - var26 = 22; - } - - StructDefinition.insertMenuItemNoShift(var33[var34], WorldMapAreaData.colorStartTag(16748608) + var41.name, var26, var37.id, var15, var17); // L: 8428 - } else if (var34 == 2) { // L: 8431 - StructDefinition.insertMenuItemNoShift("Take", WorldMapAreaData.colorStartTag(16748608) + var41.name, 20, var37.id, var15, var17); // L: 8432 - } - } - - StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16748608) + var41.name, 1004, var37.id, var15, var17); // L: 8436 - } - } - } - } - } - } - - ++var8; // L: 8295 - } + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 13 } - @ObfuscatedName("kd") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "68" + descriptor = "(IB)I", + garbageValue = "-50" ) - public static boolean method3576() { - return Client.staffModLevel >= 2; // L: 10872 + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 59 + if (var0 < 0 || var0 >= 65536) { // L: 60 + var0 >>>= 16; // L: 61 + var1 += 16; // L: 62 + } + + if (var0 >= 256) { // L: 64 + var0 >>>= 8; // L: 65 + var1 += 8; // L: 66 + } + + if (var0 >= 16) { // L: 68 + var0 >>>= 4; // L: 69 + var1 += 4; // L: 70 + } + + if (var0 >= 4) { // L: 72 + var0 >>>= 2; // L: 73 + var1 += 2; // L: 74 + } + + if (var0 >= 1) { // L: 76 + var0 >>>= 1; // L: 77 + ++var1; // L: 78 + } + + return var0 + var1; // L: 80 } + + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(Lbz;B)V", + garbageValue = "101" + ) + static final void method3619(PendingSpawn var0) { + long var1 = 0L; // L: 7170 + int var3 = -1; // L: 7171 + int var4 = 0; // L: 7172 + int var5 = 0; // L: 7173 + if (var0.type == 0) { // L: 7174 + var1 = ModeWhere.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 7175 + var1 = ModeWhere.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 7176 + var1 = ModeWhere.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = ModeWhere.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7177 + } + + if (var1 != 0L) { // L: 7178 + int var6 = ModeWhere.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7179 + var3 = ObjectSound.Entity_unpackID(var1); // L: 7180 + var4 = var6 & 31; // L: 7181 + var5 = var6 >> 6 & 3; // L: 7182 + } + + var0.objectId = var3; // L: 7184 + var0.field959 = var4; // L: 7185 + var0.field963 = var5; // L: 7186 + } // L: 7187 } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index ce96c38f24..00ec45cf72 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -2,84 +2,104 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bz") +@ObfuscatedName("bp") +@Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("z") + @ObfuscatedName("sg") @ObfuscatedSignature( - descriptor = "Lbz;" + descriptor = "Lmi;" ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lbp;" + ) + @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cu") - public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cc") - public static int[] field409; - @ObfuscatedName("cf") - @ObfuscatedGetter( - intValue = 1174776797 - ) - public static int field417; - @ObfuscatedName("cj") - @ObfuscatedGetter( - intValue = -1365142337 - ) - public static int field418; - @ObfuscatedName("cd") - static char[] field419; @ObfuscatedName("cx") - static int[] field420; - @ObfuscatedName("cp") - public static int[] field421; - @ObfuscatedName("ch") + @Export("KeyHandler_pressedKeys") + public static boolean[] KeyHandler_pressedKeys; + @ObfuscatedName("cw") + static int[] field435; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 371324485 + intValue = -975081949 ) - public static int field422; - @ObfuscatedName("cs") + static int field422; + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1473086325 + intValue = 854592381 ) - public static int field423; - @ObfuscatedName("ck") + static int field423; + @ObfuscatedName("cd") + static char[] field424; + @ObfuscatedName("cj") + static int[] field425; + @ObfuscatedName("cm") + public static int[] field430; + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 2078161479 + intValue = 99767687 ) - public static int field424; - @ObfuscatedName("co") + public static int field427; + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -1475693687 + intValue = 1166391639 ) - public static int field399; + static int field415; + @ObfuscatedName("cv") + @ObfuscatedGetter( + intValue = -440762137 + ) + static int field413; @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -2101231775 + intValue = 1638279281 ) - public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cy") - static int[] KeyHandler_keyCodes; - @ObfuscatedName("dr") + static int field428; + @ObfuscatedName("ch") @ObfuscatedGetter( - longValue = -5651230833669824683L + intValue = 49570399 ) - static long field428; + @Export("KeyHandler_idleCycles") + static volatile int KeyHandler_idleCycles; + @ObfuscatedName("co") + @Export("KeyHandler_keyCodes") + static int[] KeyHandler_keyCodes; + @ObfuscatedName("do") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("ld") + @ObfuscatedGetter( + intValue = 1074315087 + ) + @Export("menuWidth") + static int menuWidth; static { KeyHandler_instance = new KeyHandler(); // L: 13 KeyHandler_pressedKeys = new boolean[112]; // L: 100 - field409 = new int[128]; // L: 103 - field417 = 0; // L: 104 - field418 = 0; // L: 105 - field419 = new char[128]; // L: 106 - field420 = new int[128]; // L: 107 - field421 = new int[128]; // L: 108 - field422 = 0; // L: 109 - field423 = 0; // L: 110 - field424 = 0; // L: 111 - field399 = 0; // L: 112 + field435 = new int[128]; // L: 103 + field422 = 0; // L: 104 + field423 = 0; // L: 105 + field424 = new char[128]; // L: 106 + field425 = new int[128]; // L: 107 + field430 = new int[128]; // L: 108 + field427 = 0; // L: 109 + field415 = 0; // L: 110 + field413 = 0; // L: 111 + field428 = 0; // L: 112 KeyHandler_idleCycles = 0; // L: 113 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}; // L: 114 } @@ -88,209 +108,560 @@ public final class KeyHandler implements KeyListener, FocusListener { } // L: 116 public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 178 - int var2 = var1.getKeyCode(); // L: 179 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 180 - var2 = KeyHandler_keyCodes[var2]; // L: 181 - if ((var2 & 128) != 0) { // L: 182 + if (KeyHandler_instance != null) { // L: 197 + int var2 = var1.getKeyCode(); // L: 198 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 199 + var2 = KeyHandler_keyCodes[var2]; // L: 200 + if ((var2 & 128) != 0) { // L: 201 var2 = -1; } } else { - var2 = -1; // L: 184 + var2 = -1; // L: 203 } - if (field418 >= 0 && var2 >= 0) { // L: 185 - field409[field418] = var2; // L: 186 - field418 = field418 + 1 & 127; // L: 187 - if (field418 == field417) { // L: 188 - field418 = -1; + if (field423 >= 0 && var2 >= 0) { // L: 204 + field435[field423] = var2; // L: 205 + field423 = field423 + 1 & 127; // L: 206 + if (field422 == field423) { // L: 207 + field423 = -1; } } int var3; - if (var2 >= 0) { // L: 190 - var3 = field424 + 1 & 127; // L: 191 - if (var3 != field423) { // L: 192 - field420[field424] = var2; // L: 193 - field419[field424] = 0; // L: 194 - field424 = var3; // L: 195 + if (var2 >= 0) { // L: 209 + var3 = field413 + 1 & 127; // L: 210 + if (var3 != field415) { // L: 211 + field425[field413] = var2; // L: 212 + field424[field413] = 0; // L: 213 + field413 = var3; // L: 214 } } - var3 = var1.getModifiers(); // L: 198 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 199 - var1.consume(); // L: 200 + var3 = var1.getModifiers(); // L: 217 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 218 + var1.consume(); // L: 219 } } - } // L: 203 + } // L: 222 public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 206 - int var2 = var1.getKeyCode(); // L: 207 - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 208 + if (KeyHandler_instance != null) { // L: 225 + int var2 = var1.getKeyCode(); // L: 226 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 227 var2 = KeyHandler_keyCodes[var2] & -129; } else { - var2 = -1; // L: 209 + var2 = -1; // L: 228 } - if (field418 >= 0 && var2 >= 0) { // L: 210 - field409[field418] = ~var2; // L: 211 - field418 = field418 + 1 & 127; // L: 212 - if (field417 == field418) { // L: 213 - field418 = -1; + if (field423 >= 0 && var2 >= 0) { // L: 229 + field435[field423] = ~var2; // L: 230 + field423 = field423 + 1 & 127; // L: 231 + if (field422 == field423) { // L: 232 + field423 = -1; } } } - var1.consume(); // L: 216 - } // L: 217 + var1.consume(); // L: 235 + } // L: 236 public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 220 - char var2 = var1.getKeyChar(); // L: 221 - if (var2 != 0 && var2 != '\uffff' && ClanMate.method5146(var2)) { // L: 222 - int var3 = field424 + 1 & 127; // L: 223 - if (var3 != field423) { // L: 224 - field420[field424] = -1; // L: 225 - field419[field424] = var2; // L: 226 - field424 = var3; // L: 227 + if (KeyHandler_instance != null) { // L: 239 + char var2 = var1.getKeyChar(); // L: 240 + if (var2 != 0 && var2 != '\uffff') { // L: 241 + boolean var3; + if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { // L: 244 + label53: { + if (var2 != 0) { // L: 248 + char[] var4 = class298.cp1252AsciiExtension; // L: 250 + + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 251 + char var6 = var4[var5]; // L: 252 + if (var2 == var6) { // L: 254 + var3 = true; // L: 255 + break label53; // L: 256 + } + } + } + + var3 = false; // L: 262 + } + } else { + var3 = true; // L: 245 + } + + if (var3) { // L: 264 + int var7 = field413 + 1 & 127; // L: 265 + if (var7 != field415) { // L: 266 + field425[field413] = -1; // L: 267 + field424[field413] = var2; // L: 268 + field413 = var7; // L: 269 + } } } } - var1.consume(); // L: 231 - } // L: 232 - - public final void focusGained(FocusEvent var1) { - } // L: 234 + var1.consume(); // L: 274 + } // L: 275 public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 237 - field418 = -1; // L: 238 + if (KeyHandler_instance != null) { // L: 280 + field423 = -1; // L: 281 } - } // L: 240 + } // L: 283 - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(ILcy;ZS)I", - garbageValue = "20933" - ) - static int method888(int var0, Script var1, boolean var2) { - Widget var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1165 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1166 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1167 - return 1; // L: 1168 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1170 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1171 - return 1; // L: 1172 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1174 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1175 - return 1; // L: 1176 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1178 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1179 - return 1; // L: 1180 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1182 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1183 - return 1; // L: 1184 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1186 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1187 - return 1; // L: 1188 - } else { - return 2; // L: 1190 - } + public final void focusGained(FocusEvent var1) { + } // L: 277 + + @ObfuscatedName("m") + @Export("Entity_unpackSceneX") + public static int Entity_unpackSceneX(long var0) { + return (int)(var0 >>> 14 & 3L); // L: 56 } - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-2116995396" + descriptor = "(ILco;ZB)I", + garbageValue = "3" ) - static int method890(int var0, Script var1, boolean var2) { - Widget var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1194 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1195 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1196 - return 1; // L: 1197 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1199 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1200 - return 1; // L: 1201 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1203 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.text; // L: 1204 - return 1; // L: 1205 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1207 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1208 - return 1; // L: 1209 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1211 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1212 - return 1; // L: 1213 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1215 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1216 - return 1; // L: 1217 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1219 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1220 - return 1; // L: 1221 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1223 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1224 - return 1; // L: 1225 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1227 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1228 - return 1; // L: 1229 - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1231 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1232 - return 1; // L: 1233 - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1235 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1236 - return 1; // L: 1237 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1239 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1240 - return 1; // L: 1241 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1243 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1244 - return 1; // L: 1245 - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1247 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1248 - return 1; // L: 1249 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1251 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1252 - return 1; // L: 1253 + static int method934(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 548 + Widget var3; + if (var0 >= 2000) { // L: 549 + var0 -= 1000; // L: 550 + var4 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 551 + var3 = UserComparator4.getWidget(var4); // L: 552 } else { - return 2; // L: 1255 + var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 554 } - } - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "([Lhq;IIIZI)V", - garbageValue = "102322570" - ) - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9227 - Widget var6 = var0[var5]; // L: 9228 - if (var6 != null && var6.parentId == var1) { // L: 9229 9230 - MouseRecorder.alignWidgetSize(var6, var2, var3, var4); // L: 9231 - DirectByteArrayCopier.alignWidgetPosition(var6, var2, var3); // L: 9232 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9233 - var6.scrollX = var6.scrollWidth - var6.width; + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 555 + MilliClock.Interpreter_intStackSize -= 2; // L: 556 + var3.scrollX = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 557 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 558 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 559 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 560 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 561 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 562 + var3.scrollY = 0; + } + + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 563 + return 1; // L: 564 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 566 + var3.color = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 567 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 568 + return 1; // L: 569 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 571 + var3.fill = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 572 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 573 + return 1; // L: 574 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 576 + var3.transparencyTop = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 577 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 578 + return 1; // L: 579 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 581 + var3.lineWid = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 582 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 583 + return 1; // L: 584 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 586 + var3.spriteId2 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 587 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 588 + return 1; // L: 589 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 591 + var3.spriteAngle = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 592 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 593 + return 1; // L: 594 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 596 + var3.spriteTiling = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 597 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 598 + return 1; // L: 599 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 601 + var3.modelType = 1; // L: 602 + var3.modelId = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 603 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 604 + return 1; // L: 605 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 607 + MilliClock.Interpreter_intStackSize -= 6; // L: 608 + var3.modelOffsetX = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 609 + var3.modelOffsetY = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 610 + var3.modelAngleX = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 611 + var3.modelAngleY = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3]; // L: 612 + var3.modelAngleZ = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 4]; // L: 613 + var3.modelZoom = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 5]; // L: 614 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 615 + return 1; // L: 616 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 618 + var8 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 619 + if (var8 != var3.sequenceId) { // L: 620 + var3.sequenceId = var8; // L: 621 + var3.modelFrame = 0; // L: 622 + var3.modelFrameCycle = 0; // L: 623 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 624 } - if (var6.scrollX < 0) { // L: 9234 - var6.scrollX = 0; + return 1; // L: 626 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 628 + var3.modelOrthog = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 629 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 630 + return 1; // L: 631 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 633 + String var7 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 634 + if (!var7.equals(var3.text)) { // L: 635 + var3.text = var7; // L: 636 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 637 } - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9235 - var6.scrollY = var6.scrollHeight - var6.height; + return 1; // L: 639 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 641 + var3.fontId = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 642 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 643 + return 1; // L: 644 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 646 + MilliClock.Interpreter_intStackSize -= 3; // L: 647 + var3.textXAlignment = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 648 + var3.textYAlignment = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 649 + var3.textLineHeight = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 650 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 651 + return 1; // L: 652 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 654 + var3.textShadowed = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 655 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 656 + return 1; // L: 657 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 659 + var3.outline = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 660 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 661 + return 1; // L: 662 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 664 + var3.spriteShadow = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 665 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 666 + return 1; // L: 667 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 669 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 670 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 671 + return 1; // L: 672 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 674 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 675 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 676 + return 1; // L: 677 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 679 + MilliClock.Interpreter_intStackSize -= 2; // L: 680 + var3.scrollWidth = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 681 + var3.scrollHeight = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 682 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 683 + if (var4 != -1 && var3.type == 0) { // L: 684 + UserComparator9.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); } - if (var6.scrollY < 0) { // L: 9236 - var6.scrollY = 0; + return 1; // L: 685 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 687 + class171.resumePauseWidget(var3.id, var3.childIndex); // L: 688 + Client.meslayerContinueWidget = var3; // L: 689 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 690 + return 1; // L: 691 + } else if (var0 == 1122) { // L: 693 + var3.spriteId = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 694 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 695 + return 1; // L: 696 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 698 + var3.color2 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 699 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 700 + return 1; // L: 701 + } else if (var0 == 1124) { // L: 703 + var3.transparencyBot = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 704 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 705 + return 1; // L: 706 + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 708 + var8 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 709 + FillMode var6 = (FillMode)class195.findEnumerated(PacketWriter.FillMode_values(), var8); // L: 710 + if (var6 != null) { // L: 711 + var3.fillMode = var6; // L: 712 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 713 } - if (var6.type == 0) { // L: 9237 - class4.revalidateWidgetScroll(var0, var6, var4); + return 1; // L: 715 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 717 + var5 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 718 + var3.field2627 = var5; // L: 719 + return 1; // L: 720 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 722 + var5 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 723 + var3.modelTransparency = var5; // L: 724 + return 1; // L: 725 + } else { + return 2; // L: 727 } } } + } - } // L: 9239 + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1840062887" + ) + static final void method931() { + Client.field795 = 0; // L: 5380 + int var0 = (PlayerType.localPlayer.x >> 7) + FloorDecoration.baseX; // L: 5381 + int var1 = (PlayerType.localPlayer.y >> 7) + WorldMapData_0.baseY; // L: 5382 + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5383 + Client.field795 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5384 + Client.field795 = 1; + } + + if (Client.field795 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5385 + Client.field795 = 0; + } + + } // L: 5386 + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "-1824225693" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 8938 + if (Client.menuOptionsCount < 500) { // L: 8939 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 8940 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8941 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8942 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8943 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8944 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8945 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8946 + ++Client.menuOptionsCount; // L: 8947 + } + + } + } // L: 8949 + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "82006207" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 8960 + ModelData0.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 8961 + } + + long var4 = -1L; // L: 8964 + long var6 = -1L; // L: 8965 + int var8 = 0; + + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 8970 + if (var8 >= var10) { // L: 8972 + if (var4 != -1L) { // L: 9114 + var8 = ScriptFrame.method1228(var4); // L: 9115 + int var9 = (int)(var4 >>> 7 & 127L); // L: 9118 + Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9121 + UserComparator3.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 9122 + } + + return; // L: 9124 + } + + long var28 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8975 + if (var28 != var6) { // L: 8978 + label333: { + var6 = var28; // L: 8979 + int var15 = ScriptFrame.method1228(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 8982 + int var16 = var15; // L: 8984 + long var19 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8988 + int var18 = (int)(var19 >>> 7 & 127L); // L: 8990 + var18 = var18; // L: 8994 + int var30 = Entity_unpackSceneX(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 8997 + int var21 = StructDefinition.getEntityIdUnderMouse(var8); // L: 9000 + if (var30 == 2 && ModeWhere.scene.getObjectFlags(GrandExchangeOfferUnitPriceComparator.Client_plane, var15, var18, var28) >= 0) { // L: 9001 9002 + ObjectDefinition var22 = ScriptEvent.getObjectDefinition(var21); // L: 9003 + if (var22.transforms != null) { // L: 9004 + var22 = var22.transform(); + } + + if (var22 == null) { // L: 9005 + break label333; + } + + if (Client.isItemSelected == 1) { // L: 9006 + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + Client.colorStartTag(65535) + var22.name, 1, var21, var15, var18); // L: 9007 + } else if (Client.isSpellSelected) { // L: 9010 + if ((class105.selectedSpellFlags & 4) == 4) { // L: 9011 + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + Client.colorStartTag(65535) + var22.name, 2, var21, var15, var18); // L: 9012 + } + } else { + String[] var23 = var22.actions; // L: 9017 + if (var23 != null) { // L: 9018 + for (int var24 = 4; var24 >= 0; --var24) { // L: 9019 + if (var23[var24] != null) { // L: 9020 + short var25 = 0; // L: 9021 + if (var24 == 0) { // L: 9022 + var25 = 3; + } + + if (var24 == 1) { // L: 9023 + var25 = 4; + } + + if (var24 == 2) { // L: 9024 + var25 = 5; + } + + if (var24 == 3) { // L: 9025 + var25 = 6; + } + + if (var24 == 4) { // L: 9026 + var25 = 1001; + } + + ModelData0.insertMenuItemNoShift(var23[var24], Client.colorStartTag(65535) + var22.name, var25, var21, var16, var18); // L: 9027 + } + } + } + + ModelData0.insertMenuItemNoShift("Examine", Client.colorStartTag(65535) + var22.name, 1002, var22.id, var16, var18); // L: 9032 + } + } + + Player var26; + int var31; + NPC var32; + int var39; + int[] var40; + if (var30 == 1) { // L: 9037 + NPC var35 = Client.npcs[var21]; // L: 9038 + if (var35 == null) { // L: 9039 + break label333; + } + + if (var35.definition.size == 1 && (var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9040 + for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 9041 + var32 = Client.npcs[Client.npcIndices[var31]]; // L: 9042 + if (var32 != null && var35 != var32 && var32.definition.size == 1 && var32.x == var35.x && var35.y == var32.y) { // L: 9043 + class25.addNpcToMenu(var32.definition, Client.npcIndices[var31], var16, var18); + } + } + + var31 = Players.Players_count; // L: 9045 + var40 = Players.Players_indices; // L: 9046 + + for (var39 = 0; var39 < var31; ++var39) { // L: 9047 + var26 = Client.players[var40[var39]]; // L: 9048 + if (var26 != null && var35.x == var26.x && var26.y == var35.y) { // L: 9049 + UserComparator3.addPlayerToMenu(var26, var40[var39], var16, var18); + } + } + } + + class25.addNpcToMenu(var35.definition, var21, var16, var18); // L: 9052 + } + + if (var30 == 0) { // L: 9054 + Player var36 = Client.players[var21]; // L: 9055 + if (var36 == null) { // L: 9056 + break label333; + } + + if ((var36.x & 127) == 64 && (var36.y & 127) == 64) { // L: 9057 + for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 9058 + var32 = Client.npcs[Client.npcIndices[var31]]; // L: 9059 + if (var32 != null && var32.definition.size == 1 && var36.x == var32.x && var36.y == var32.y) { // L: 9060 + class25.addNpcToMenu(var32.definition, Client.npcIndices[var31], var16, var18); + } + } + + var31 = Players.Players_count; // L: 9062 + var40 = Players.Players_indices; // L: 9063 + + for (var39 = 0; var39 < var31; ++var39) { // L: 9064 + var26 = Client.players[var40[var39]]; // L: 9065 + if (var26 != null && var26 != var36 && var36.x == var26.x && var36.y == var26.y) { // L: 9066 + UserComparator3.addPlayerToMenu(var26, var40[var39], var16, var18); + } + } + } + + if (var21 != Client.combatTargetPlayerIndex) { // L: 9069 + UserComparator3.addPlayerToMenu(var36, var21, var16, var18); + } else { + var4 = var28; // L: 9070 + } + } + + if (var30 == 3) { // L: 9072 + NodeDeque var38 = Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var16][var18]; // L: 9073 + if (var38 != null) { // L: 9074 + for (TileItem var37 = (TileItem)var38.first(); var37 != null; var37 = (TileItem)var38.next()) { // L: 9075 9076 9109 + ItemDefinition var41 = AbstractWorldMapData.ItemDefinition_get(var37.id); // L: 9077 + if (Client.isItemSelected == 1) { // L: 9078 + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + Client.colorStartTag(16748608) + var41.name, 16, var37.id, var16, var18); // L: 9079 + } else if (Client.isSpellSelected) { // L: 9082 + if ((class105.selectedSpellFlags & 1) == 1) { // L: 9083 + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + Client.colorStartTag(16748608) + var41.name, 17, var37.id, var16, var18); // L: 9084 + } + } else { + String[] var33 = var41.groundActions; // L: 9089 + + for (int var34 = 4; var34 >= 0; --var34) { // L: 9090 + if (var33 != null && var33[var34] != null) { // L: 9091 + byte var27 = 0; // L: 9092 + if (var34 == 0) { // L: 9093 + var27 = 18; + } + + if (var34 == 1) { // L: 9094 + var27 = 19; + } + + if (var34 == 2) { // L: 9095 + var27 = 20; + } + + if (var34 == 3) { // L: 9096 + var27 = 21; + } + + if (var34 == 4) { // L: 9097 + var27 = 22; + } + + ModelData0.insertMenuItemNoShift(var33[var34], Client.colorStartTag(16748608) + var41.name, var27, var37.id, var16, var18); // L: 9098 + } else if (var34 == 2) { // L: 9101 + ModelData0.insertMenuItemNoShift("Take", Client.colorStartTag(16748608) + var41.name, 20, var37.id, var16, var18); // L: 9102 + } + } + + ModelData0.insertMenuItemNoShift("Examine", Client.colorStartTag(16748608) + var41.name, 1004, var37.id, var16, var18); // L: 9106 + } + } + } + } + } + } + + ++var8; // L: 8966 + } + } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 5347ced6c9..6ee49a7827 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -1,47 +1,67 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("ii") +@Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("KitDefinition_archive") static AbstractArchive KitDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("KitDefinition_modelsArchive") static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 12947469 + intValue = -609176759 ) + @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -346028961 - ) - public int bodypartID; - @ObfuscatedName("o") - int[] models2; - @ObfuscatedName("x") - short[] recolorFrom; - @ObfuscatedName("w") - short[] recolorTo; - @ObfuscatedName("g") - short[] retextureFrom; @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("KitDefinition_cached") + public static EvictingDualNodeHashTable KitDefinition_cached; + @ObfuscatedName("ed") + @ObfuscatedGetter( + intValue = 1533008419 + ) + static int field3297; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1729249671 + ) + @Export("bodypartID") + public int bodypartID; + @ObfuscatedName("q") + @Export("models2") + int[] models2; + @ObfuscatedName("k") + @Export("recolorFrom") + short[] recolorFrom; + @ObfuscatedName("c") + @Export("recolorTo") + short[] recolorTo; + @ObfuscatedName("u") + @Export("retextureFrom") + short[] retextureFrom; + @ObfuscatedName("t") + @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("models") int[] models; - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("nonSelectable") public boolean nonSelectable; static { @@ -54,11 +74,12 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; // L: 22 } // L: 24 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-861511508" + descriptor = "(Lkb;I)V", + garbageValue = "-902223111" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 44 @@ -70,11 +91,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;IB)V", - garbageValue = "36" + descriptor = "(Lkb;IB)V", + garbageValue = "101" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 51 this.bodypartID = var1.readUnsignedByte(); @@ -115,11 +137,12 @@ public class KitDefinition extends DualNode { } // L: 78 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-62" + descriptor = "(I)Z", + garbageValue = "1495290745" ) + @Export("ready") public boolean ready() { if (this.models2 == null) { // L: 81 return true; @@ -136,11 +159,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Lee;", - garbageValue = "-1978614087" + descriptor = "(B)Len;", + garbageValue = "-99" ) + @Export("getModelData") public ModelData getModelData() { if (this.models2 == null) { // L: 88 return null; @@ -175,12 +199,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-57" + descriptor = "(I)Z", + garbageValue = "-1549480832" ) - public boolean method4543() { + public boolean method4620() { boolean var1 = true; // L: 108 for (int var2 = 0; var2 < 5; ++var2) { // L: 109 @@ -192,11 +216,12 @@ public class KitDefinition extends DualNode { return var1; // L: 112 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Lee;", - garbageValue = "16" + descriptor = "(I)Len;", + garbageValue = "1284292663" ) + @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { ModelData[] var1 = new ModelData[5]; // L: 116 int var2 = 0; // L: 117 @@ -224,16 +249,73 @@ public class KitDefinition extends DualNode { return var5; // L: 132 } - @ObfuscatedName("jc") + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "1024" + descriptor = "(IIII)V", + garbageValue = "2143746786" ) - static final void FriendSystem_invalidateIgnoreds() { - UserComparator8.method3497(); // L: 10675 - if (Entity.clanChat != null) { // L: 10676 - Entity.clanChat.invalidateIgnoreds(); // L: 10677 + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3574 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3575 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3576 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3577 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3578 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3579 + ++Client.soundEffectCount; // L: 3580 } - } // L: 10679 + } // L: 3582 + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1433287432" + ) + static void method4634(int var0, int var1) { + int var2 = ReflectionCheck.fontBold12.stringWidth("Choose Option"); // L: 7895 + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7896 + Font var7 = ReflectionCheck.fontBold12; // L: 7897 + String var8; + if (var3 < 0) { // L: 7900 + var8 = ""; // L: 7901 + } else if (Client.menuTargets[var3].length() > 0) { // L: 7904 + var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + } else { + var8 = Client.menuActions[var3]; // L: 7905 + } + + int var6 = var7.stringWidth(var8); // L: 7907 + if (var6 > var2) { // L: 7908 + var2 = var6; + } + } + + var2 += 8; // L: 7910 + var3 = Client.menuOptionsCount * 15 + 22; // L: 7911 + int var4 = var0 - var2 / 2; // L: 7912 + if (var4 + var2 > ItemContainer.canvasWidth) { // L: 7913 + var4 = ItemContainer.canvasWidth - var2; + } + + if (var4 < 0) { // L: 7914 + var4 = 0; + } + + int var5 = var1; // L: 7915 + if (var1 + var3 > HealthBar.canvasHeight) { // L: 7916 + var5 = HealthBar.canvasHeight - var3; + } + + if (var5 < 0) { // L: 7917 + var5 = 0; + } + + Coord.menuX = var4; // L: 7918 + WorldMapArea.menuY = var5; // L: 7919 + KeyHandler.menuWidth = var2; // L: 7920 + ServerPacket.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7921 + } // L: 7922 } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 6ab0111e2d..a2c3d10457 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -1,69 +1,83 @@ 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("gn") +@ObfuscatedName("gb") +@Implements("Language") public class Language implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lgb;" + ) + @Export("Language_EN") + public static final Language Language_EN; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lgb;" + ) + @Export("Language_DE") + static final Language Language_DE; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lgb;" + ) + @Export("Language_FR") + public static final Language Language_FR; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgb;" + ) + @Export("Language_PT") + static final Language Language_PT; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgb;" ) - public static final Language Language_EN; + @Export("Language_NL") + static final Language Language_NL; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lgb;" + ) + @Export("Language_ES") + public static final Language Language_ES; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgn;" - ) - static final Language Language_DE; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final Language Language_FR; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - static final Language Language_PT; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - static final Language Language_NL; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final Language Language_ES; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgb;" ) + @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lgn;" + descriptor = "[Lgb;" ) - public static final Language[] Language_valuesOrdered; - @ObfuscatedName("w") - final String field2387; - @ObfuscatedName("g") + @Export("Language_valuesOrdered") + static final Language[] Language_valuesOrdered; + @ObfuscatedName("c") + final String field2386; + @ObfuscatedName("u") + @Export("language") final String language; - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2011360821 + intValue = 311704961 ) + @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field2413, 0, "GB"); // L: 10 - Language_DE = new Language("DE", "de", "German", ModeWhere.field2413, 1, "DE"); // L: 11 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field2413, 2, "FR"); // L: 12 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2413, 3, "BR"); // L: 13 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2407, 4, "NL"); // L: 14 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2407, 5, "ES"); // L: 15 - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2413, 6, "MX"); // L: 16 - Language[] var0 = new Language[]{Language_NL, Language_PT, Language_FR, Language_ES_MX, Language_ES, Language_DE, Language_EN}; // L: 25 + Language_EN = new Language("EN", "en", "English", ModeWhere.field2400, 0, "GB"); // L: 10 + Language_DE = new Language("DE", "de", "German", ModeWhere.field2400, 1, "DE"); // L: 11 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field2400, 2, "FR"); // L: 12 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2400, 3, "BR"); // L: 13 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2398, 4, "NL"); // L: 14 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2398, 5, "ES"); // L: 15 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2400, 6, "MX"); // L: 16 + Language[] var0 = new Language[]{Language_ES_MX, Language_PT, Language_FR, Language_EN, Language_NL, Language_ES, Language_DE}; // L: 25 Language_valuesOrdered = new Language[var0.length]; // L: 28 Language[] var2 = var0; // L: 30 @@ -79,10 +93,10 @@ public class Language implements Enumerated { } // L: 41 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgy;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgc;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field2387 = var1; // L: 44 + this.field2386 = var1; // L: 44 this.language = var2; // L: 45 this.id = var5; // L: 46 if (var6 != null) { // L: 47 @@ -93,25 +107,205 @@ public class Language implements Enumerated { } // L: 53 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1763794440" + garbageValue = "-1347438678" ) + @Export("getLanguage") String getLanguage() { return this.language; // L: 56 } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 60 } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 64 + return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69 } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)Lgb;", + garbageValue = "1" + ) + public static Language method3800(int var0) { + return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "2079407888" + ) + static int method3802(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 945 + var0 -= 1000; // L: 946 + var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 947 + } else { + var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 949 + } + + String var4 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 950 + int[] var5 = null; // L: 951 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 952 + int var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 953 + if (var6 > 0) { // L: 954 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]) { // L: 955 956 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 958 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 960 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 961 + if (var4.charAt(var7 - 1) == 's') { // L: 962 + var8[var7] = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 963 + } + } + + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 965 + if (var7 != -1) { // L: 966 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 967 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 968 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 969 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 970 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 971 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 972 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 973 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 974 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 975 + var3.onVarTransmit = var8; // L: 976 + var3.varTransmitTriggers = var5; // L: 977 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 979 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 980 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 981 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 982 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 983 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 984 + var3.onInvTransmit = var8; // L: 985 + var3.invTransmitTriggers = var5; // L: 986 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 988 + var3.onStatTransmit = var8; // L: 989 + var3.statTransmitTriggers = var5; // L: 990 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; // L: 992 + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 993 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 994 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 995 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 996 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 997 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 998 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 999 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1000 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1001 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1002 + var3.field2669 = var8; + } else { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { // L: 1003 + return 2; // L: 1004 + } + + var3.onResize = var8; + } + + var3.hasListener = true; // L: 1005 + return 1; // L: 1006 + } + + @ObfuscatedName("el") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-581351950" + ) + static void method3791() { + Client.packetWriter.clearBuffer(); // L: 2840 + Client.packetWriter.packetBuffer.offset = 0; // L: 2841 + Client.packetWriter.serverPacket = null; // L: 2842 + Client.packetWriter.field1348 = null; // L: 2843 + Client.packetWriter.field1339 = null; // L: 2844 + Client.packetWriter.field1350 = null; // L: 2845 + Client.packetWriter.serverPacketLength = 0; // L: 2846 + Client.packetWriter.field1337 = 0; // L: 2847 + Client.rebootTimer = 0; // L: 2848 + AbstractWorldMapData.method375(); // L: 2849 + Client.minimapState = 0; // L: 2850 + Client.destinationX = 0; // L: 2851 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2852 + Client.players[var0] = null; + } + + PlayerType.localPlayer = null; // L: 2853 + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2854 + NPC var1 = Client.npcs[var0]; // L: 2855 + if (var1 != null) { // L: 2856 + var1.targetIndex = -1; // L: 2857 + var1.false0 = false; // L: 2858 + } + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2862 + BuddyRankComparator.updateGameState(30); // L: 2864 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2865 + Client.field834[var0] = true; + } + + Actor.method1855(); // L: 2866 + } // L: 2867 + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Lkb;I)V", + garbageValue = "-450810364" + ) + static void method3801(Buffer var0) { + if (Client.randomDatData != null) { // L: 11633 + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 11634 + } else { + byte[] var1 = class92.method2172(); // L: 11637 + var0.writeBytes(var1, 0, var1.length); // L: 11638 + } + } // L: 11635 11639 } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index 71abcd4b80..2b97cd07af 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -1,20 +1,26 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gq") +@Implements("Link") public class Link { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgq;" ) + @Export("previous") public Link previous; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgq;" ) + @Export("next") public Link next; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("remove") public void remove() { if (this.next != null) { // L: 8 this.next.previous = this.previous; // L: 9 diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index b9bbfdd951..079d13a1b2 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -1,17 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("jj") +@Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgq;" ) + @Export("sentinel") Link sentinel; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgq;" ) + @Export("current") Link current; public LinkDeque() { @@ -20,10 +25,11 @@ public class LinkDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lgr;)V" + descriptor = "(Lgq;)V" ) + @Export("addFirst") public void addFirst(Link var1) { if (var1.next != null) { // L: 15 var1.remove(); @@ -35,10 +41,11 @@ public class LinkDeque { var1.previous.next = var1; // L: 19 } // L: 20 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgq;" ) + @Export("last") public Link last() { Link var1 = this.sentinel.previous; // L: 23 if (var1 == this.sentinel) { // L: 24 @@ -50,10 +57,11 @@ public class LinkDeque { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgq;" ) + @Export("previous") public Link previous() { Link var1 = this.current; // L: 33 if (var1 == this.sentinel) { // L: 34 diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 8cf11a175d..a0669bd4e6 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -1,117 +1,158 @@ import java.text.DecimalFormat; +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("cx") +@ObfuscatedName("cj") +@Implements("Login") public class Login { - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("clearLoginScreen") static boolean clearLoginScreen; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1062905543 + intValue = 1744707789 ) + @Export("xPadding") static int xPadding; - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lle;" ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("leftTitleSprite") + static Sprite leftTitleSprite; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("rightTitleSprite") static Sprite rightTitleSprite; - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lle;" ) - static IndexedSprite field1221; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -760884959 + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lle;" ) - static int loginBoxX; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 496089237 - ) - static int Login_loadingPercent; + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; @ObfuscatedName("p") - static String Login_loadingText; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = -1163892197 - ) - static int field1210; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = -608933825 - ) - static int field1213; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 662808535 - ) - static int loginIndex; - @ObfuscatedName("aq") - static String Login_response0; - @ObfuscatedName("al") - static String Login_response1; - @ObfuscatedName("ah") - static String Login_response2; - @ObfuscatedName("av") - static String Login_response3; - @ObfuscatedName("ax") - static String Login_username; - @ObfuscatedName("as") - static String Login_password; - @ObfuscatedName("af") - static boolean field1224; - @ObfuscatedName("ak") - static boolean field1201; - @ObfuscatedName("bc") - static boolean field1223; - @ObfuscatedName("bz") - @ObfuscatedGetter( - intValue = -189383965 - ) - static int currentLoginField; - @ObfuscatedName("bg") - static boolean worldSelectOpen; - @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "[Lls;" + descriptor = "Lcg;" ) - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("bm") + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -322396857 + intValue = -1076468107 ) - static int hoveredWorldIndex; - @ObfuscatedName("bd") + @Export("loginBoxX") + static int loginBoxX; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1129392139 + intValue = -1330731251 ) - static int worldSelectPage; - @ObfuscatedName("bb") + @Export("Login_loadingPercent") + static int Login_loadingPercent; + @ObfuscatedName("a") + @Export("Login_loadingText") + static String Login_loadingText; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1846745523 + intValue = 1371548097 ) - static int worldSelectPagesCount; - @ObfuscatedName("bq") + static int field1216; + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = -4736688833894642183L + intValue = 402121111 ) - static long field1232; + static int field1217; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 1682315035 + ) + @Export("loginIndex") + static int loginIndex; + @ObfuscatedName("ai") + @Export("Login_response0") + static String Login_response0; + @ObfuscatedName("ax") + @Export("Login_response1") + static String Login_response1; + @ObfuscatedName("ag") + @Export("Login_response2") + static String Login_response2; + @ObfuscatedName("aq") + @Export("Login_response3") + static String Login_response3; + @ObfuscatedName("aw") + @Export("Login_username") + static String Login_username; + @ObfuscatedName("an") + @Export("Login_password") + static String Login_password; + @ObfuscatedName("al") + static boolean field1230; + @ObfuscatedName("ap") + static boolean field1229; + @ObfuscatedName("bf") + static boolean field1227; + @ObfuscatedName("bp") + @ObfuscatedGetter( + intValue = -1450671401 + ) + @Export("currentLoginField") + static int currentLoginField; + @ObfuscatedName("bl") + @Export("worldSelectOpen") + static boolean worldSelectOpen; @ObfuscatedName("by") @ObfuscatedGetter( - longValue = -2848820817006551463L + intValue = -374959449 ) - static long field1233; + @Export("hoveredWorldIndex") + static int hoveredWorldIndex; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = -1738897563 + ) + @Export("worldSelectPage") + static int worldSelectPage; + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = 1533348533 + ) + @Export("worldSelectPagesCount") + static int worldSelectPagesCount; + @ObfuscatedName("bs") + @ObfuscatedGetter( + longValue = -8374739296205492955L + ) + static long field1223; + @ObfuscatedName("bd") + @ObfuscatedGetter( + longValue = 3745631578629079475L + ) + static long field1241; static { xPadding = 0; // L: 38 loginBoxX = xPadding + 202; // L: 55 - Login_loadingPercent = 10; // L: 57 - Login_loadingText = ""; // L: 58 - field1210 = -1; // L: 65 - field1213 = 1; // L: 68 + Login_loadingPercent = 10; + Login_loadingText = ""; + field1216 = -1; // L: 65 + field1217 = 1; // L: 68 loginIndex = 0; // L: 72 Login_response0 = ""; // L: 73 Login_response1 = ""; // L: 74 @@ -119,9 +160,9 @@ public class Login { Login_response3 = ""; // L: 76 Login_username = ""; // L: 77 Login_password = ""; // L: 78 - field1224 = false; // L: 85 - field1201 = false; // L: 86 - field1223 = true; // L: 89 + field1230 = false; // L: 85 + field1229 = false; // L: 86 + field1227 = true; // L: 89 currentLoginField = 0; // L: 90 worldSelectOpen = false; // L: 94 hoveredWorldIndex = -1; // L: 102 @@ -129,47 +170,101 @@ public class Login { worldSelectPagesCount = 0; // L: 104 new DecimalFormat("##0.00"); // L: 107 new class171(); - field1232 = -1L; // L: 115 - field1233 = -1L; // L: 116 + field1223 = -1L; // L: 115 + field1241 = -1L; // L: 116 } - @ObfuscatedName("gm") + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-1829542828" + ) + public static String method2219(CharSequence var0) { + long var3 = 0L; // L: 44 + int var5 = var0.length(); // L: 45 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 46 + var3 *= 37L; // L: 47 + char var7 = var0.charAt(var6); // L: 48 + if (var7 >= 'A' && var7 <= 'Z') { // L: 49 + var3 += (long)(var7 + 1 - 65); + } else if (var7 >= 'a' && var7 <= 'z') { // L: 50 + var3 += (long)(var7 + 1 - 97); + } else if (var7 >= '0' && var7 <= '9') { + var3 += (long)(var7 + 27 - 48); // L: 51 + } + + if (var3 >= 177917621779460413L) { // L: 52 + break; + } + } + + while (var3 % 37L == 0L && var3 != 0L) { // L: 54 + var3 /= 37L; + } + + String var8 = class69.base37DecodeLong(var3); + if (var8 == null) { + var8 = ""; + } + + return var8; + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmp;" + ) + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { // L: 57 + var2 = (RunException)var0; // L: 58 + var2.message = var2.message + ' ' + var1; // L: 59 + } else { + var2 = new RunException(var0, var1); // L: 61 + } + + return var2; // L: 62 + } + + @ObfuscatedName("gn") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "942552334" + garbageValue = "-560858239" ) - static final void method2160() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4308 4309 4326 - if (var0.plane == Huffman.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4310 - if (Client.cycle >= var0.cycleStart) { // L: 4311 - if (var0.targetIndex > 0) { // L: 4312 - NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4313 - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4314 - var0.setDestination(var1.x, var1.y, ArchiveLoader.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); + static final void method2200() { + for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4878 4879 4896 + if (var0.plane == GrandExchangeOfferUnitPriceComparator.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4880 + if (Client.cycle >= var0.cycleStart) { // L: 4881 + if (var0.targetIndex > 0) { // L: 4882 + NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4883 + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4884 + var0.setDestination(var1.x, var1.y, GrandExchangeOfferWorldComparator.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); } } - if (var0.targetIndex < 0) { // L: 4316 - int var2 = -var0.targetIndex - 1; // L: 4318 + if (var0.targetIndex < 0) { // L: 4886 + int var2 = -var0.targetIndex - 1; // L: 4888 Player var3; - if (var2 == Client.localPlayerIndex) { // L: 4319 - var3 = WorldMapLabelSize.localPlayer; + if (var2 == Client.localPlayerIndex) { // L: 4889 + var3 = PlayerType.localPlayer; } else { - var3 = Client.players[var2]; // L: 4320 + var3 = Client.players[var2]; // L: 4890 } if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, ArchiveLoader.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4321 + var0.setDestination(var3.x, var3.y, GrandExchangeOfferWorldComparator.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4891 } } - var0.advance(Client.field737); // L: 4323 - ScriptEvent.scene.drawEntity(Huffman.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4324 + var0.advance(Client.field743); // L: 4893 + ModeWhere.scene.drawEntity(GrandExchangeOfferUnitPriceComparator.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4894 } } else { var0.remove(); } } - } // L: 4328 + } // L: 4898 } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 902b1beb37..a5162376ac 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -1,71 +1,70 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("gd") +@Implements("LoginPacket") public class LoginPacket implements class190 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final LoginPacket field2340; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + static final LoginPacket field2338; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final LoginPacket field2339; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final LoginPacket field2341; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lgd;" ) - public static final LoginPacket field2360; - @ObfuscatedName("k") + public static final LoginPacket field2342; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgc;" + descriptor = "Lgd;" ) - static final LoginPacket field2350; - @ObfuscatedName("s") + static final LoginPacket field2346; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgc;" - ) - public static final LoginPacket field2351; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - public static final LoginPacket field2352; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - public static final LoginPacket field2353; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgc;" - ) - static final LoginPacket field2354; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "[Lgc;" + descriptor = "[Lgd;" ) + @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("gq") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - static Sprite compass; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -176591909 + intValue = 1924738563 ) + @Export("id") public final int id; static { - field2360 = new LoginPacket(14, 0); // L: 5 - field2350 = new LoginPacket(15, 4); // L: 6 - field2351 = new LoginPacket(16, -2); // L: 7 - field2352 = new LoginPacket(18, -2); // L: 8 - field2353 = new LoginPacket(19, -2); // L: 9 - field2354 = new LoginPacket(27, 0); // L: 10 + field2340 = new LoginPacket(14, 0); // L: 5 + field2338 = new LoginPacket(15, 4); // L: 6 + field2339 = new LoginPacket(16, -2); // L: 7 + field2341 = new LoginPacket(18, -2); // L: 8 + field2342 = new LoginPacket(19, -2); // L: 9 + field2346 = new LoginPacket(27, 0); // L: 10 LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 - LoginPacket[] var0 = new LoginPacket[]{field2353, field2352, field2360, field2354, field2351, field2350}; // L: 17 - LoginPacket[] var1 = var0; // L: 19 + LoginPacket[] var0 = WorldMapDecorationType.method4257(); // L: 15 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 20 - LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 21 + for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 + LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17 } - } // L: 23 + } // L: 19 @ObfuscatedSignature( descriptor = "(II)V", @@ -75,12 +74,41 @@ public class LoginPacket implements class190 { this.id = var1; // L: 26 } // L: 27 - @ObfuscatedName("gw") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1633158926" + descriptor = "(IS)Z", + garbageValue = "24475" ) - static boolean method3707() { - return (Client.drawPlayerNames & 4) != 0; // L: 4401 + public static boolean method3751(int var0) { + return var0 >= WorldMapDecorationType.field2750.id && var0 <= WorldMapDecorationType.field2754.id || var0 == WorldMapDecorationType.field2751.id; // L: 42 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Lex;", + garbageValue = "1232258990" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 + if (var1 != null) { // L: 182 + return var1; + } else { + var1 = class60.method984(SequenceDefinition.SequenceDefinition_animationsArchive, DefaultsGroup.SequenceDefinition_skeletonsArchive, var0, false); // L: 183 + if (var1 != null) { // L: 184 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; // L: 185 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "1962792028" + ) + public static String method3747(CharSequence var0) { + return class198.method3786('*', var0.length()); // L: 180 } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index af62ad1643..938e53695e 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -1,129 +1,124 @@ +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("cv") +@ObfuscatedName("cg") +@Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = -1927847537 - ) - static int field1070; - @ObfuscatedName("et") - @ObfuscatedGetter( - intValue = -2129317287 - ) - static int field1076; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "[Lls;" - ) - IndexedSprite[] sprites; - @ObfuscatedName("x") - int[] field1075; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1085104337 - ) - int field1062; - @ObfuscatedName("g") - int[] field1063; - @ObfuscatedName("m") - int[] field1064; - @ObfuscatedName("n") - int[] field1065; - @ObfuscatedName("d") - int[] field1069; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1554150183 - ) - int field1060; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1740894799 - ) - int field1068; - @ObfuscatedName("q") - int[] field1058; - @ObfuscatedName("c") - int[] field1066; @ObfuscatedName("f") - int[] field1071; - @ObfuscatedName("y") - int[] field1072; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1648829389 + @ObfuscatedSignature( + descriptor = "[Lle;" ) - int field1073; + @Export("sprites") + IndexedSprite[] sprites; + @ObfuscatedName("k") + int[] field1064; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -221462457 + ) + int field1080; + @ObfuscatedName("u") + int[] field1076; + @ObfuscatedName("t") + int[] field1067; + @ObfuscatedName("e") + int[] field1073; + @ObfuscatedName("o") + int[] field1069; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 393124217 + ) + int field1070; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1553210135 + ) + int field1065; + @ObfuscatedName("p") + int[] field1072; + @ObfuscatedName("r") + int[] field1066; + @ObfuscatedName("y") + int[] field1074; + @ObfuscatedName("s") + int[] field1075; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1867891509 + intValue = -1218395493 ) - int field1074; - @ObfuscatedName("r") + int field1068; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -554680455 + intValue = 980301923 + ) + int field1071; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 897555571 ) int field1077; @ObfuscatedSignature( - descriptor = "([Lls;)V" + descriptor = "([Lle;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1075 = new int[256]; // L: 13 - this.field1062 = 0; // L: 14 - this.field1060 = 0; // L: 19 - this.field1068 = 0; // L: 20 - this.field1073 = 0; // L: 25 - this.field1074 = 0; // L: 26 + this.field1064 = new int[256]; // L: 13 + this.field1080 = 0; // L: 14 + this.field1070 = 0; // L: 19 + this.field1065 = 0; // L: 20 + this.field1068 = 0; // L: 25 + this.field1071 = 0; // L: 26 this.field1077 = 0; // L: 27 this.sprites = var1; // L: 30 this.initColors(); // L: 31 } // L: 32 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "87" + garbageValue = "-24" ) + @Export("initColors") void initColors() { - this.field1064 = new int[256]; // L: 35 + this.field1067 = new int[256]; // L: 35 int var1; for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1064[var1] = var1 * 262144; + this.field1067[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1064[var1 + 64] = var1 * 1024 + 16711680; + this.field1067[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1064[var1 + 128] = var1 * 4 + 16776960; + this.field1067[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1064[var1 + 192] = 16777215; + this.field1067[var1 + 192] = 16777215; } - this.field1065 = new int[256]; // L: 40 + this.field1073 = new int[256]; // L: 40 for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1065[var1] = var1 * 1024; + this.field1073[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1065[var1 + 64] = var1 * 4 + 65280; + this.field1073[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1065[var1 + 128] = var1 * 262144 + 65535; + this.field1073[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1065[var1 + 192] = 16777215; + this.field1073[var1 + 192] = 16777215; } this.field1069 = new int[256]; // L: 45 @@ -144,40 +139,41 @@ public class LoginScreenAnimation { this.field1069[var1 + 192] = 16777215; } - this.field1063 = new int[256]; // L: 50 - this.field1073 = 0; // L: 51 - this.field1071 = new int[32768]; // L: 52 - this.field1072 = new int[32768]; // L: 53 - this.method1881((IndexedSprite)null); // L: 54 - this.field1058 = new int[32768]; // L: 55 + this.field1076 = new int[256]; // L: 50 + this.field1068 = 0; // L: 51 + this.field1074 = new int[32768]; // L: 52 + this.field1075 = new int[32768]; // L: 53 + this.method1924((IndexedSprite)null); // L: 54 + this.field1072 = new int[32768]; // L: 55 this.field1066 = new int[32768]; // L: 56 } // L: 57 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "268957642" + garbageValue = "831434594" ) - void method1904() { - this.field1064 = null; // L: 60 - this.field1065 = null; // L: 61 + void method1917() { + this.field1067 = null; // L: 60 + this.field1073 = null; // L: 61 this.field1069 = null; // L: 62 - this.field1063 = null; // L: 63 - this.field1071 = null; // L: 64 - this.field1072 = null; // L: 65 - this.field1058 = null; // L: 66 + this.field1076 = null; // L: 63 + this.field1074 = null; // L: 64 + this.field1075 = null; // L: 65 + this.field1072 = null; // L: 66 this.field1066 = null; // L: 67 - this.field1073 = 0; // L: 68 - this.field1074 = 0; // L: 69 + this.field1068 = 0; // L: 68 + this.field1071 = 0; // L: 69 } // L: 70 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" + descriptor = "(III)V", + garbageValue = "1501826850" ) + @Export("draw") void draw(int var1, int var2) { - if (this.field1058 == null) { // L: 73 + if (this.field1072 == null) { // L: 73 this.initColors(); // L: 74 } @@ -192,24 +188,24 @@ public class LoginScreenAnimation { this.field1077 = var2; // L: 81 if (var3 > 0) { // L: 82 - this.method1877(var3); // L: 83 + this.method1929(var3); // L: 83 } - this.method1880(var1); // L: 85 + this.method1915(var1); // L: 85 } // L: 86 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1223871781" + descriptor = "(IS)V", + garbageValue = "128" ) - final void method1877(int var1) { - this.field1073 += 128 * var1; // L: 89 + final void method1929(int var1) { + this.field1068 += var1 * 128; // L: 89 int var2; - if (this.field1073 > this.field1071.length) { // L: 90 - this.field1073 -= this.field1071.length; // L: 91 + if (this.field1068 > this.field1074.length) { // L: 90 + this.field1068 -= this.field1074.length; // L: 91 var2 = (int)(Math.random() * 12.0D); // L: 92 - this.method1881(this.sprites[var2]); // L: 93 + this.method1924(this.sprites[var2]); // L: 93 } var2 = 0; // L: 95 @@ -218,12 +214,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { // L: 98 - var6 = this.field1058[var2 + var3] - this.field1071[var2 + this.field1073 & this.field1071.length - 1] * var1 / 6; // L: 99 + var6 = this.field1072[var2 + var3] - this.field1074[var2 + this.field1068 & this.field1074.length - 1] * var1 / 6; // L: 99 if (var6 < 0) { // L: 100 var6 = 0; } - this.field1058[var2++] = var6; // L: 101 + this.field1072[var2++] = var6; // L: 101 } byte var15 = 10; // L: 103 @@ -237,42 +233,42 @@ public class LoginScreenAnimation { for (int var9 = 0; var9 < 128; ++var9) { // L: 107 var10 = (int)(Math.random() * 100.0D); // L: 108 if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109 - this.field1058[var8 + var9] = 255; + this.field1072[var9 + var8] = 255; } else { - this.field1058[var8 + var9] = 0; // L: 110 + this.field1072[var9 + var8] = 0; // L: 110 } } } - if (this.field1060 > 0) { // L: 113 - this.field1060 -= var1 * 4; + if (this.field1070 > 0) { // L: 113 + this.field1070 -= var1 * 4; } - if (this.field1068 > 0) { // L: 114 - this.field1068 -= var1 * 4; + if (this.field1065 > 0) { // L: 114 + this.field1065 -= var1 * 4; } - if (this.field1060 == 0 && this.field1068 == 0) { // L: 115 + if (this.field1070 == 0 && this.field1065 == 0) { // L: 115 var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 if (var7 == 0) { // L: 117 - this.field1060 = 1024; + this.field1070 = 1024; } if (var7 == 1) { // L: 118 - this.field1068 = 1024; + this.field1065 = 1024; } } - for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1075[var7] = this.field1075[var7 + var1]; + for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 + this.field1064[var7] = this.field1064[var7 + var1]; } - for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1075[var7] = (int)(Math.sin((double)this.field1062 / 14.0D) * 16.0D + Math.sin((double)this.field1062 / 15.0D) * 14.0D + Math.sin((double)this.field1062 / 16.0D) * 12.0D); - ++this.field1062; + for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 + this.field1064[var7] = (int)(Math.sin((double)this.field1080 / 14.0D) * 16.0D + Math.sin((double)this.field1080 / 15.0D) * 14.0D + Math.sin((double)this.field1080 / 16.0D) * 12.0D); // L: 122 + ++this.field1080; // L: 123 } - this.field1074 += var1; // L: 125 + this.field1071 += var1; // L: 125 var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 if (var7 > 0) { // L: 127 short var16 = 128; // L: 128 @@ -282,13 +278,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1074 * 100; ++var11) { // L: 131 + for (var11 = 0; var11 < this.field1071 * 100; ++var11) { // L: 131 var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1058[var12 + (var13 << 7)] = 192; // L: 134 + this.field1072[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1074 = 0; // L: 136 + this.field1071 = 0; // L: 136 int var14; for (var11 = 0; var11 < 256; ++var11) { // L: 137 @@ -296,12 +292,12 @@ public class LoginScreenAnimation { var13 = var11 * 128; // L: 139 for (var14 = -var7; var14 < 128; ++var14) { // L: 140 - if (var7 + var14 < 128) { // L: 141 - var12 += this.field1058[var7 + var14 + var13]; + if (var14 + var7 < 128) { // L: 141 + var12 += this.field1072[var14 + var13 + var7]; } if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1058[var13 + var14 - (var7 + 1)]; + var12 -= this.field1072[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { // L: 143 @@ -315,8 +311,8 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { // L: 148 var14 = var13 * 128; // L: 149 - if (var7 + var13 < 256) { // L: 150 - var12 += this.field1066[var14 + var11 + var7 * 128]; + if (var13 + var7 < 256) { // L: 150 + var12 += this.field1066[var7 * 128 + var14 + var11]; } if (var13 - (var7 + 1) >= 0) { // L: 151 @@ -324,7 +320,7 @@ public class LoginScreenAnimation { } if (var13 >= 0) { // L: 152 - this.field1058[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1072[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -332,66 +328,66 @@ public class LoginScreenAnimation { } // L: 156 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "-1180038945" + garbageValue = "-1771546572" ) - final int method1878(int var1, int var2, int var3) { + final int method1920(int var1, int var2, int var3) { int var4 = 256 - var3; // L: 159 - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160 + return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; // L: 160 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "714944672" + descriptor = "(IS)V", + garbageValue = "152" ) - final void method1880(int var1) { - int var2 = this.field1063.length; // L: 164 - if (this.field1060 > 0) { // L: 165 - this.method1903(this.field1060, this.field1065); // L: 166 - } else if (this.field1068 > 0) { // L: 168 - this.method1903(this.field1068, this.field1069); // L: 169 + final void method1915(int var1) { + int var2 = this.field1076.length; // L: 164 + if (this.field1070 > 0) { // L: 165 + this.method1922(this.field1070, this.field1073); // L: 166 + } else if (this.field1065 > 0) { // L: 168 + this.method1922(this.field1065, this.field1069); // L: 169 } else { for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1063[var3] = this.field1064[var3]; + this.field1076[var3] = this.field1067[var3]; } } - this.method1896(var1); // L: 174 + this.method1921(var1); // L: 174 } // L: 175 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I[II)V", - garbageValue = "-563057357" + garbageValue = "1276738651" ) - final void method1903(int var1, int[] var2) { - int var3 = this.field1063.length; // L: 178 + final void method1922(int var1, int[] var2) { + int var3 = this.field1076.length; // L: 178 for (int var4 = 0; var4 < var3; ++var4) { // L: 179 if (var1 > 768) { // L: 180 - this.field1063[var4] = this.method1878(this.field1064[var4], var2[var4], 1024 - var1); + this.field1076[var4] = this.method1920(this.field1067[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1063[var4] = var2[var4]; // L: 181 + this.field1076[var4] = var2[var4]; // L: 181 } else { - this.field1063[var4] = this.method1878(var2[var4], this.field1064[var4], 256 - var1); // L: 182 + this.field1076[var4] = this.method1920(var2[var4], this.field1067[var4], 256 - var1); // L: 182 } } } // L: 184 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "19083" + descriptor = "(II)V", + garbageValue = "943733056" ) - final void method1896(int var1) { + final void method1921(int var1) { int var2 = 0; // L: 187 for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1075[var3] / 256; // L: 189 + int var4 = (256 - var3) * this.field1064[var3] / 256; // L: 189 int var5 = var4 + var1; // L: 190 int var6 = 0; // L: 191 int var7 = 128; // L: 192 @@ -400,22 +396,22 @@ public class LoginScreenAnimation { var5 = 0; // L: 195 } - if (var5 + 128 >= WorldMapSprite.rasterProvider.width) { // L: 197 - var7 = WorldMapSprite.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= class22.rasterProvider.width) { // L: 197 + var7 = class22.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * WorldMapSprite.rasterProvider.width; // L: 200 + int var8 = var5 + (var3 + 8) * class22.rasterProvider.width; // L: 200 var2 += var6; // L: 201 for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1058[var2++]; // L: 203 + int var10 = this.field1072[var2++]; // L: 203 int var11 = var8 % Rasterizer2D.Rasterizer2D_width; // L: 204 if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 205 int var12 = var10; // L: 206 int var13 = 256 - var10; // L: 207 - var10 = this.field1063[var10]; // L: 208 - int var14 = WorldMapSprite.rasterProvider.pixels[var8]; // L: 209 - WorldMapSprite.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; // L: 210 + var10 = this.field1076[var10]; // L: 208 + int var14 = class22.rasterProvider.pixels[var8]; // L: 209 + class22.rasterProvider.pixels[var8++] = -16777216 | (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; // L: 210 } else { ++var8; // L: 212 } @@ -426,21 +422,21 @@ public class LoginScreenAnimation { } // L: 216 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lls;I)V", - garbageValue = "-1439965330" + descriptor = "(Lle;I)V", + garbageValue = "1389216639" ) - final void method1881(IndexedSprite var1) { + final void method1924(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1071.length; ++var2) { // L: 219 - this.field1071[var2] = 0; + for (var2 = 0; var2 < this.field1074.length; ++var2) { // L: 219 + this.field1074[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { // L: 220 var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1071[var3] = (int)(Math.random() * 256.0D); // L: 222 + this.field1074[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; @@ -449,13 +445,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { // L: 225 for (var4 = 1; var4 < 127; ++var4) { // L: 226 var5 = var4 + (var3 << 7); // L: 227 - this.field1072[var5] = (this.field1071[var5 + 1] + this.field1071[var5 - 128] + this.field1071[var5 + 128] + this.field1071[var5 - 1]) / 4; // L: 228 + this.field1075[var5] = (this.field1074[var5 + 1] + this.field1074[var5 + 128] + this.field1074[var5 - 128] + this.field1074[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1071; // L: 231 - this.field1071 = this.field1072; // L: 232 - this.field1072 = var8; // L: 233 + int[] var8 = this.field1074; // L: 231 + this.field1074 = this.field1075; // L: 232 + this.field1075 = var8; // L: 233 } if (var1 != null) { // L: 235 @@ -467,7 +463,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; // L: 240 int var6 = var3 + var1.yOffset + 16; // L: 241 int var7 = var5 + (var6 << 7); // L: 242 - this.field1071[var7] = 0; // L: 243 + this.field1074[var7] = 0; // L: 243 } } } @@ -475,31 +471,13 @@ public class LoginScreenAnimation { } // L: 248 - @ObfuscatedName("s") + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "29" + descriptor = "(B)V", + garbageValue = "-20" ) - static char method1879(char var0) { - if (var0 == 198) { // L: 119 - return 'E'; - } else if (var0 == 230) { // L: 120 - return 'e'; - } else if (var0 == 223) { - return 's'; // L: 121 - } else if (var0 == 338) { // L: 122 - return 'E'; - } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 123 124 - } - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1831741176" - ) - static boolean method1905(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 8279 - } + static void method1945() { + Client.packetWriter.addNode(class4.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher)); // L: 11664 + Client.oculusOrbState = 0; // L: 11665 + } // L: 11666 } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 8aebb87c42..f21b2387db 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -1,88 +1,98 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("mc") +@Implements("LoginType") public class LoginType { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) + @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) - static final LoginType field4059; - @ObfuscatedName("s") + static final LoginType field4071; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) - static final LoginType field4056; - @ObfuscatedName("t") + static final LoginType field4063; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lmu;" - ) - static final LoginType field4057; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lmu;" - ) - static final LoginType field4058; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) static final LoginType field4064; - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) - static final LoginType field4055; - @ObfuscatedName("w") + static final LoginType field4065; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) - static final LoginType field4061; - @ObfuscatedName("g") + static final LoginType field4066; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lmc;" ) - public static final LoginType field4062; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -430747297 + static final LoginType field4067; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lmc;" ) - final int field4063; + static final LoginType field4069; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lmc;" + ) + public static final LoginType field4061; @ObfuscatedName("n") - final String field4054; + @ObfuscatedSignature( + descriptor = "Lds;" + ) + @Export("soundCache") + public static SoundCache soundCache; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1603045389 + ) + final int field4070; + @ObfuscatedName("e") + final String field4068; static { - oldscape = new LoginType(1, 0, "", ""); // L: 5 - field4059 = new LoginType(8, 1, "", ""); // L: 6 - field4056 = new LoginType(3, 2, "", ""); // L: 7 - field4057 = new LoginType(4, 3, "", ""); // L: 8 - field4058 = new LoginType(6, 4, "", ""); // L: 9 - field4064 = new LoginType(7, 5, "", ""); // L: 10 - field4055 = new LoginType(5, 6, "", ""); // L: 11 - field4061 = new LoginType(0, 7, "", ""); // L: 12 - field4062 = new LoginType(2, -1, "", "", true, new LoginType[]{oldscape, field4059, field4056, field4058, field4057}); // L: 13 + oldscape = new LoginType(8, 0, "", ""); // L: 5 + field4071 = new LoginType(4, 1, "", ""); // L: 6 + field4063 = new LoginType(7, 2, "", ""); // L: 7 + field4064 = new LoginType(0, 3, "", ""); // L: 8 + field4065 = new LoginType(2, 4, "", ""); // L: 9 + field4066 = new LoginType(6, 5, "", ""); // L: 10 + field4067 = new LoginType(3, 6, "", ""); // L: 11 + field4069 = new LoginType(1, 7, "", ""); // L: 12 + field4061 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4071, field4063, field4065, field4064}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4063 = var1; // L: 18 - this.field4054 = var4; // L: 19 + this.field4070 = var1; // L: 18 + this.field4068 = var4; // L: 19 } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lmu;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lmc;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4063 = var1; // L: 23 - this.field4054 = var4; // L: 24 + this.field4070 = var1; // L: 23 + this.field4068 = var4; // L: 24 } // L: 25 public String toString() { - return this.field4054; // L: 28 + return this.field4068; // L: 28 } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 2e3d47cbe2..5e0f244b2f 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -1,63 +1,56 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cu") +@Implements("MenuAction") public class MenuAction { - @ObfuscatedName("j") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lid;" ) - static Buffer NetCache_reference; - @ObfuscatedName("z") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1817310685 - ) - int opcode; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -670222051 + intValue = 856343337 ) + @Export("param0") int param0; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1502625343 + intValue = -1008037325 ) + @Export("param1") int param1; - @ObfuscatedName("t") - String action; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 691220539 + intValue = 967999089 ) + @Export("opcode") + int opcode; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1415709673 + ) + @Export("identifier") int identifier; + @ObfuscatedName("z") + @Export("action") + String action; MenuAction() { - } // L: 10944 + } // L: 11733 - @ObfuscatedName("z") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIB)J", - garbageValue = "0" + descriptor = "(B)V", + garbageValue = "3" ) - static long method2139(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "([BZB)Ljava/lang/Object;", - garbageValue = "117" - ) - public static Object method2140(byte[] var0, boolean var1) { - if (var0 == null) { // L: 7 - return null; - } else if (var0.length > 136) { // L: 8 - DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 - var2.set(var0); // L: 11 - return var2; // L: 12 - } else { - return var0; // L: 25 - } - } + static void method2171() { + Login.loginIndex = 24; // L: 1565 + GrandExchangeOfferNameComparator.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1566 + } // L: 1567 } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 4e747a3e4f..8a9fa0252f 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,49 +1,60 @@ +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; @ObfuscatedName("bk") +@Implements("Message") public class Message extends DualNode { - @ObfuscatedName("sx") - @ObfuscatedSignature( - descriptor = "Lmx;" - ) - static WorldMap worldMap; - @ObfuscatedName("z") + @ObfuscatedName("st") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 771571173 + intValue = 655345323 ) + @Export("count") int count; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -804370839 + intValue = -570932661 ) + @Export("cycle") int cycle; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 310309169 + intValue = -186645555 ) + @Export("type") int type; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("sender") String sender; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkm;" ) + @Export("senderUsername") Username senderUsername; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("prefix") String prefix; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("text") String text; Message(int var1, String var2, String var3, String var4) { @@ -52,97 +63,148 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); // L: 19 } // L: 20 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-136019615" + ) + @Export("set") + void set(int var1, String var2, String var3, String var4) { + this.count = Buddy.method5322(); // L: 23 + this.cycle = Client.cycle; // L: 24 + this.type = var1; // L: 25 + this.sender = var2; // L: 26 + this.fillSenderUsername(); // L: 27 + this.prefix = var3; // L: 28 + this.text = var4; // L: 29 + this.clearIsFromFriend(); // L: 30 + this.clearIsFromIgnored(); // L: 31 + } // L: 32 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "406070188" + ) + @Export("clearIsFromFriend") + void clearIsFromFriend() { + this.isFromFriend0 = TriBool.TriBool_unknown; // L: 35 + } // L: 36 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "722132951" + ) + @Export("isFromFriend") + final boolean isFromFriend() { + if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 39 + this.fillIsFromFriend(); // L: 40 + } + + return this.isFromFriend0 == TriBool.TriBool_true; // L: 42 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1917257545" + ) + @Export("fillIsFromFriend") + void fillIsFromFriend() { + this.isFromFriend0 = WorldMapLabelSize.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 46 + } // L: 47 + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "28" + descriptor = "(I)V", + garbageValue = "341204953" ) - void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; // L: 25 - this.count = var5; // L: 27 - this.cycle = Client.cycle; // L: 28 - this.type = var1; // L: 29 - this.sender = var2; // L: 30 - this.fillSenderUsername(); // L: 31 - this.prefix = var3; // L: 32 - this.text = var4; // L: 33 - this.clearIsFromFriend(); // L: 34 - this.clearIsFromIgnored(); // L: 35 - } // L: 36 + @Export("clearIsFromIgnored") + void clearIsFromIgnored() { + this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 50 + } // L: 51 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-53" + ) + @Export("isFromIgnored") + final boolean isFromIgnored() { + if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 54 + this.fillIsFromIgnored(); // L: 55 + } + + return this.isFromIgnored0 == TriBool.TriBool_true; // L: 57 + } @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-57" + garbageValue = "-73" ) - void clearIsFromFriend() { - this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 - } // L: 40 + @Export("fillIsFromIgnored") + void fillIsFromIgnored() { + this.isFromIgnored0 = WorldMapLabelSize.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 61 + } // L: 62 - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-115" + descriptor = "(I)V", + garbageValue = "-799394234" ) - final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 - this.fillIsFromFriend(); // L: 44 + @Export("fillSenderUsername") + final void fillSenderUsername() { + if (this.sender != null) { // L: 65 + this.senderUsername = new Username(GrandExchangeOfferUnitPriceComparator.method218(this.sender), UserComparator4.loginType); + } else { + this.senderUsername = null; // L: 66 } - return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 - } + } // L: 67 @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-47255168" - ) - void fillIsFromFriend() { - this.isFromFriend0 = class60.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 - } // L: 51 + @Export("addEntityUnderMouse") + static final void addEntityUnderMouse(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 83 + } // L: 84 - @ObfuscatedName("i") + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1621996049" + descriptor = "(ZB)V", + garbageValue = "91" ) - void clearIsFromIgnored() { - this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 - } // L: 55 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "77" - ) - final boolean isFromIgnored() { - if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 58 - this.fillIsFromIgnored(); // L: 59 - } - - return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-556586926" - ) - void fillIsFromIgnored() { - this.isFromIgnored0 = class60.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 - } // L: 66 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1023738000" - ) - final void fillSenderUsername() { - if (this.sender != null) { // L: 69 - this.senderUsername = new Username(SecureRandomCallable.method1202(this.sender), WorldMapAreaData.loginType); + static final void method1314(boolean var0) { + if (var0) { // L: 3037 + Client.field717 = Login.field1227 ? class169.field2029 : class169.field2034; // L: 3038 } else { - this.senderUsername = null; // L: 70 + LinkedHashMap var1 = GrandExchangeOfferAgeComparator.clientPreferences.parameters; // L: 3041 + String var3 = Login.Login_username; // L: 3043 + int var4 = var3.length(); // L: 3045 + int var5 = 0; // L: 3046 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 3047 + var5 = (var5 << 5) - var5 + var3.charAt(var6); + } + + Client.field717 = var1.containsKey(var5) ? class169.field2033 : class169.field2028; // L: 3050 } - } // L: 71 + } // L: 3052 + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1336792033" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 11502 + PacketBufferNode var1 = class4.getPacketBufferNode(ClientPacket.field2329, Client.packetWriter.isaacCipher); // L: 11504 + var1.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var0)); // L: 11505 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11506 + Client.packetWriter.addNode(var1); // L: 11507 + } + } // L: 11508 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index b42acebf8e..f796bc4f62 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -1,35 +1,35 @@ import java.util.HashMap; import java.util.Map; +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("cz") +@ObfuscatedName("ch") +@Implements("Messages") public class Messages { - @ObfuscatedName("sb") - static short[] foundItemIds; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) + @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ljh;" + descriptor = "Ljt;" ) + @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 785090077 + intValue = -2074438197 ) + @Export("Messages_count") static int Messages_count; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - public static AbstractArchive Widget_spritesArchive; static { Messages_channels = new HashMap(); // L: 9 @@ -38,23 +38,159 @@ public class Messages { Messages_count = 0; // L: 12 } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-80" + descriptor = "(Liw;I)V", + garbageValue = "-2063920931" ) - static void method2288() { - Tiles.field528 = null; // L: 64 - Tiles.field521 = null; // L: 65 - class297.field3668 = null; // L: 66 - class171.field2049 = null; // L: 67 - class204.field2421 = null; // L: 68 - class22.field122 = null; // L: 69 - class39.field282 = null; // L: 70 - Tiles.Tiles_hue = null; // L: 71 - Tiles.Tiles_saturation = null; // L: 72 - WorldMapRectangle.Tiles_lightness = null; // L: 73 - WorldMapScaleHandler.Tiles_hueMultiplier = null; // L: 74 - class60.field453 = null; // L: 75 - } // L: 76 + public static void method2328(AbstractArchive var0) { + EnumDefinition.EnumDefinition_archive = var0; // L: 25 + } // L: 26 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Liw;B)V", + garbageValue = "6" + ) + public static void method2339(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; // L: 15 + } // L: 16 + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "56" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field916) { // L: 3585 + UserComparator3.method3546(); // L: 3586 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field916) { // L: 3588 + Archive var1 = ApproximateRouteStrategy.archive6; // L: 3589 + int var2 = Client.musicVolume; // L: 3590 + class206.musicPlayerStatus = 1; // L: 3592 + class23.musicTrackArchive = var1; // L: 3593 + TileItem.musicTrackGroupId = var0; // L: 3594 + class206.musicTrackFileId = 0; // L: 3595 + class206.musicTrackVolume = var2; // L: 3596 + class195.musicTrackBoolean = false; // L: 3597 + MusicPatch.pcmSampleLength = 2; // L: 3598 + } + + Client.currentTrackGroupId = var0; // L: 3601 + } // L: 3602 + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "1388890654" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = ItemContainer.getWidgetChild(var1, var2); // L: 8829 + if (var5 != null) { // L: 8830 + if (var5.onOp != null) { // L: 8831 + ScriptEvent var6 = new ScriptEvent(); // L: 8832 + var6.widget = var5; // L: 8833 + var6.opIndex = var0; // L: 8834 + var6.targetName = var4; // L: 8835 + var6.args = var5.onOp; // L: 8836 + Entity.runScriptEvent(var6); // L: 8837 + } + + boolean var11 = true; // L: 8839 + if (var5.contentType > 0) { // L: 8840 + var11 = Varcs.method2313(var5); + } + + if (var11) { // L: 8841 + int var8 = WorldMapData_0.getWidgetFlags(var5); // L: 8843 + int var9 = var0 - 1; // L: 8844 + boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 8846 + if (var7) { // L: 8848 + PacketBufferNode var10; + if (var0 == 1) { // L: 8851 + var10 = class4.getPacketBufferNode(ClientPacket.field2298, Client.packetWriter.isaacCipher); // L: 8853 + var10.packetBuffer.writeInt(var1); // L: 8854 + var10.packetBuffer.writeShort(var2); // L: 8855 + var10.packetBuffer.writeShort(var3); // L: 8856 + Client.packetWriter.addNode(var10); // L: 8857 + } + + if (var0 == 2) { // L: 8859 + var10 = class4.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); // L: 8861 + var10.packetBuffer.writeInt(var1); // L: 8862 + var10.packetBuffer.writeShort(var2); // L: 8863 + var10.packetBuffer.writeShort(var3); // L: 8864 + Client.packetWriter.addNode(var10); // L: 8865 + } + + if (var0 == 3) { // L: 8867 + var10 = class4.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); // L: 8869 + var10.packetBuffer.writeInt(var1); // L: 8870 + var10.packetBuffer.writeShort(var2); // L: 8871 + var10.packetBuffer.writeShort(var3); // L: 8872 + Client.packetWriter.addNode(var10); // L: 8873 + } + + if (var0 == 4) { // L: 8875 + var10 = class4.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); // L: 8877 + var10.packetBuffer.writeInt(var1); // L: 8878 + var10.packetBuffer.writeShort(var2); // L: 8879 + var10.packetBuffer.writeShort(var3); // L: 8880 + Client.packetWriter.addNode(var10); // L: 8881 + } + + if (var0 == 5) { // L: 8883 + var10 = class4.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); // L: 8885 + var10.packetBuffer.writeInt(var1); // L: 8886 + var10.packetBuffer.writeShort(var2); // L: 8887 + var10.packetBuffer.writeShort(var3); // L: 8888 + Client.packetWriter.addNode(var10); // L: 8889 + } + + if (var0 == 6) { // L: 8891 + var10 = class4.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 8893 + var10.packetBuffer.writeInt(var1); // L: 8894 + var10.packetBuffer.writeShort(var2); // L: 8895 + var10.packetBuffer.writeShort(var3); // L: 8896 + Client.packetWriter.addNode(var10); // L: 8897 + } + + if (var0 == 7) { // L: 8899 + var10 = class4.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); // L: 8901 + var10.packetBuffer.writeInt(var1); // L: 8902 + var10.packetBuffer.writeShort(var2); // L: 8903 + var10.packetBuffer.writeShort(var3); // L: 8904 + Client.packetWriter.addNode(var10); // L: 8905 + } + + if (var0 == 8) { // L: 8907 + var10 = class4.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); // L: 8909 + var10.packetBuffer.writeInt(var1); // L: 8910 + var10.packetBuffer.writeShort(var2); // L: 8911 + var10.packetBuffer.writeShort(var3); // L: 8912 + Client.packetWriter.addNode(var10); // L: 8913 + } + + if (var0 == 9) { // L: 8915 + var10 = class4.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); // L: 8917 + var10.packetBuffer.writeInt(var1); // L: 8918 + var10.packetBuffer.writeShort(var2); // L: 8919 + var10.packetBuffer.writeShort(var3); // L: 8920 + Client.packetWriter.addNode(var10); // L: 8921 + } + + if (var0 == 10) { // L: 8923 + var10 = class4.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); // L: 8925 + var10.packetBuffer.writeInt(var1); // L: 8926 + var10.packetBuffer.writeShort(var2); // L: 8927 + var10.packetBuffer.writeShort(var3); // L: 8928 + Client.packetWriter.addNode(var10); // L: 8929 + } + + } + } + } + } // L: 8849 8931 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 3936ec2912..e3478370c1 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -1,32 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hy") +@Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("m") - static final byte[] field2500; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lkf;" - ) - Buffer buffer; - @ObfuscatedName("k") - int division; - @ObfuscatedName("s") - int[] trackStarts; @ObfuscatedName("t") + static final byte[] field2493; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + @Export("buffer") + Buffer buffer; + @ObfuscatedName("b") + @Export("division") + int division; + @ObfuscatedName("l") + @Export("trackStarts") + int[] trackStarts; + @ObfuscatedName("m") + @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("o") - int[] field2493; - @ObfuscatedName("x") - int field2496; - @ObfuscatedName("g") - long field2499; + @ObfuscatedName("q") + int[] field2492; + @ObfuscatedName("k") + int field2489; + @ObfuscatedName("u") + long field2495; static { - field2500 = 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}; // L: 17 + field2493 = 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}; // L: 17 } MidiFileReader(byte[] var1) { @@ -38,13 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); // L: 8 } // L: 23 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; // L: 30 this.buffer.offset = 10; // L: 33 int var2 = this.buffer.readUnsignedShort(); // L: 34 this.division = this.buffer.readUnsignedShort(); // L: 36 - this.field2496 = 500000; // L: 37 + this.field2489 = 500000; // L: 37 this.trackStarts = new int[var2]; // L: 38 Buffer var10000; @@ -61,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; // L: 46 } - this.field2499 = 0L; // L: 48 + this.field2495 = 0L; // L: 48 this.trackPositions = new int[var2]; // L: 49 for (var3 = 0; var3 < var2; ++var3) { // L: 50 @@ -69,78 +78,87 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; // L: 51 - this.field2493 = new int[var2]; // L: 52 + this.field2492 = new int[var2]; // L: 52 } // L: 53 - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("clear") void clear() { this.buffer.array = null; // L: 56 this.trackStarts = null; // L: 57 this.trackPositions = null; // L: 58 this.trackLengths = null; // L: 59 - this.field2493 = null; // L: 60 + this.field2492 = null; // L: 60 } // L: 61 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 } // L: 73 - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 int[] var10000 = this.trackLengths; var10000[var1] += var2; // L: 85 } // L: 86 - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; if (var2 < 0) { // L: 95 var5 = var2 & 255; // L: 96 - this.field2493[var1] = var5; // L: 97 + this.field2492[var1] = var5; // L: 97 ++this.buffer.offset; // L: 98 } else { - var5 = this.field2493[var1]; // L: 101 + var5 = this.field2492[var1]; // L: 101 } if (var5 != 240 && var5 != 247) { // L: 103 - return this.method3970(var1, var5); // L: 116 + return this.method3997(var1, var5); // L: 116 } else { int var3 = this.buffer.readVarInt(); // L: 104 if (var5 == 247 && var3 > 0) { // L: 105 int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106 if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107 ++this.buffer.offset; // L: 108 - this.field2493[var1] = var4; // L: 109 - return this.method3970(var1, var4); // L: 110 + this.field2492[var1] = var4; // L: 109 + return this.method3997(var1, var4); // L: 110 } } @@ -150,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("n") - int method3970(int var1, int var2) { + @ObfuscatedName("e") + int method3997(int var1, int var2) { int var4; if (var2 == 255) { // L: 120 int var7 = this.buffer.readUnsignedByte(); // L: 121 @@ -165,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); // L: 128 var4 -= 3; // L: 129 int var6 = this.trackLengths[var1]; // L: 130 - this.field2499 += (long)var6 * (long)(this.field2496 - var5); // L: 131 - this.field2496 = var5; // L: 132 + this.field2495 += (long)var6 * (long)(this.field2489 - var5); // L: 131 + this.field2489 = var5; // L: 132 var10000 = this.buffer; // L: 133 var10000.offset += var4; return 2; // L: 134 @@ -176,7 +194,7 @@ public class MidiFileReader { return 3; // L: 137 } } else { - byte var3 = field2500[var2 - 128]; // L: 139 + byte var3 = field2493[var2 - 128]; // L: 139 var4 = var2; // L: 140 if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -190,12 +208,13 @@ public class MidiFileReader { } } - @ObfuscatedName("d") - long method3942(int var1) { - return this.field2499 + (long)var1 * (long)this.field2496; // L: 147 + @ObfuscatedName("o") + long method4025(int var1) { + return this.field2495 + (long)var1 * (long)this.field2489; // L: 147 } - @ObfuscatedName("h") + @ObfuscatedName("n") + @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; // L: 151 int var2 = -1; // L: 152 @@ -211,7 +230,8 @@ public class MidiFileReader { return var2; // L: 161 } - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -224,14 +244,15 @@ public class MidiFileReader { return true; // L: 167 } - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("reset") void reset(long var1) { - this.field2499 = var1; // L: 171 + this.field2495 = var1; // L: 171 int var3 = this.trackPositions.length; // L: 172 for (int var4 = 0; var4 < var3; ++var4) { // L: 173 this.trackLengths[var4] = 0; // L: 174 - this.field2493[var4] = 0; // L: 175 + this.field2492[var4] = 0; // L: 175 this.buffer.offset = this.trackStarts[var4]; // L: 176 this.readTrackLength(var4); // L: 177 this.trackPositions[var4] = this.buffer.offset; // L: 178 diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 06203f0180..5320a0c259 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -1,156 +1,161 @@ +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("ge") +@ObfuscatedName("gv") +@Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("br") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Llp;" - ) - static Sprite[] worldSelectBackSprites; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Llp;" ) + @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1799517865 + intValue = -50885851 ) - int field2458; - @ObfuscatedName("s") + int field2440; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1116172075 + intValue = 588111065 ) - int field2456; - @ObfuscatedName("t") - int[] field2449; - @ObfuscatedName("i") - int[] field2445; - @ObfuscatedName("o") - int[] field2446; - @ObfuscatedName("x") - int[] field2447; - @ObfuscatedName("g") - int[] field2448; + int field2446; @ObfuscatedName("m") - int[] field2465; - @ObfuscatedName("n") + int[] field2438; + @ObfuscatedName("z") + int[] field2448; + @ObfuscatedName("q") int[] field2450; + @ObfuscatedName("k") + int[] field2462; + @ObfuscatedName("c") + int[] field2442; + @ObfuscatedName("u") + int[] field2459; + @ObfuscatedName("t") + int[] field2435; + @ObfuscatedName("e") + int[] field2436; + @ObfuscatedName("o") + int[] field2444; + @ObfuscatedName("w") + int[] field2449; + @ObfuscatedName("v") + int[] field2441; @ObfuscatedName("d") int[] field2451; - @ObfuscatedName("h") + @ObfuscatedName("a") int[] field2452; - @ObfuscatedName("j") + @ObfuscatedName("g") int[] field2453; - @ObfuscatedName("r") + @ObfuscatedName("h") int[] field2454; - @ObfuscatedName("u") - int[] field2455; - @ObfuscatedName("p") - int[] field2441; - @ObfuscatedName("b") - int[] field2457; - @ObfuscatedName("l") - int[] field2442; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[[Lhe;" + descriptor = "[[Lhl;" ) - MusicPatchNode[][] field2459; + MusicPatchNode[][] field2455; @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[[Lhe;" + descriptor = "[[Lhl;" ) - MusicPatchNode[][] field2460; - @ObfuscatedName("ag") + MusicPatchNode[][] field2456; + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lhf;" + descriptor = "Lhy;" ) + @Export("midiFile") MidiFileReader midiFile; @ObfuscatedName("ao") - boolean field2462; - @ObfuscatedName("ae") + boolean field2458; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -986851911 + intValue = 236042269 ) + @Export("track") int track; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1235186361 + intValue = -813288527 ) + @Export("trackLength") int trackLength; - @ObfuscatedName("am") + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = -3470294739041308975L + longValue = 4033442646314588215L ) - long field2444; - @ObfuscatedName("ap") + long field2461; + @ObfuscatedName("ay") @ObfuscatedGetter( - longValue = 2378753574421297803L + longValue = 5989401490553660197L ) - long field2466; - @ObfuscatedName("au") + long field2445; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lhb;" + descriptor = "Lhz;" ) + @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2458 = 256; // L: 14 - this.field2456 = 1000000; // L: 15 - this.field2449 = new int[16]; // L: 16 - this.field2445 = new int[16]; // L: 17 - this.field2446 = new int[16]; // L: 18 - this.field2447 = new int[16]; // L: 19 - this.field2448 = new int[16]; // L: 20 - this.field2465 = new int[16]; // L: 21 - this.field2450 = new int[16]; // L: 22 - this.field2451 = new int[16]; // L: 23 - this.field2452 = new int[16]; // L: 24 - this.field2453 = new int[16]; // L: 28 - this.field2454 = new int[16]; // L: 29 - this.field2455 = new int[16]; // L: 30 - this.field2441 = new int[16]; // L: 31 - this.field2457 = new int[16]; // L: 32 - this.field2442 = new int[16]; // L: 33 - this.field2459 = new MusicPatchNode[16][128]; // L: 34 - this.field2460 = new MusicPatchNode[16][128]; // L: 35 + this.field2440 = 256; // L: 14 + this.field2446 = 1000000; // L: 15 + this.field2438 = new int[16]; // L: 16 + this.field2448 = new int[16]; // L: 17 + this.field2450 = new int[16]; // L: 18 + this.field2462 = new int[16]; // L: 19 + this.field2442 = new int[16]; // L: 20 + this.field2459 = new int[16]; // L: 21 + this.field2435 = new int[16]; // L: 22 + this.field2436 = new int[16]; // L: 23 + this.field2444 = new int[16]; // L: 24 + this.field2449 = new int[16]; // L: 28 + this.field2441 = new int[16]; // L: 29 + this.field2451 = new int[16]; // L: 30 + this.field2452 = new int[16]; // L: 31 + this.field2453 = new int[16]; // L: 32 + this.field2454 = new int[16]; // L: 33 + this.field2455 = new MusicPatchNode[16][128]; // L: 34 + this.field2456 = new MusicPatchNode[16][128]; // L: 35 this.midiFile = new MidiFileReader(); // L: 36 - this.patchStream = new MusicPatchPcmStream(this); - this.musicPatches = new NodeHashTable(128); - this.method3824(); - } + this.patchStream = new MusicPatchPcmStream(this); // L: 42 + this.musicPatches = new NodeHashTable(128); // L: 45 + this.method3875(); // L: 46 + } // L: 47 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "371443257" + garbageValue = "1236957115" ) - synchronized void setPcmStreamVolume(int var1) { - this.field2458 = var1; - } + @Export("setPcmStreamVolume") + public synchronized void setPcmStreamVolume(int var1) { + this.field2440 = var1; // L: 50 + } // L: 51 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1211509882" + garbageValue = "1869146108" ) - int method3806() { - return this.field2458; + public int method3856() { + return this.field2440; // L: 54 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lhj;Lic;Lds;IB)Z", - garbageValue = "5" + descriptor = "(Lhj;Liw;Lds;II)Z", + garbageValue = "-577987969" ) + @Export("loadMusicTrack") synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4008(); - boolean var5 = true; - int[] var6 = null; - if (var4 > 0) { + var1.method4061(); // L: 58 + boolean var5 = true; // L: 59 + int[] var6 = null; // L: 60 + if (var4 > 0) { // L: 61 var6 = new int[]{var4}; } @@ -158,999 +163,925 @@ public class MidiPcmStream extends PcmStream { int var8 = (int)var7.key; // L: 63 MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); // L: 64 if (var9 == null) { // L: 65 - byte[] var11 = var2.takeFileFlat(var8); // L: 68 - MusicPatch var10; - if (var11 == null) { // L: 69 - var10 = null; // L: 70 - } else { - var10 = new MusicPatch(var11); - } - - var9 = var10; - if (var10 == null) { - var5 = false; + var9 = UserComparator4.method3497(var2, var8); // L: 66 + if (var9 == null) { // L: 67 + var5 = false; // L: 68 continue; } - this.musicPatches.put(var10, (long)var8); + this.musicPatches.put(var9, (long)var8); // L: 71 } - if (!var9.method3979(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method4026(var3, var7.byteArray, var6)) { // L: 73 var5 = false; } } - if (var5) { + if (var5) { // L: 75 var1.clear(); } - return var5; // L: 85 + return var5; // L: 76 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "140866669" + garbageValue = "1712766376" ) + @Export("clearAll") synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 80 var1.clear(); } - } // L: 90 + } // L: 81 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1347552645" + garbageValue = "1913865181" ) - synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 + @Export("removeAll") + public synchronized void removeAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 84 var1.remove(); } - } // L: 94 + } // L: 85 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "()Lde;" + ) + @Export("firstSubStream") + protected synchronized PcmStream firstSubStream() { + return this.patchStream; // L: 460 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "()Lde;" + ) + @Export("nextSubStream") + protected synchronized PcmStream nextSubStream() { + return null; // L: 464 + } + + @ObfuscatedName("c") + protected synchronized int vmethod4043() { + return 0; // L: 468 + } + + @ObfuscatedName("u") + @Export("fill") + protected synchronized void fill(int[] var1, int var2, int var3) { + if (this.midiFile.isReady()) { // L: 472 + int var4 = this.midiFile.division * this.field2446 / PcmPlayer.field1442; // L: 473 + + do { + long var5 = this.field2461 + (long)var4 * (long)var3; // L: 475 + if (this.field2445 - var5 >= 0L) { // L: 476 + this.field2461 = var5; // L: 477 + break; + } + + int var7 = (int)((this.field2445 - this.field2461 + (long)var4 - 1L) / (long)var4); // L: 480 + this.field2461 += (long)var7 * (long)var4; // L: 481 + this.patchStream.fill(var1, var2, var7); // L: 482 + var2 += var7; // L: 483 + var3 -= var7; // L: 484 + this.method3888(); // L: 485 + } while(this.midiFile.isReady()); // L: 486 + } + + this.patchStream.fill(var1, var2, var3); // L: 489 + } // L: 490 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lhj;ZI)V", + garbageValue = "1794864455" + ) + @Export("setMusicTrack") + synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + this.clear(); // L: 88 + this.midiFile.parse(var1.midi); // L: 89 + this.field2458 = var2; // L: 90 + this.field2461 = 0L; // L: 91 + int var3 = this.midiFile.trackCount(); // L: 92 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 93 + this.midiFile.gotoTrack(var4); // L: 94 + this.midiFile.readTrackLength(var4); // L: 95 + this.midiFile.markTrackPosition(var4); // L: 96 + } + + this.track = this.midiFile.getPrioritizedTrack(); // L: 98 + this.trackLength = this.midiFile.trackLengths[this.track]; // L: 99 + this.field2445 = this.midiFile.method4025(this.trackLength); // L: 100 + } // L: 101 + + @ObfuscatedName("e") + @Export("skip") + protected synchronized void skip(int var1) { + if (this.midiFile.isReady()) { // L: 493 + int var2 = this.midiFile.division * this.field2446 / PcmPlayer.field1442; // L: 494 + + do { + long var3 = this.field2461 + (long)var1 * (long)var2; // L: 496 + if (this.field2445 - var3 >= 0L) { // L: 497 + this.field2461 = var3; // L: 498 + break; + } + + int var5 = (int)(((long)var2 + (this.field2445 - this.field2461) - 1L) / (long)var2); // L: 501 + this.field2461 += (long)var5 * (long)var2; // L: 502 + this.patchStream.skip(var5); // L: 503 + var1 -= var5; // L: 504 + this.method3888(); // L: 505 + } while(this.midiFile.isReady()); // L: 506 + } + + this.patchStream.skip(var1); // L: 509 + } // L: 510 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "(B)V", + garbageValue = "100" ) - protected synchronized PcmStream firstSubStream() { - return this.patchStream; // L: 469 + @Export("clear") + public synchronized void clear() { + this.midiFile.clear(); // L: 104 + this.method3875(); // L: 105 + } // L: 106 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1819990348" + ) + @Export("isReady") + public synchronized boolean isReady() { + return this.midiFile.isReady(); // L: 109 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "(IIB)V", + garbageValue = "11" ) - protected synchronized PcmStream nextSubStream() { - return null; // L: 473 - } + public synchronized void method3863(int var1, int var2) { + this.method3915(var1, var2); // L: 113 + } // L: 114 - @ObfuscatedName("w") - protected synchronized int vmethod3987() { - return 0; // L: 477 - } - - @ObfuscatedName("g") - protected synchronized void fill(int[] var1, int var2, int var3) { - if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field2456 / PcmPlayer.field1447; // L: 482 - - do { - long var5 = this.field2444 + (long)var4 * (long)var3; // L: 484 - if (this.field2466 - var5 >= 0L) { // L: 485 - this.field2444 = var5; // L: 486 - break; - } - - int var7 = (int)((this.field2466 - this.field2444 + (long)var4 - 1L) / (long)var4); // L: 489 - this.field2444 += (long)var7 * (long)var4; // L: 490 - this.patchStream.fill(var1, var2, var7); // L: 491 - var2 += var7; // L: 492 - var3 -= var7; // L: 493 - this.method3894(); // L: 494 - } while(this.midiFile.isReady()); // L: 495 - } - - this.patchStream.fill(var1, var2, var3); // L: 498 - } // L: 499 - - @ObfuscatedName("m") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lhj;ZI)V", - garbageValue = "2052345707" + descriptor = "(IIS)V", + garbageValue = "-20747" ) - synchronized void setMusicTrack(MusicTrack var1, boolean var2) { - this.clear(); // L: 97 - this.midiFile.parse(var1.midi); // L: 98 - this.field2462 = var2; // L: 99 - this.field2444 = 0L; // L: 100 - int var3 = this.midiFile.trackCount(); // L: 101 + void method3915(int var1, int var2) { + this.field2462[var1] = var2; // L: 117 + this.field2459[var1] = var2 & -128; // L: 118 + this.method3929(var1, var2); // L: 119 + } // L: 120 - for (int var4 = 0; var4 < var3; ++var4) { // L: 102 - this.midiFile.gotoTrack(var4); // L: 103 - this.midiFile.readTrackLength(var4); // L: 104 - this.midiFile.markTrackPosition(var4); // L: 105 - } - - this.track = this.midiFile.getPrioritizedTrack(); // L: 107 - this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 - this.field2466 = this.midiFile.method3942(this.trackLength); // L: 109 - } // L: 110 - - @ObfuscatedName("n") - protected synchronized void skip(int var1) { - if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field2456 / PcmPlayer.field1447; // L: 503 - - do { - long var3 = (long)var2 * (long)var1 + this.field2444; // L: 505 - if (this.field2466 - var3 >= 0L) { // L: 506 - this.field2444 = var3; // L: 507 - break; - } - - int var5 = (int)((this.field2466 - this.field2444 + (long)var2 - 1L) / (long)var2); // L: 510 - this.field2444 += (long)var2 * (long)var5; // L: 511 - this.patchStream.skip(var5); // L: 512 - var1 -= var5; // L: 513 - this.method3894(); // L: 514 - } while(this.midiFile.isReady()); // L: 515 - } - - this.patchStream.skip(var1); // L: 518 - } // L: 519 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-836752904" - ) - public synchronized void clear() { - this.midiFile.clear(); // L: 113 - this.method3824(); // L: 114 - } // L: 115 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1789477746" - ) - synchronized boolean isReady() { - return this.midiFile.isReady(); // L: 118 - } - - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1223302618" + garbageValue = "-313859079" ) - public synchronized void method3813(int var1, int var2) { - this.method3814(var1, var2); // L: 122 - } // L: 123 + void method3929(int var1, int var2) { + if (var2 != this.field2442[var1]) { // L: 123 + this.field2442[var1] = var2; // L: 124 - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1252013432" - ) - void method3814(int var1, int var2) { - this.field2447[var1] = var2; // L: 126 - this.field2465[var1] = var2 & -128; // L: 127 - this.method3898(var1, var2); // L: 128 - } // L: 129 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2030467233" - ) - void method3898(int var1, int var2) { - if (var2 != this.field2448[var1]) { // L: 132 - this.field2448[var1] = var2; // L: 133 - - for (int var3 = 0; var3 < 128; ++var3) { // L: 134 - this.field2460[var1][var3] = null; + for (int var3 = 0; var3 < 128; ++var3) { // L: 125 + this.field2456[var1][var3] = null; } } - } // L: 136 + } // L: 127 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-384310039" + ) + void method3866(int var1, int var2, int var3) { + this.method3913(var1, var2, 64); // L: 130 + if ((this.field2449[var1] & 2) != 0) { // L: 131 + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 132 + if (var4.field2479 == var1 && var4.field2473 < 0) { // L: 133 + this.field2455[var1][var4.field2466] = null; // L: 134 + this.field2455[var1][var2] = var4; // L: 135 + int var8 = (var4.field2470 * var4.field2474 >> 12) + var4.field2472; // L: 136 + var4.field2472 += var2 - var4.field2466 << 8; // L: 137 + var4.field2470 = var8 - var4.field2472; // L: 138 + var4.field2474 = 4096; // L: 139 + var4.field2466 = var2; // L: 140 + return; // L: 141 + } + } + } + + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2442[var1]); // L: 145 + if (var9 != null) { // L: 146 + RawSound var5 = var9.rawSounds[var2]; // L: 147 + if (var5 != null) { // L: 148 + MusicPatchNode var6 = new MusicPatchNode(); // L: 149 + var6.field2479 = var1; // L: 150 + var6.patch = var9; // L: 151 + var6.rawSound = var5; // L: 152 + var6.field2464 = var9.field2506[var2]; // L: 153 + var6.field2468 = var9.field2509[var2]; // L: 154 + var6.field2466 = var2; // L: 155 + var6.field2469 = var3 * var3 * var9.field2502[var2] * var9.field2507 + 1024 >> 11; // L: 156 + var6.field2465 = var9.field2505[var2] & 255; // L: 157 + var6.field2472 = (var2 << 8) - (var9.field2504[var2] & 32767); // L: 158 + var6.field2475 = 0; // L: 159 + var6.field2476 = 0; // L: 160 + var6.field2477 = 0; // L: 161 + var6.field2473 = -1; // L: 162 + var6.field2485 = 0; // L: 163 + if (this.field2452[var1] == 0) { // L: 164 + var6.stream = RawPcmStream.method2683(var5, this.method3880(var6), this.method3881(var6), this.method3882(var6)); // L: 165 + } else { + var6.stream = RawPcmStream.method2683(var5, this.method3880(var6), 0, this.method3882(var6)); // L: 168 + this.method3867(var6, var9.field2504[var2] < 0); // L: 169 + } + + if (var9.field2504[var2] < 0) { // L: 171 + var6.stream.setNumLoops(-1); + } + + if (var6.field2468 >= 0) { // L: 172 + MusicPatchNode var7 = this.field2456[var1][var6.field2468]; // L: 173 + if (var7 != null && var7.field2473 < 0) { // L: 174 + this.field2455[var1][var7.field2466] = null; // L: 175 + var7.field2473 = 0; // L: 176 + } + + this.field2456[var1][var6.field2468] = var6; // L: 178 + } + + this.patchStream.queue.addFirst(var6); // L: 180 + this.field2455[var1][var2] = var6; // L: 181 + } + } + } // L: 182 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lhl;ZI)V", + garbageValue = "1636095944" + ) + void method3867(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; // L: 185 + int var4; + if (var2 && var1.rawSound.field1416) { // L: 187 + int var5 = var3 + var3 - var1.rawSound.start; // L: 188 + var4 = (int)((long)var5 * (long)this.field2452[var1.field2479] >> 6); // L: 189 + var3 <<= 8; // L: 190 + if (var4 >= var3) { // L: 191 + var4 = var3 + var3 - 1 - var4; // L: 192 + var1.stream.method2788(); // L: 193 + } + } else { + var4 = (int)((long)var3 * (long)this.field2452[var1.field2479] >> 6); // L: 197 + } + + var1.stream.method2682(var4); // L: 199 + } // L: 200 @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1188319217" + garbageValue = "-722165372" ) - void method3816(int var1, int var2, int var3) { - this.method3847(var1, var2, 64); // L: 139 - if ((this.field2453[var1] & 2) != 0) { // L: 140 - for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141 - if (var4.field2484 == var1 && var4.field2483 < 0) { // L: 142 - this.field2459[var1][var4.field2474] = null; // L: 143 - this.field2459[var1][var2] = var4; // L: 144 - int var8 = (var4.field2487 * var4.field2479 >> 12) + var4.field2477; // L: 145 - var4.field2477 += var2 - var4.field2474 << 8; // L: 146 - var4.field2487 = var8 - var4.field2477; // L: 147 - var4.field2479 = 4096; // L: 148 - var4.field2474 = var2; // L: 149 - return; // L: 150 - } - } - } - - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2448[var1]); // L: 154 - if (var9 != null) { // L: 155 - RawSound var5 = var9.rawSounds[var2]; // L: 156 - if (var5 != null) { // L: 157 - MusicPatchNode var6 = new MusicPatchNode(); // L: 158 - var6.field2484 = var1; // L: 159 - var6.patch = var9; // L: 160 - var6.rawSound = var5; // L: 161 - var6.field2472 = var9.field2506[var2]; // L: 162 - var6.field2473 = var9.field2511[var2]; // L: 163 - var6.field2474 = var2; // L: 164 - var6.field2475 = var3 * var3 * var9.field2507[var2] * var9.field2513 + 1024 >> 11; // L: 165 - var6.field2481 = var9.field2509[var2] & 255; // L: 166 - var6.field2477 = (var2 << 8) - (var9.field2510[var2] & 32767); // L: 167 - var6.field2480 = 0; // L: 168 - var6.field2478 = 0; // L: 169 - var6.field2482 = 0; // L: 170 - var6.field2483 = -1; // L: 171 - var6.field2489 = 0; // L: 172 - if (this.field2441[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method2638(var5, this.method3829(var6), this.method3830(var6), this.method3831(var6)); // L: 174 - } else { - var6.stream = RawPcmStream.method2638(var5, this.method3829(var6), 0, this.method3831(var6)); // L: 177 - this.method3817(var6, var9.field2510[var2] < 0); // L: 178 - } - - if (var9.field2510[var2] < 0) { // L: 180 - var6.stream.setNumLoops(-1); - } - - if (var6.field2473 >= 0) { // L: 181 - MusicPatchNode var7 = this.field2460[var1][var6.field2473]; // L: 182 - if (var7 != null && var7.field2483 < 0) { // L: 183 - this.field2459[var1][var7.field2474] = null; // L: 184 - var7.field2483 = 0; // L: 185 - } - - this.field2460[var1][var6.field2473] = var6; // L: 187 - } - - this.patchStream.queue.addFirst(var6); // L: 189 - this.field2459[var1][var2] = var6; // L: 190 - } - } - } // L: 191 - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lhe;ZI)V", - garbageValue = "-457799331" - ) - void method3817(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; // L: 194 - int var4; - if (var2 && var1.rawSound.field1417) { // L: 196 - int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)this.field2441[var1.field2484] * (long)var5 >> 6); // L: 198 - var3 <<= 8; // L: 199 - if (var4 >= var3) { // L: 200 - var4 = var3 + var3 - 1 - var4; // L: 201 - var1.stream.method2777(); // L: 202 - } - } else { - var4 = (int)((long)this.field2441[var1.field2484] * (long)var3 >> 6); // L: 206 - } - - var1.stream.method2646(var4); // L: 208 - } // L: 209 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "6369" - ) - void method3847(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2459[var1][var2]; // L: 212 - if (var4 != null) { // L: 213 - this.field2459[var1][var2] = null; // L: 214 - if ((this.field2453[var1] & 2) != 0) { // L: 215 - for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 - if (var5.field2484 == var4.field2484 && var5.field2483 < 0 && var4 != var5) { // L: 217 - var4.field2483 = 0; // L: 218 - break; // L: 219 + void method3913(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2455[var1][var2]; // L: 203 + if (var4 != null) { // L: 204 + this.field2455[var1][var2] = null; // L: 205 + if ((this.field2449[var1] & 2) != 0) { // L: 206 + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 207 + if (var4.field2479 == var5.field2479 && var5.field2473 < 0 && var5 != var4) { // L: 208 + var4.field2473 = 0; // L: 209 + break; // L: 210 } } } else { - var4.field2483 = 0; // L: 224 + var4.field2473 = 0; // L: 215 } } - } // L: 226 + } // L: 217 - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1803842317" + descriptor = "(IIIB)V", + garbageValue = "121" ) - void method3818(int var1, int var2, int var3) { - } // L: 228 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1018786390" - ) - void method3856(int var1, int var2) { - } // L: 229 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" - ) - void method3820(int var1, int var2) { - this.field2450[var1] = var2; // L: 232 - } // L: 233 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1073895974" - ) - void method3821(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field2484 == var1) { // L: 237 - if (var2.stream != null) { // L: 238 - var2.stream.method2681(PcmPlayer.field1447 / 100); // L: 239 - if (var2.stream.method2655()) { // L: 240 - this.patchStream.mixer.addSubStream(var2.stream); - } - - var2.method3926(); // L: 241 - } - - if (var2.field2483 < 0) { // L: 243 - this.field2459[var2.field2484][var2.field2474] = null; - } - - var2.remove(); // L: 244 - } - } - - } // L: 247 - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1858394144" - ) - void method3808(int var1) { - if (var1 >= 0) { // L: 250 - this.field2449[var1] = 12800; // L: 254 - this.field2445[var1] = 8192; // L: 255 - this.field2446[var1] = 16383; // L: 256 - this.field2450[var1] = 8192; // L: 257 - this.field2451[var1] = 0; // L: 258 - this.field2452[var1] = 8192; // L: 259 - this.method3834(var1); // L: 260 - this.method3888(var1); // L: 261 - this.field2453[var1] = 0; // L: 262 - this.field2454[var1] = 32767; // L: 263 - this.field2455[var1] = 256; // L: 264 - this.field2441[var1] = 0; // L: 265 - this.method3828(var1, 8192); // L: 266 - } else { - for (var1 = 0; var1 < 16; ++var1) { // L: 251 - this.method3808(var1); - } - - } - } // L: 252 267 - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-980197433" - ) - void method3826(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field2484 == var1) && var2.field2483 < 0) { // L: 271 272 - this.field2459[var2.field2484][var2.field2474] = null; // L: 273 - var2.field2483 = 0; // L: 274 - } - } - - } // L: 278 + void method3897(int var1, int var2, int var3) { + } // L: 219 @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" + descriptor = "(III)V", + garbageValue = "-1674175932" ) - void method3824() { - this.method3821(-1); // L: 281 - this.method3808(-1); // L: 282 + void method3870(int var1, int var2) { + } // L: 220 - int var1; - for (var1 = 0; var1 < 16; ++var1) { // L: 283 - this.field2448[var1] = this.field2447[var1]; - } + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1933284003" + ) + void method3854(int var1, int var2) { + this.field2435[var1] = var2; // L: 223 + } // L: 224 - for (var1 = 0; var1 < 16; ++var1) { // L: 284 - this.field2465[var1] = this.field2447[var1] & -128; - } - - } // L: 285 - - @ObfuscatedName("ae") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-290917818" + garbageValue = "-406448805" ) - void method3834(int var1) { - if ((this.field2453[var1] & 2) != 0) { // L: 288 - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289 - if (var2.field2484 == var1 && this.field2459[var1][var2.field2474] == null && var2.field2483 < 0) { // L: 290 - var2.field2483 = 0; // L: 291 + void method3909(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 227 + if (var1 < 0 || var2.field2479 == var1) { // L: 228 + if (var2.stream != null) { // L: 229 + var2.stream.method2687(PcmPlayer.field1442 / 100); // L: 230 + if (var2.stream.method2786()) { // L: 231 + this.patchStream.mixer.addSubStream(var2.stream); + } + + var2.method3971(); // L: 232 } + + if (var2.field2473 < 0) { // L: 234 + this.field2455[var2.field2479][var2.field2466] = null; + } + + var2.remove(); // L: 235 } } - } // L: 295 + } // L: 238 - @ObfuscatedName("ap") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "30" + descriptor = "(II)V", + garbageValue = "-1555645586" ) - void method3888(int var1) { - if ((this.field2453[var1] & 4) != 0) { // L: 298 - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299 - if (var2.field2484 == var1) { // L: 300 - var2.field2486 = 0; - } + void method3873(int var1) { + if (var1 >= 0) { // L: 241 + this.field2438[var1] = 12800; // L: 245 + this.field2448[var1] = 8192; // L: 246 + this.field2450[var1] = 16383; // L: 247 + this.field2435[var1] = 8192; // L: 248 + this.field2436[var1] = 0; // L: 249 + this.field2444[var1] = 8192; // L: 250 + this.method3876(var1); // L: 251 + this.method3896(var1); // L: 252 + this.field2449[var1] = 0; // L: 253 + this.field2441[var1] = 32767; // L: 254 + this.field2451[var1] = 256; // L: 255 + this.field2452[var1] = 0; // L: 256 + this.method3879(var1, 8192); // L: 257 + } else { + for (var1 = 0; var1 < 16; ++var1) { // L: 242 + this.method3873(var1); } - } - } // L: 303 + } + } // L: 243 258 @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1286820157" + garbageValue = "-1324388853" ) - void method3827(int var1) { - int var2 = var1 & 240; // L: 306 + void method3874(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 261 + if ((var1 < 0 || var2.field2479 == var1) && var2.field2473 < 0) { // L: 262 263 + this.field2455[var2.field2479][var2.field2466] = null; // L: 264 + var2.field2473 = 0; // L: 265 + } + } + + } // L: 269 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1070781239" + ) + void method3875() { + this.method3909(-1); // L: 272 + this.method3873(-1); // L: 273 + + int var1; + for (var1 = 0; var1 < 16; ++var1) { // L: 274 + this.field2442[var1] = this.field2462[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { // L: 275 + this.field2459[var1] = this.field2462[var1] & -128; + } + + } // L: 276 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-394347948" + ) + void method3876(int var1) { + if ((this.field2449[var1] & 2) != 0) { // L: 279 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 280 + if (var2.field2479 == var1 && this.field2455[var1][var2.field2466] == null && var2.field2473 < 0) { // L: 281 282 + var2.field2473 = 0; + } + } + } + + } // L: 286 + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-121" + ) + void method3896(int var1) { + if ((this.field2449[var1] & 4) != 0) { // L: 289 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 290 + if (var2.field2479 == var1) { // L: 291 + var2.field2484 = 0; + } + } + } + + } // L: 294 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + void method3908(int var1) { + int var2 = var1 & 240; // L: 297 int var3; int var4; int var5; - if (var2 == 128) { // L: 307 - var3 = var1 & 15; // L: 308 - var4 = var1 >> 8 & 127; // L: 309 - var5 = var1 >> 16 & 127; // L: 310 - this.method3847(var3, var4, var5); // L: 311 - } else if (var2 == 144) { // L: 314 - var3 = var1 & 15; // L: 315 - var4 = var1 >> 8 & 127; // L: 316 - var5 = var1 >> 16 & 127; // L: 317 - if (var5 > 0) { // L: 318 - this.method3816(var3, var4, var5); + if (var2 == 128) { // L: 298 + var3 = var1 & 15; // L: 299 + var4 = var1 >> 8 & 127; // L: 300 + var5 = var1 >> 16 & 127; // L: 301 + this.method3913(var3, var4, var5); // L: 302 + } else if (var2 == 144) { // L: 305 + var3 = var1 & 15; // L: 306 + var4 = var1 >> 8 & 127; // L: 307 + var5 = var1 >> 16 & 127; // L: 308 + if (var5 > 0) { // L: 309 + this.method3866(var3, var4, var5); } else { - this.method3847(var3, var4, 64); // L: 319 + this.method3913(var3, var4, 64); // L: 310 } - } else if (var2 == 160) { // L: 322 - var3 = var1 & 15; // L: 323 - var4 = var1 >> 8 & 127; // L: 324 - var5 = var1 >> 16 & 127; // L: 325 - this.method3818(var3, var4, var5); // L: 326 - } else if (var2 == 176) { // L: 329 - var3 = var1 & 15; // L: 330 - var4 = var1 >> 8 & 127; // L: 331 - var5 = var1 >> 16 & 127; // L: 332 - if (var4 == 0) { // L: 333 - this.field2465[var3] = (var5 << 14) + (this.field2465[var3] & -2080769); + } else if (var2 == 160) { // L: 313 + var3 = var1 & 15; // L: 314 + var4 = var1 >> 8 & 127; // L: 315 + var5 = var1 >> 16 & 127; // L: 316 + this.method3897(var3, var4, var5); // L: 317 + } else if (var2 == 176) { // L: 320 + var3 = var1 & 15; // L: 321 + var4 = var1 >> 8 & 127; // L: 322 + var5 = var1 >> 16 & 127; // L: 323 + if (var4 == 0) { // L: 324 + this.field2459[var3] = (var5 << 14) + (this.field2459[var3] & -2080769); } - if (var4 == 32) { // L: 334 - this.field2465[var3] = (var5 << 7) + (this.field2465[var3] & -16257); + if (var4 == 32) { // L: 325 + this.field2459[var3] = (var5 << 7) + (this.field2459[var3] & -16257); } - if (var4 == 1) { // L: 335 - this.field2451[var3] = (var5 << 7) + (this.field2451[var3] & -16257); + if (var4 == 1) { // L: 326 + this.field2436[var3] = (var5 << 7) + (this.field2436[var3] & -16257); } - if (var4 == 33) { // L: 336 - this.field2451[var3] = var5 + (this.field2451[var3] & -128); + if (var4 == 33) { // L: 327 + this.field2436[var3] = var5 + (this.field2436[var3] & -128); } - if (var4 == 5) { // L: 337 - this.field2452[var3] = (var5 << 7) + (this.field2452[var3] & -16257); + if (var4 == 5) { // L: 328 + this.field2444[var3] = (var5 << 7) + (this.field2444[var3] & -16257); } - if (var4 == 37) { // L: 338 - this.field2452[var3] = var5 + (this.field2452[var3] & -128); + if (var4 == 37) { // L: 329 + this.field2444[var3] = var5 + (this.field2444[var3] & -128); } - if (var4 == 7) { // L: 339 - this.field2449[var3] = (var5 << 7) + (this.field2449[var3] & -16257); + if (var4 == 7) { // L: 330 + this.field2438[var3] = (var5 << 7) + (this.field2438[var3] & -16257); } - if (var4 == 39) { // L: 340 - this.field2449[var3] = var5 + (this.field2449[var3] & -128); + if (var4 == 39) { // L: 331 + this.field2438[var3] = var5 + (this.field2438[var3] & -128); } - if (var4 == 10) { // L: 341 - this.field2445[var3] = (var5 << 7) + (this.field2445[var3] & -16257); + if (var4 == 10) { // L: 332 + this.field2448[var3] = (var5 << 7) + (this.field2448[var3] & -16257); } - if (var4 == 42) { // L: 342 - this.field2445[var3] = var5 + (this.field2445[var3] & -128); + if (var4 == 42) { // L: 333 + this.field2448[var3] = var5 + (this.field2448[var3] & -128); } - if (var4 == 11) { // L: 343 - this.field2446[var3] = (var5 << 7) + (this.field2446[var3] & -16257); + if (var4 == 11) { // L: 334 + this.field2450[var3] = (var5 << 7) + (this.field2450[var3] & -16257); } - if (var4 == 43) { // L: 344 - this.field2446[var3] = var5 + (this.field2446[var3] & -128); + if (var4 == 43) { // L: 335 + this.field2450[var3] = var5 + (this.field2450[var3] & -128); } int[] var10000; - if (var4 == 64) { // L: 345 - if (var5 >= 64) { // L: 346 - var10000 = this.field2453; + if (var4 == 64) { // L: 336 + if (var5 >= 64) { // L: 337 + var10000 = this.field2449; var10000[var3] |= 1; } else { - var10000 = this.field2453; // L: 347 + var10000 = this.field2449; // L: 338 var10000[var3] &= -2; } } - if (var4 == 65) { // L: 349 - if (var5 >= 64) { // L: 350 - var10000 = this.field2453; + if (var4 == 65) { // L: 340 + if (var5 >= 64) { // L: 341 + var10000 = this.field2449; var10000[var3] |= 2; } else { - this.method3834(var3); // L: 352 - var10000 = this.field2453; // L: 353 + this.method3876(var3); // L: 343 + var10000 = this.field2449; // L: 344 var10000[var3] &= -3; } } - if (var4 == 99) { // L: 356 - this.field2454[var3] = (var5 << 7) + (this.field2454[var3] & 127); + if (var4 == 99) { // L: 347 + this.field2441[var3] = (var5 << 7) + (this.field2441[var3] & 127); } - if (var4 == 98) { // L: 357 - this.field2454[var3] = (this.field2454[var3] & 16256) + var5; + if (var4 == 98) { // L: 348 + this.field2441[var3] = (this.field2441[var3] & 16256) + var5; } - if (var4 == 101) { // L: 358 - this.field2454[var3] = (var5 << 7) + (this.field2454[var3] & 127) + 16384; + if (var4 == 101) { // L: 349 + this.field2441[var3] = (var5 << 7) + (this.field2441[var3] & 127) + 16384; } - if (var4 == 100) { // L: 359 - this.field2454[var3] = (this.field2454[var3] & 16256) + var5 + 16384; + if (var4 == 100) { // L: 350 + this.field2441[var3] = (this.field2441[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { // L: 360 - this.method3821(var3); + if (var4 == 120) { // L: 351 + this.method3909(var3); } - if (var4 == 121) { // L: 361 - this.method3808(var3); + if (var4 == 121) { // L: 352 + this.method3873(var3); } - if (var4 == 123) { // L: 362 - this.method3826(var3); + if (var4 == 123) { // L: 353 + this.method3874(var3); } int var6; - if (var4 == 6) { // L: 363 - var6 = this.field2454[var3]; // L: 364 - if (var6 == 16384) { // L: 365 - this.field2455[var3] = (var5 << 7) + (this.field2455[var3] & -16257); + if (var4 == 6) { // L: 354 + var6 = this.field2441[var3]; // L: 355 + if (var6 == 16384) { // L: 356 + this.field2451[var3] = (var5 << 7) + (this.field2451[var3] & -16257); } } - if (var4 == 38) { // L: 367 - var6 = this.field2454[var3]; // L: 368 - if (var6 == 16384) { // L: 369 - this.field2455[var3] = var5 + (this.field2455[var3] & -128); + if (var4 == 38) { // L: 358 + var6 = this.field2441[var3]; // L: 359 + if (var6 == 16384) { // L: 360 + this.field2451[var3] = var5 + (this.field2451[var3] & -128); } } - if (var4 == 16) { // L: 371 - this.field2441[var3] = (var5 << 7) + (this.field2441[var3] & -16257); + if (var4 == 16) { // L: 362 + this.field2452[var3] = (var5 << 7) + (this.field2452[var3] & -16257); } - if (var4 == 48) { // L: 372 - this.field2441[var3] = var5 + (this.field2441[var3] & -128); + if (var4 == 48) { // L: 363 + this.field2452[var3] = var5 + (this.field2452[var3] & -128); } - if (var4 == 81) { // L: 373 - if (var5 >= 64) { // L: 374 - var10000 = this.field2453; + if (var4 == 81) { // L: 364 + if (var5 >= 64) { // L: 365 + var10000 = this.field2449; var10000[var3] |= 4; } else { - this.method3888(var3); // L: 376 - var10000 = this.field2453; // L: 377 + this.method3896(var3); // L: 367 + var10000 = this.field2449; // L: 368 var10000[var3] &= -5; } } if (var4 == 17) { - this.method3828(var3, (var5 << 7) + (this.field2457[var3] & -16257)); // L: 380 + this.method3879(var3, (var5 << 7) + (this.field2453[var3] & -16257)); // L: 371 } - if (var4 == 49) { // L: 381 - this.method3828(var3, var5 + (this.field2457[var3] & -128)); + if (var4 == 49) { // L: 372 + this.method3879(var3, var5 + (this.field2453[var3] & -128)); } - } else if (var2 == 192) { // L: 384 - var3 = var1 & 15; // L: 385 - var4 = var1 >> 8 & 127; // L: 386 - this.method3898(var3, var4 + this.field2465[var3]); // L: 387 - } else if (var2 == 208) { // L: 390 - var3 = var1 & 15; // L: 391 - var4 = var1 >> 8 & 127; // L: 392 - this.method3856(var3, var4); // L: 393 - } else if (var2 == 224) { // L: 396 - var3 = var1 & 15; // L: 397 - var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398 - this.method3820(var3, var4); // L: 399 + } else if (var2 == 192) { // L: 375 + var3 = var1 & 15; // L: 376 + var4 = var1 >> 8 & 127; // L: 377 + this.method3929(var3, var4 + this.field2459[var3]); // L: 378 + } else if (var2 == 208) { // L: 381 + var3 = var1 & 15; // L: 382 + var4 = var1 >> 8 & 127; // L: 383 + this.method3870(var3, var4); // L: 384 + } else if (var2 == 224) { // L: 387 + var3 = var1 & 15; // L: 388 + var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 389 + this.method3854(var3, var4); // L: 390 } else { - var2 = var1 & 255; // L: 402 - if (var2 == 255) { // L: 403 - this.method3824(); // L: 404 + var2 = var1 & 255; // L: 393 + if (var2 == 255) { // L: 394 + this.method3875(); // L: 395 } } - } // L: 312 320 327 382 388 394 400 405 407 + } // L: 303 311 318 373 379 385 391 396 398 - @ObfuscatedName("ax") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1909425318" + garbageValue = "-1675086749" ) - void method3828(int var1, int var2) { - this.field2457[var1] = var2; // L: 410 - this.field2442[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 - } // L: 412 + void method3879(int var1, int var2) { + this.field2453[var1] = var2; // L: 401 + this.field2454[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 402 + } // L: 403 - @ObfuscatedName("ad") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lhe;I)I", - garbageValue = "2112020444" + descriptor = "(Lhl;B)I", + garbageValue = "12" ) - int method3829(MusicPatchNode var1) { - int var2 = (var1.field2479 * var1.field2487 >> 12) + var1.field2477; // L: 415 - var2 += (this.field2450[var1.field2484] - 8192) * this.field2455[var1.field2484] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field2472; // L: 417 + int method3880(MusicPatchNode var1) { + int var2 = (var1.field2474 * var1.field2470 >> 12) + var1.field2472; // L: 406 + var2 += (this.field2435[var1.field2479] - 8192) * this.field2451[var1.field2479] >> 12; // L: 407 + MusicPatchNode2 var3 = var1.field2464; // L: 408 int var4; - if (var3.field2431 > 0 && (var3.field2430 > 0 || this.field2451[var1.field2484] > 0)) { // L: 418 - var4 = var3.field2430 << 2; // L: 419 - int var5 = var3.field2432 << 1; // L: 420 - if (var1.field2485 < var5) { // L: 421 - var4 = var4 * var1.field2485 / var5; + if (var3.field2424 > 0 && (var3.field2418 > 0 || this.field2436[var1.field2479] > 0)) { // L: 409 + var4 = var3.field2418 << 2; // L: 410 + int var5 = var3.field2425 << 1; // L: 411 + if (var1.field2480 < var5) { // L: 412 + var4 = var4 * var1.field2480 / var5; } - var4 += this.field2451[var1.field2484] >> 7; // L: 422 - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2469 & 511)); // L: 423 - var2 += (int)(var6 * (double)var4); // L: 424 + var4 += this.field2436[var1.field2479] >> 7; // L: 413 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2467 & 511)); // L: 414 + var2 += (int)(var6 * (double)var4); // L: 415 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field1447 + 0.5D); // L: 426 - return var4 < 1 ? 1 : var4; // L: 427 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field1442 + 0.5D); // L: 417 + return var4 < 1 ? 1 : var4; // L: 418 } - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lhe;I)I", - garbageValue = "1971108645" + descriptor = "(Lhl;I)I", + garbageValue = "1185861696" ) - int method3830(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2472; // L: 431 - int var3 = this.field2449[var1.field2484] * this.field2446[var1.field2484] + 4096 >> 13; // L: 432 - var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field2475 + 16384 >> 15; // L: 434 - var3 = var3 * this.field2458 + 128 >> 8; // L: 435 - if (var2.field2425 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2425 * 1.953125E-5D * (double)var1.field2480) + 0.5D); // L: 437 + int method3881(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2464; // L: 422 + int var3 = this.field2438[var1.field2479] * this.field2450[var1.field2479] + 4096 >> 13; // L: 423 + var3 = var3 * var3 + 16384 >> 15; // L: 424 + var3 = var3 * var1.field2469 + 16384 >> 15; // L: 425 + var3 = var3 * this.field2440 + 128 >> 8; // L: 426 + if (var2.field2419 > 0) { // L: 427 + var3 = (int)((double)var3 * Math.pow(0.5D, 1.953125E-5D * (double)var1.field2475 * (double)var2.field2419) + 0.5D); // L: 428 } int var4; int var5; int var6; int var7; - if (var2.field2426 != null) { // L: 439 - var4 = var1.field2478; // L: 440 - var5 = var2.field2426[var1.field2482 + 1]; // L: 441 - if (var1.field2482 < var2.field2426.length - 2) { // L: 442 - var6 = (var2.field2426[var1.field2482] & 255) << 8; // L: 443 - var7 = (var2.field2426[var1.field2482 + 2] & 255) << 8; // L: 444 - var5 += (var4 - var6) * (var2.field2426[var1.field2482 + 3] - var5) / (var7 - var6); // L: 445 + if (var2.field2423 != null) { // L: 430 + var4 = var1.field2476; // L: 431 + var5 = var2.field2423[var1.field2477 + 1]; // L: 432 + if (var1.field2477 < var2.field2423.length - 2) { // L: 433 + var6 = (var2.field2423[var1.field2477] & 255) << 8; // L: 434 + var7 = (var2.field2423[var1.field2477 + 2] & 255) << 8; // L: 435 + var5 += (var2.field2423[var1.field2477 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 436 } - var3 = var3 * var5 + 32 >> 6; // L: 447 + var3 = var5 * var3 + 32 >> 6; // L: 438 } - if (var1.field2483 > 0 && var2.field2433 != null) { // L: 449 - var4 = var1.field2483; // L: 450 - var5 = var2.field2433[var1.field2489 + 1]; // L: 451 - if (var1.field2489 < var2.field2433.length - 2) { // L: 452 - var6 = (var2.field2433[var1.field2489] & 255) << 8; // L: 453 - var7 = (var2.field2433[var1.field2489 + 2] & 255) << 8; // L: 454 - var5 += (var2.field2433[var1.field2489 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 + if (var1.field2473 > 0 && var2.field2426 != null) { // L: 440 + var4 = var1.field2473; // L: 441 + var5 = var2.field2426[var1.field2485 + 1]; // L: 442 + if (var1.field2485 < var2.field2426.length - 2) { // L: 443 + var6 = (var2.field2426[var1.field2485] & 255) << 8; // L: 444 + var7 = (var2.field2426[var1.field2485 + 2] & 255) << 8; // L: 445 + var5 += (var4 - var6) * (var2.field2426[var1.field2485 + 3] - var5) / (var7 - var6); // L: 446 } - var3 = var3 * var5 + 32 >> 6; // L: 457 + var3 = var5 * var3 + 32 >> 6; // L: 448 } - return var3; // L: 459 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(Lhe;I)I", - garbageValue = "1180870566" - ) - int method3831(MusicPatchNode var1) { - int var2 = this.field2445[var1.field2484]; // L: 463 - return var2 < 8192 ? var2 * var1.field2481 + 32 >> 6 : 16384 - ((128 - var1.field2481) * (16384 - var2) + 32 >> 6); // L: 464 465 + return var3; // L: 450 } @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1881987389" + descriptor = "(Lhl;B)I", + garbageValue = "-20" ) - void method3894() { - int var1 = this.track; // L: 522 - int var2 = this.trackLength; // L: 523 + int method3882(MusicPatchNode var1) { + int var2 = this.field2448[var1.field2479]; // L: 454 + return var2 < 8192 ? var2 * var1.field2465 + 32 >> 6 : 16384 - ((128 - var1.field2465) * (16384 - var2) + 32 >> 6); // L: 455 456 + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "74" + ) + void method3888() { + int var1 = this.track; // L: 513 + int var2 = this.trackLength; // L: 514 long var3; - for (var3 = this.field2466; var2 == this.trackLength; var3 = this.midiFile.method3942(var2)) { // L: 524 525 547 - while (var2 == this.midiFile.trackLengths[var1]) { // L: 526 - this.midiFile.gotoTrack(var1); // L: 527 - int var5 = this.midiFile.readMessage(var1); // L: 528 - if (var5 == 1) { // L: 529 - this.midiFile.setTrackDone(); // L: 530 - this.midiFile.markTrackPosition(var1); // L: 531 - if (this.midiFile.isDone()) { // L: 532 - if (!this.field2462 || var2 == 0) { // L: 533 - this.method3824(); // L: 537 - this.midiFile.clear(); // L: 538 - return; // L: 539 + for (var3 = this.field2445; var2 == this.trackLength; var3 = this.midiFile.method4025(var2)) { // L: 515 516 538 + while (var2 == this.midiFile.trackLengths[var1]) { // L: 517 + this.midiFile.gotoTrack(var1); // L: 518 + int var5 = this.midiFile.readMessage(var1); // L: 519 + if (var5 == 1) { // L: 520 + this.midiFile.setTrackDone(); // L: 521 + this.midiFile.markTrackPosition(var1); // L: 522 + if (this.midiFile.isDone()) { // L: 523 + if (!this.field2458 || var2 == 0) { // L: 524 + this.method3875(); // L: 528 + this.midiFile.clear(); // L: 529 + return; // L: 530 } - this.midiFile.reset(var3); // L: 534 + this.midiFile.reset(var3); // L: 525 } break; } - if ((var5 & 128) != 0) { // L: 541 - this.method3827(var5); + if ((var5 & 128) != 0) { // L: 532 + this.method3908(var5); } - this.midiFile.readTrackLength(var1); // L: 542 - this.midiFile.markTrackPosition(var1); // L: 543 + this.midiFile.readTrackLength(var1); // L: 533 + this.midiFile.markTrackPosition(var1); // L: 534 } - var1 = this.midiFile.getPrioritizedTrack(); // L: 545 - var2 = this.midiFile.trackLengths[var1]; // L: 546 + var1 = this.midiFile.getPrioritizedTrack(); // L: 536 + var2 = this.midiFile.trackLengths[var1]; // L: 537 } - this.track = var1; // L: 549 - this.trackLength = var2; // L: 550 - this.field2466 = var3; // L: 551 - } // L: 552 + this.track = var1; // L: 540 + this.trackLength = var2; // L: 541 + this.field2445 = var3; // L: 542 + } // L: 543 - @ObfuscatedName("af") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lhe;I)Z", - garbageValue = "1071340203" + descriptor = "(Lhl;I)Z", + garbageValue = "1703844968" ) - boolean method3838(MusicPatchNode var1) { - if (var1.stream == null) { // L: 555 - if (var1.field2483 >= 0) { // L: 556 - var1.remove(); // L: 557 - if (var1.field2473 > 0 && var1 == this.field2460[var1.field2484][var1.field2473]) { // L: 558 - this.field2460[var1.field2484][var1.field2473] = null; // L: 559 + boolean method3889(MusicPatchNode var1) { + if (var1.stream == null) { // L: 546 + if (var1.field2473 >= 0) { // L: 547 + var1.remove(); // L: 548 + if (var1.field2468 > 0 && var1 == this.field2456[var1.field2479][var1.field2468]) { // L: 549 + this.field2456[var1.field2479][var1.field2468] = null; // L: 550 } } - return true; // L: 562 + return true; // L: 553 } else { - return false; // L: 564 + return false; // L: 555 } } - @ObfuscatedName("ak") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lhe;[IIII)Z", - garbageValue = "648141605" + descriptor = "(Lhl;[IIIB)Z", + garbageValue = "-77" ) - boolean method3839(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2488 = PcmPlayer.field1447 / 100; // L: 568 - if (var1.field2483 < 0 || var1.stream != null && !var1.stream.method2654()) { // L: 569 - int var5 = var1.field2479; // L: 577 - if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2452[var1.field2484]) + 0.5D); // L: 579 - if (var5 < 0) { // L: 580 + boolean method3877(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2483 = PcmPlayer.field1442 / 100; // L: 559 + if (var1.field2473 < 0 || var1.stream != null && !var1.stream.method2690()) { // L: 560 + int var5 = var1.field2474; // L: 568 + if (var5 > 0) { // L: 569 + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2444[var1.field2479] * 4.921259842519685E-4D) + 0.5D); // L: 570 + if (var5 < 0) { // L: 571 var5 = 0; } - var1.field2479 = var5; // L: 581 + var1.field2474 = var5; // L: 572 } - var1.stream.method2652(this.method3829(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field2472; // L: 584 - boolean var7 = false; // L: 585 - ++var1.field2485; // L: 586 - var1.field2469 += var6.field2431; // L: 587 - double var8 = 5.086263020833333E-6D * (double)((var1.field2474 - 60 << 8) + (var1.field2487 * var1.field2479 >> 12)); // L: 588 - if (var6.field2425 > 0) { // L: 589 - if (var6.field2429 > 0) { // L: 590 - var1.field2480 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2429) + 0.5D); + var1.stream.method2733(this.method3880(var1)); // L: 574 + MusicPatchNode2 var6 = var1.field2464; // L: 575 + boolean var7 = false; // L: 576 + ++var1.field2480; // L: 577 + var1.field2467 += var6.field2424; // L: 578 + double var8 = 5.086263020833333E-6D * (double)((var1.field2466 - 60 << 8) + (var1.field2470 * var1.field2474 >> 12)); // L: 579 + if (var6.field2419 > 0) { // L: 580 + if (var6.field2422 > 0) { // L: 581 + var1.field2475 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2422 * var8) + 0.5D); } else { - var1.field2480 += 128; // L: 591 + var1.field2475 += 128; // L: 582 } } - if (var6.field2426 != null) { // L: 593 - if (var6.field2427 > 0) { // L: 594 - var1.field2478 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2427 * var8) + 0.5D); + if (var6.field2423 != null) { // L: 584 + if (var6.field2420 > 0) { // L: 585 + var1.field2476 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2420) + 0.5D); } else { - var1.field2478 += 128; // L: 595 + var1.field2476 += 128; // L: 586 } - while (var1.field2482 < var6.field2426.length - 2 && var1.field2478 > (var6.field2426[var1.field2482 + 2] & 255) << 8) { // L: 596 - var1.field2482 += 2; + while (var1.field2477 < var6.field2423.length - 2 && var1.field2476 > (var6.field2423[var1.field2477 + 2] & 255) << 8) { // L: 587 + var1.field2477 += 2; } - if (var6.field2426.length - 2 == var1.field2482 && var6.field2426[var1.field2482 + 1] == 0) { // L: 597 + if (var6.field2423.length - 2 == var1.field2477 && var6.field2423[var1.field2477 + 1] == 0) { // L: 588 var7 = true; } } - if (var1.field2483 >= 0 && var6.field2433 != null && (this.field2453[var1.field2484] & 1) == 0 && (var1.field2473 < 0 || var1 != this.field2460[var1.field2484][var1.field2473])) { // L: 599 600 - if (var6.field2428 > 0) { // L: 601 - var1.field2483 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2428) + 0.5D); + if (var1.field2473 >= 0 && var6.field2426 != null && (this.field2449[var1.field2479] & 1) == 0 && (var1.field2468 < 0 || var1 != this.field2456[var1.field2479][var1.field2468])) { // L: 590 591 + if (var6.field2421 > 0) { // L: 592 + var1.field2473 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2421) + 0.5D); } else { - var1.field2483 += 128; // L: 602 + var1.field2473 += 128; // L: 593 } - while (var1.field2489 < var6.field2433.length - 2 && var1.field2483 > (var6.field2433[var1.field2489 + 2] & 255) << 8) { // L: 603 - var1.field2489 += 2; + while (var1.field2485 < var6.field2426.length - 2 && var1.field2473 > (var6.field2426[var1.field2485 + 2] & 255) << 8) { // L: 594 + var1.field2485 += 2; } - if (var6.field2433.length - 2 == var1.field2489) { // L: 604 + if (var6.field2426.length - 2 == var1.field2485) { // L: 595 var7 = true; } } - if (var7) { // L: 607 - var1.stream.method2681(var1.field2488); // L: 608 - if (var2 != null) { // L: 609 + if (var7) { // L: 598 + var1.stream.method2687(var1.field2483); // L: 599 + if (var2 != null) { // L: 600 var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); // L: 610 + var1.stream.skip(var4); // L: 601 } - if (var1.stream.method2655()) { // L: 611 + if (var1.stream.method2786()) { // L: 602 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method3926(); // L: 612 - if (var1.field2483 >= 0) { // L: 613 - var1.remove(); // L: 614 - if (var1.field2473 > 0 && var1 == this.field2460[var1.field2484][var1.field2473]) { // L: 615 - this.field2460[var1.field2484][var1.field2473] = null; // L: 616 + var1.method3971(); // L: 603 + if (var1.field2473 >= 0) { // L: 604 + var1.remove(); // L: 605 + if (var1.field2468 > 0 && var1 == this.field2456[var1.field2479][var1.field2468]) { // L: 606 + this.field2456[var1.field2479][var1.field2468] = null; // L: 607 } } - return true; // L: 619 + return true; // L: 610 } else { - var1.stream.method2650(var1.field2488, this.method3830(var1), this.method3831(var1)); // L: 621 - return false; // L: 622 + var1.stream.method2686(var1.field2483, this.method3881(var1), this.method3882(var1)); // L: 612 + return false; // L: 613 } } else { - var1.method3926(); // L: 570 - var1.remove(); // L: 571 - if (var1.field2473 > 0 && var1 == this.field2460[var1.field2484][var1.field2473]) { // L: 572 - this.field2460[var1.field2484][var1.field2473] = null; // L: 573 + var1.method3971(); // L: 561 + var1.remove(); // L: 562 + if (var1.field2468 > 0 && var1 == this.field2456[var1.field2479][var1.field2468]) { // L: 563 + this.field2456[var1.field2479][var1.field2468] = null; // L: 564 } - return true; // L: 575 + return true; // L: 566 } } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)Ljg;", - garbageValue = "-2143531135" - ) - public static ObjectDefinition getObjectDefinition(int var0) { - ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); // L: 72 - if (var1 != null) { // L: 73 - return var1; - } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); // L: 74 - var1 = new ObjectDefinition(); // L: 75 - var1.id = var0; // L: 76 - if (var2 != null) { // L: 77 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 78 - if (var1.isSolid) { // L: 79 - var1.interactType = 0; // L: 80 - var1.boolean1 = false; // L: 81 - } - - ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); // L: 83 - return var1; // L: 84 - } - } - - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1815090828" + garbageValue = "-1417043368" ) - static void method3920() { - Tiles.Tiles_minPlane = 99; - Tiles.field528 = new byte[4][104][104]; - Tiles.field521 = new byte[4][104][104]; // L: 50 - class297.field3668 = new byte[4][104][104]; - class171.field2049 = new byte[4][104][104]; - class204.field2421 = new int[4][105][105]; - class22.field122 = new byte[4][105][105]; // L: 54 - class39.field282 = new int[105][105]; - Tiles.Tiles_hue = new int[104]; - Tiles.Tiles_saturation = new int[104]; // L: 57 - WorldMapRectangle.Tiles_lightness = new int[104]; - WorldMapScaleHandler.Tiles_hueMultiplier = new int[104]; - class60.field453 = new int[104]; - } // L: 61 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1830398004" - ) - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 - if (var4 == null) { // L: 40 - var4 = new ItemContainer(); // L: 41 - ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 - } - - if (var4.ids.length <= var1) { // L: 44 - int[] var5 = new int[var1 + 1]; // L: 45 - int[] var6 = new int[var1 + 1]; // L: 46 - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 - var5[var7] = var4.ids[var7]; // L: 48 - var6[var7] = var4.quantities[var7]; // L: 49 - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 - var5[var7] = -1; // L: 52 - var6[var7] = 0; // L: 53 - } - - var4.ids = var5; // L: 55 - var4.quantities = var6; // L: 56 - } - - var4.ids[var1] = var2; // L: 58 - var4.quantities[var1] = var3; // L: 59 - } // L: 60 + public static void method3970() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 86 + } // L: 87 } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 0fa641921d..d1ab6e602a 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -1,124 +1,149 @@ +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("fu") +@ObfuscatedName("fc") +@Implements("MilliClock") public class MilliClock extends Clock { + @ObfuscatedName("rn") + @ObfuscatedGetter( + intValue = -1966290911 + ) + static int field2048; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1735365545 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("f") + long[] field2042; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1230464275 + ) + int field2040; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1780413157 + ) + int field2041; + @ObfuscatedName("m") + @ObfuscatedGetter( + longValue = 7922425031260846731L + ) + long field2043; @ObfuscatedName("z") - long[] field2057; - @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -886018089 + intValue = -1604091025 ) - int field2053; - @ObfuscatedName("s") + int field2047; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -786123251 + intValue = 738623211 ) - int field2055; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = 4297873508162360303L - ) - long field2056; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -981834759 - ) - int field2054; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 709273215 - ) - int field2058; + int field2044; MilliClock() { - this.field2057 = new long[10]; // L: 7 - this.field2053 = 256; // L: 15 - this.field2055 = 1; // L: 16 - this.field2054 = 0; // L: 17 - this.field2056 = PacketWriter.currentTimeMillis(); // L: 18 + this.field2042 = new long[10]; // L: 7 + this.field2040 = 256; // L: 15 + this.field2041 = 1; // L: 16 + this.field2047 = 0; // L: 17 + this.field2043 = User.currentTimeMillis(); // L: 18 for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field2057[var1] = this.field2056; // L: 20 + this.field2042[var1] = this.field2043; // L: 20 } } // L: 22 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "208275261" + garbageValue = "345512591" ) + @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field2057[var1] = 0L; // L: 26 + this.field2042[var1] = 0L; // L: 26 } } // L: 28 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-16016139" + garbageValue = "-837141414" ) + @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field2053; // L: 31 - int var4 = this.field2055; // L: 32 - this.field2053 = 300; // L: 33 - this.field2055 = 1; // L: 34 - this.field2056 = PacketWriter.currentTimeMillis(); // L: 35 - if (this.field2057[this.field2058] == 0L) { // L: 36 - this.field2053 = var3; // L: 37 - this.field2055 = var4; // L: 38 - } else if (this.field2056 > this.field2057[this.field2058]) { // L: 40 - this.field2053 = (int)((long)(var1 * 2560) / (this.field2056 - this.field2057[this.field2058])); + int var3 = this.field2040; // L: 31 + int var4 = this.field2041; // L: 32 + this.field2040 = 300; // L: 33 + this.field2041 = 1; // L: 34 + this.field2043 = User.currentTimeMillis(); // L: 35 + if (this.field2042[this.field2044] == 0L) { // L: 36 + this.field2040 = var3; // L: 37 + this.field2041 = var4; // L: 38 + } else if (this.field2043 > this.field2042[this.field2044]) { // L: 40 + this.field2040 = (int)((long)(var1 * 2560) / (this.field2043 - this.field2042[this.field2044])); } - if (this.field2053 < 25) { // L: 41 - this.field2053 = 25; + if (this.field2040 < 25) { // L: 41 + this.field2040 = 25; } - if (this.field2053 > 256) { // L: 42 - this.field2053 = 256; // L: 43 - this.field2055 = (int)((long)var1 - (this.field2056 - this.field2057[this.field2058]) / 10L); // L: 44 + if (this.field2040 > 256) { // L: 42 + this.field2040 = 256; // L: 43 + this.field2041 = (int)((long)var1 - (this.field2043 - this.field2042[this.field2044]) / 10L); // L: 44 } - if (this.field2055 > var1) { // L: 46 - this.field2055 = var1; + if (this.field2041 > var1) { // L: 46 + this.field2041 = var1; } - this.field2057[this.field2058] = this.field2056; // L: 47 - this.field2058 = (this.field2058 + 1) % 10; // L: 48 + this.field2042[this.field2044] = this.field2043; // L: 47 + this.field2044 = (this.field2044 + 1) % 10; // L: 48 int var5; - if (this.field2055 > 1) { // L: 49 + if (this.field2041 > 1) { // L: 49 for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (0L != this.field2057[var5]) { // L: 51 - this.field2057[var5] += (long)this.field2055; + if (this.field2042[var5] != 0L) { // L: 51 + this.field2042[var5] += (long)this.field2041; } } } - if (this.field2055 < var2) { // L: 54 - this.field2055 = var2; + if (this.field2041 < var2) { // L: 54 + this.field2041 = var2; } - class227.sleepExact((long)this.field2055); // L: 55 + WorldMapSection3.sleepExact((long)this.field2041); // L: 55 - for (var5 = 0; this.field2054 < 256; this.field2054 += this.field2053) { // L: 56 57 59 + for (var5 = 0; this.field2047 < 256; this.field2047 += this.field2040) { // L: 56 57 59 ++var5; // L: 58 } - this.field2054 &= 255; // L: 61 + this.field2047 &= 255; // L: 61 return var5; // L: 62 } - @ObfuscatedName("g") + @ObfuscatedName("ex") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-473742756" + descriptor = "(IS)I", + garbageValue = "152" ) - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 142 + static int method3587(int var0) { + return var0 * 3 + 600; // L: 1918 + } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-26" + ) + public static boolean method3590() { + return Client.staffModLevel >= 2; // L: 11656 } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index eebddabb9d..d0370f6774 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -1,199 +1,442 @@ import java.util.HashSet; import java.util.Set; +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("gy") +@ObfuscatedName("gc") +@Implements("ModeWhere") public enum ModeWhere implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lgc;" ) - field2413("", 0, new class200[]{class200.field2401}), - @ObfuscatedName("k") + field2400("", 0, new class200[]{class200.field2392}), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lgc;" ) - field2405("", 1, new class200[]{class200.field2399, class200.field2401}), - @ObfuscatedName("s") + field2396("", 1, new class200[]{class200.field2390, class200.field2392}), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lgc;" ) - field2406("", 2, new class200[]{class200.field2399, class200.field2402, class200.field2401}), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2407("", 3, new class200[]{class200.field2399}), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2409("", 4), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2416("", 5, new class200[]{class200.field2399, class200.field2401}), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2410("", 6, new class200[]{class200.field2401}), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2411("", 8, new class200[]{class200.field2399, class200.field2401}), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2408("", 9, new class200[]{class200.field2399, class200.field2402}), + field2395("", 2, new class200[]{class200.field2390, class200.field2391, class200.field2392}), @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lgc;" ) - field2404("", 10, new class200[]{class200.field2399}), + field2398("", 3, new class200[]{class200.field2390}), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2397("", 4), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2405("", 5, new class200[]{class200.field2390, class200.field2392}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2402("", 6, new class200[]{class200.field2392}), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2401("", 8, new class200[]{class200.field2390, class200.field2392}), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2403("", 9, new class200[]{class200.field2390, class200.field2391}), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2404("", 10, new class200[]{class200.field2390}), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2409("", 11, new class200[]{class200.field2390}), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgc;" + ) + field2406("", 12, new class200[]{class200.field2390, class200.field2392}), @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lgc;" ) - field2414("", 11, new class200[]{class200.field2399}), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2415("", 12, new class200[]{class200.field2399, class200.field2401}), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgy;" - ) - field2412("", 13, new class200[]{class200.field2399}); + field2407("", 13, new class200[]{class200.field2390}); - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1536594685 + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "Lef;" ) + @Export("scene") + static Scene scene; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 797439581 + ) + @Export("id") final int id; - @ObfuscatedName("q") - final Set field2418; + @ObfuscatedName("p") + final Set field2399; static { - method3771(); // L: 28 + method3813(); // L: 28 } // L: 29 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Lgl;)V" + descriptor = "(Ljava/lang/String;I[Lgj;)V" ) ModeWhere(String var3, int var4, class200[] var5) { - this.field2418 = new HashSet(); + this.field2399 = new HashSet(); this.id = var4; // L: 43 class200[] var6 = var5; // L: 45 - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 - class200 var8 = var6[var7]; // L: 47 - this.field2418.add(var8); // L: 48 + for (int var7 = 0; var7 < var6.length; ++var7) { + class200 var8 = var6[var7]; + this.field2399.add(var8); // L: 48 } } // L: 51 ModeWhere(String var3, int var4) { - this.field2418 = new HashSet(); + this.field2399 = new HashSet(); // L: 32 this.id = var4; // L: 39 - } + } // L: 40 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 54 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)[Lgy;", - garbageValue = "-1051683174" + descriptor = "(B)[Lgc;", + garbageValue = "52" ) - static ModeWhere[] method3771() { - return new ModeWhere[]{field2411, field2407, field2404, field2408, field2409, field2414, field2412, field2415, field2406, field2413, field2410, field2405, field2416}; + static ModeWhere[] method3813() { + return new ModeWhere[]{field2404, field2409, field2396, field2403, field2401, field2406, field2395, field2400, field2402, field2397, field2405, field2398, field2407}; // L: 35 } - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "166019854" + descriptor = "(Llc;IIII)V", + garbageValue = "13725684" ) - static void method3772() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 - if (var0.stream1 != null) { // L: 31 - Players.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 - var0.stream1 = null; // L: 33 + static void method3814(Sprite var0, int var1, int var2, int var3) { + WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, class8.method117(var1, var2, var3), var0.pixels.length * 4); // L: 46 + } // L: 47 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([Lcf;II[I[IB)V", + garbageValue = "48" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { // L: 81 + int var5 = var1 - 1; // L: 82 + int var6 = var2 + 1; // L: 83 + int var7 = (var2 + var1) / 2; // L: 84 + World var8 = var0[var7]; // L: 85 + var0[var7] = var0[var1]; // L: 86 + var0[var1] = var8; // L: 87 + + while (var5 < var6) { // L: 88 + boolean var9 = true; // L: 89 + + int var10; + int var11; + int var12; + do { + --var6; // L: 91 + + for (var10 = 0; var10 < 4; ++var10) { // L: 92 + if (var3[var10] == 2) { // L: 95 + var11 = var0[var6].index; // L: 96 + var12 = var8.index; // L: 97 + } else if (var3[var10] == 1) { // L: 99 + var11 = var0[var6].population; // L: 100 + var12 = var8.population; // L: 101 + if (var11 == -1 && var4[var10] == 1) { // L: 102 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 103 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 105 + var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 + } else { + var11 = var0[var6].id; // L: 110 + var12 = var8.id; // L: 111 + } + + if (var12 != var11) { // L: 113 + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 + var9 = false; // L: 119 + } + break; + } + + if (var10 == 3) { // L: 114 + var9 = false; + } + } + } while(var9); + + var9 = true; // L: 124 + + do { + ++var5; // L: 126 + + for (var10 = 0; var10 < 4; ++var10) { // L: 127 + if (var3[var10] == 2) { // L: 130 + 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) { // L: 159 + World var13 = var0[var5]; // L: 160 + var0[var5] = var0[var6]; // L: 161 + var0[var6] = var13; // L: 162 + } } - if (var0.stream2 != null) { // L: 35 - Players.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 - var0.stream2 = null; // L: 37 - } + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 } - ObjectSound.objectSounds.clear(); // L: 40 - } // L: 41 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Lfa;", - garbageValue = "-839194319" - ) - public static Clock method3761() { - try { - return new NanoClock(); // L: 8 - } catch (Throwable var1) { // L: 10 - return new MilliClock(); // L: 11 - } - } + } // L: 168 @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "1007074370" + descriptor = "(Leh;IIIB)Z", + garbageValue = "127" ) - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { // L: 105 - int var3 = var0; // L: 107 - String var2; - if (var1 && var0 >= 0) { // L: 110 - int var4 = 2; // L: 114 - - for (int var5 = var0 / 10; var5 != 0; ++var4) { // L: 115 116 118 - var5 /= 10; // L: 117 - } - - char[] var6 = new char[var4]; // L: 120 - var6[0] = '+'; // L: 121 - - for (int var7 = var4 - 1; var7 > 0; --var7) { // L: 122 - int var8 = var3; // L: 123 - var3 /= 10; // L: 124 - int var9 = var8 - var3 * 10; // L: 125 - if (var9 >= 10) { // L: 126 - var6[var7] = (char)(var9 + 87); - } else { - var6[var7] = (char)(var9 + 48); // L: 127 - } - } - - var2 = new String(var6); // L: 129 - } else { - var2 = Integer.toString(var0, 10); // L: 111 - } - - return var2; // L: 131 + static final boolean method3818(Model var0, int var1, int var2, int var3) { + if (!WorldMapSection2.method425()) { // L: 131 + return false; } else { - return Integer.toString(var0); + class238.method4271(); // L: 132 + int var4 = var0.xMid + var1; // L: 133 + int var5 = var2 + var0.yMid; // L: 134 + int var6 = var3 + var0.zMid; // L: 135 + int var7 = var0.xMidOffset; // L: 136 + int var8 = var0.yMidOffset; // L: 137 + int var9 = var0.zMidOffset; // L: 138 + int var10 = ViewportMouse.field1770 - var4; // L: 139 + int var11 = WorldMapEvent.field377 - var5; // L: 140 + int var12 = ViewportMouse.field1768 - var6; // L: 141 + if (Math.abs(var10) > var7 + class1.field3) { // L: 142 + return false; // L: 143 + } else if (Math.abs(var11) > var8 + ItemContainer.field570) { // L: 145 + return false; // L: 146 + } else if (Math.abs(var12) > var9 + ViewportMouse.field1772) { // L: 148 + return false; // L: 149 + } else if (Math.abs(var12 * GrandExchangeOfferTotalQuantityComparator.field81 - var11 * SecureRandomCallable.field553) > var9 * ItemContainer.field570 + var8 * ViewportMouse.field1772) { // L: 151 + return false; // L: 152 + } else if (Math.abs(var10 * SecureRandomCallable.field553 - var12 * ViewportMouse.field1771) > var7 * ViewportMouse.field1772 + var9 * class1.field3) { // L: 154 + return false; // L: 155 + } else { + return Math.abs(var11 * ViewportMouse.field1771 - var10 * GrandExchangeOfferTotalQuantityComparator.field81) <= var7 * ItemContainer.field570 + var8 * class1.field3; // L: 157 + } } } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "1986323726" + ) + static int method3806(int var0, Script var1, boolean var2) { + int var6; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 2736 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2737 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var6).name; // L: 2738 + return 1; // L: 2739 + } else { + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 2741 + MilliClock.Interpreter_intStackSize -= 2; // L: 2742 + var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2743 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2744 + var5 = AbstractWorldMapData.ItemDefinition_get(var6); // L: 2745 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 2746 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2747 + } + + return 1; // L: 2748 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 2750 + MilliClock.Interpreter_intStackSize -= 2; // L: 2751 + var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2752 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2753 + var5 = AbstractWorldMapData.ItemDefinition_get(var6); // L: 2754 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 2755 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2756 + } + + return 1; // L: 2757 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 2759 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2760 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var6).price; // L: 2761 + return 1; // L: 2762 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 2764 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2765 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 2766 + return 1; // L: 2767 + } else { + ItemDefinition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 2769 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2770 + var7 = AbstractWorldMapData.ItemDefinition_get(var6); // L: 2771 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 2772 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6; // L: 2773 + } + + return 1; // L: 2774 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 2776 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2777 + var7 = AbstractWorldMapData.ItemDefinition_get(var6); // L: 2778 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 2779 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6; // L: 2780 + } + + return 1; // L: 2781 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 2783 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2784 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 2785 + return 1; // L: 2786 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 2788 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2789 + var7 = AbstractWorldMapData.ItemDefinition_get(var6); // L: 2790 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 2791 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6; // L: 2792 + } + + return 1; // L: 2793 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 2795 + var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2796 + var7 = AbstractWorldMapData.ItemDefinition_get(var6); // L: 2797 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 2798 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6; // L: 2799 + } + + return 1; // L: 2800 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 2802 + String var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2803 + var4 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2804 + class22.findItemDefinitions(var3, var4 == 1); // L: 2805 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = PendingSpawn.foundItemIdCount; // L: 2806 + return 1; // L: 2807 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 2809 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 2814 + AbstractWorldMapIcon.foundItemIndex = 0; // L: 2815 + return 1; // L: 2816 + } else { + return 2; // L: 2818 + } + } else { + if (Message.foundItemIds != null && AbstractWorldMapIcon.foundItemIndex < PendingSpawn.foundItemIdCount) { // L: 2810 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Message.foundItemIds[++AbstractWorldMapIcon.foundItemIndex - 1] & '\uffff'; // L: 2811 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 2812 + } + } + } + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1868104521" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 10338 + } + + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1392240516" + ) + static final void method3815() { + PacketBufferNode var0 = class4.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); // L: 11249 + Client.packetWriter.addNode(var0); // L: 11250 + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11251 + if (var1.type == 0 || var1.type == 3) { // L: 11252 + Player.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { // L: 11254 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 11255 + Client.meslayerContinueWidget = null; // L: 11256 + } + + } // L: 11258 } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 18475b04e1..37810c7821 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -1,141 +1,183 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("eh") +@Implements("Model") public class Model extends Entity { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ler;" - ) - static Model Model_sharedSequenceModel; - @ObfuscatedName("k") - static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Ler;" - ) - static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("t") - static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("ah") - static boolean[] field1747; - @ObfuscatedName("av") - static boolean[] field1734; - @ObfuscatedName("ax") - static int[] modelViewportXs; - @ObfuscatedName("as") - static int[] modelViewportYs; - @ObfuscatedName("az") - static int[] field1760; - @ObfuscatedName("ad") - static int[] field1728; - @ObfuscatedName("ai") - static int[] field1739; - @ObfuscatedName("ay") - static int[] field1740; - @ObfuscatedName("aw") - static int[] field1742; - @ObfuscatedName("af") - static int[][] field1743; - @ObfuscatedName("ak") - static int[] field1744; - @ObfuscatedName("ac") - static int[][] field1745; - @ObfuscatedName("bl") - static int[] field1746; - @ObfuscatedName("bc") - static int[] field1701; - @ObfuscatedName("bz") - static int[] field1748; - @ObfuscatedName("bj") - static int[] field1749; - @ObfuscatedName("bh") - static int[] field1750; - @ObfuscatedName("bi") - static int[] field1751; - @ObfuscatedName("bg") - static int Model_transformTempX; - @ObfuscatedName("br") - static int Model_transformTempY; - @ObfuscatedName("bp") - static int Model_transformTempZ; - @ObfuscatedName("bn") - static boolean field1700; - @ObfuscatedName("bu") - static int[] Model_sine; - @ObfuscatedName("ba") - static int[] Model_cosine; - @ObfuscatedName("bm") - static int[] field1756; - @ObfuscatedName("bd") - static int[] field1761; - @ObfuscatedName("i") - int verticesCount; - @ObfuscatedName("o") - int[] verticesX; - @ObfuscatedName("x") - int[] verticesY; - @ObfuscatedName("w") - int[] verticesZ; - @ObfuscatedName("g") - int indicesCount; - @ObfuscatedName("m") - int[] indices1; - @ObfuscatedName("n") - int[] indices2; - @ObfuscatedName("d") - int[] indices3; - @ObfuscatedName("h") - int[] faceColors1; - @ObfuscatedName("a") - int[] faceColors2; - @ObfuscatedName("q") - int[] faceColors3; - @ObfuscatedName("c") - byte[] faceRenderPriorities; @ObfuscatedName("f") - byte[] faceAlphas; - @ObfuscatedName("y") - byte[] field1757; - @ObfuscatedName("v") - short[] faceTextures; - @ObfuscatedName("j") - byte field1720; - @ObfuscatedName("r") - int field1714; - @ObfuscatedName("u") - int[] field1715; - @ObfuscatedName("p") - int[] field1716; + @ObfuscatedSignature( + descriptor = "Leh;" + ) + @Export("Model_sharedSequenceModel") + static Model Model_sharedSequenceModel; @ObfuscatedName("b") - int[] field1717; + @Export("Model_sharedSequenceModelFaceAlphas") + static byte[] Model_sharedSequenceModelFaceAlphas; @ObfuscatedName("l") - int[][] vertexLabels; + @ObfuscatedSignature( + descriptor = "Leh;" + ) + @Export("Model_sharedSpotAnimationModel") + static Model Model_sharedSpotAnimationModel; + @ObfuscatedName("m") + @Export("Model_sharedSpotAnimationModelFaceAlphas") + static byte[] Model_sharedSpotAnimationModelFaceAlphas; + @ObfuscatedName("ag") + static boolean[] field1734; + @ObfuscatedName("aq") + static boolean[] field1735; + @ObfuscatedName("aw") + @Export("modelViewportXs") + static int[] modelViewportXs; + @ObfuscatedName("an") + @Export("modelViewportYs") + static int[] modelViewportYs; + @ObfuscatedName("am") + static int[] field1752; + @ObfuscatedName("aa") + static int[] field1739; + @ObfuscatedName("at") + static int[] field1709; + @ObfuscatedName("as") + static int[] field1741; + @ObfuscatedName("ae") + static int[] field1743; + @ObfuscatedName("al") + static int[][] field1744; + @ObfuscatedName("ap") + static int[] field1719; + @ObfuscatedName("ad") + static int[][] field1746; + @ObfuscatedName("bb") + static int[] field1747; + @ObfuscatedName("bf") + static int[] field1748; + @ObfuscatedName("bp") + static int[] field1750; + @ObfuscatedName("bg") + static int[] field1695; + @ObfuscatedName("bc") + static int[] field1724; + @ObfuscatedName("bj") + static int[] field1754; + @ObfuscatedName("bl") + @Export("Model_transformTempX") + static int Model_transformTempX; + @ObfuscatedName("bn") + @Export("Model_transformTempY") + static int Model_transformTempY; + @ObfuscatedName("bo") + @Export("Model_transformTempZ") + static int Model_transformTempZ; + @ObfuscatedName("be") + static boolean field1756; + @ObfuscatedName("bw") + @Export("Model_sine") + static int[] Model_sine; + @ObfuscatedName("bm") + @Export("Model_cosine") + static int[] Model_cosine; + @ObfuscatedName("by") + static int[] field1761; + @ObfuscatedName("bq") + static int[] field1762; + @ObfuscatedName("z") + @Export("verticesCount") + int verticesCount; + @ObfuscatedName("q") + @Export("verticesX") + int[] verticesX; + @ObfuscatedName("k") + @Export("verticesY") + int[] verticesY; + @ObfuscatedName("c") + @Export("verticesZ") + int[] verticesZ; + @ObfuscatedName("u") + @Export("indicesCount") + int indicesCount; + @ObfuscatedName("t") + @Export("indices1") + int[] indices1; @ObfuscatedName("e") + @Export("indices2") + int[] indices2; + @ObfuscatedName("o") + @Export("indices3") + int[] indices3; + @ObfuscatedName("n") + @Export("faceColors1") + int[] faceColors1; + @ObfuscatedName("x") + @Export("faceColors2") + int[] faceColors2; + @ObfuscatedName("p") + @Export("faceColors3") + int[] faceColors3; + @ObfuscatedName("r") + @Export("faceRenderPriorities") + byte[] faceRenderPriorities; + @ObfuscatedName("y") + @Export("faceAlphas") + byte[] faceAlphas; + @ObfuscatedName("s") + byte[] field1712; + @ObfuscatedName("j") + @Export("faceTextures") + short[] faceTextures; + @ObfuscatedName("w") + byte field1751; + @ObfuscatedName("v") + int field1721; + @ObfuscatedName("d") + int[] field1716; + @ObfuscatedName("a") + int[] field1717; + @ObfuscatedName("g") + int[] field1718; + @ObfuscatedName("h") + @Export("vertexLabels") + int[][] vertexLabels; + @ObfuscatedName("i") + @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; @ObfuscatedName("ab") + @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ag") + @ObfuscatedName("ac") + @Export("boundsType") int boundsType; @ObfuscatedName("ao") + @Export("bottomY") int bottomY; - @ObfuscatedName("ae") + @ObfuscatedName("af") + @Export("xzRadius") int xzRadius; - @ObfuscatedName("an") + @ObfuscatedName("av") + @Export("diameter") int diameter; - @ObfuscatedName("am") - int radius; - @ObfuscatedName("ap") - int xMid; - @ObfuscatedName("au") - int yMid; - @ObfuscatedName("aa") - int zMid; @ObfuscatedName("ar") + @Export("radius") + int radius; + @ObfuscatedName("ay") + @Export("xMid") + int xMid; + @ObfuscatedName("ah") + @Export("yMid") + int yMid; + @ObfuscatedName("az") + @Export("zMid") + int zMid; + @ObfuscatedName("ak") + @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("at") + @ObfuscatedName("au") + @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("aq") + @ObfuscatedName("ai") + @Export("zMidOffset") int zMidOffset; static { @@ -143,36 +185,36 @@ public class Model extends Entity { Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7 Model_sharedSpotAnimationModel = new Model(); // L: 8 Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9 - field1747 = new boolean[4700]; // L: 45 - field1734 = new boolean[4700]; // L: 46 + field1734 = new boolean[4700]; // L: 45 + field1735 = new boolean[4700]; // L: 46 modelViewportXs = new int[4700]; // L: 47 modelViewportYs = new int[4700]; // L: 48 - field1760 = new int[4700]; // L: 49 - field1728 = new int[4700]; // L: 50 - field1739 = new int[4700]; // L: 51 - field1740 = new int[4700]; // L: 52 - field1742 = new int[1600]; // L: 54 - field1743 = new int[1600][512]; // L: 55 - field1744 = new int[12]; // L: 56 - field1745 = new int[12][2000]; // L: 57 - field1746 = new int[2000]; // L: 58 - field1701 = new int[2000]; // L: 59 - field1748 = new int[12]; // L: 60 - field1749 = new int[10]; // L: 61 - field1750 = new int[10]; // L: 62 - field1751 = new int[10]; // L: 63 - field1700 = true; // L: 67 + field1752 = new int[4700]; // L: 49 + field1739 = new int[4700]; // L: 50 + field1709 = new int[4700]; // L: 51 + field1741 = new int[4700]; // L: 52 + field1743 = new int[1600]; // L: 54 + field1744 = new int[1600][512]; // L: 55 + field1719 = new int[12]; // L: 56 + field1746 = new int[12][2000]; // L: 57 + field1747 = new int[2000]; // L: 58 + field1748 = new int[2000]; // L: 59 + field1750 = new int[12]; // L: 60 + field1695 = new int[10]; // L: 61 + field1724 = new int[10]; // L: 62 + field1754 = new int[10]; // L: 63 + field1756 = true; // L: 67 Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70 Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71 - field1756 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 - field1761 = Rasterizer3D.field1809; // L: 73 + field1761 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 + field1762 = Rasterizer3D.field1813; // L: 73 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1720 = 0; - this.field1714 = 0; + this.field1751 = 0; + this.field1721 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -180,13 +222,13 @@ public class Model extends Entity { } // L: 77 @ObfuscatedSignature( - descriptor = "([Ler;I)V" + descriptor = "([Leh;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; // L: 10 this.indicesCount = 0; // L: 14 - this.field1720 = 0; // L: 25 - this.field1714 = 0; // L: 26 + this.field1751 = 0; // L: 25 + this.field1721 = 0; // L: 26 this.isSingleTile = false; // L: 32 this.xMidOffset = -1; // L: 41 this.yMidOffset = -1; // L: 42 @@ -197,8 +239,8 @@ public class Model extends Entity { boolean var6 = false; // L: 83 this.verticesCount = 0; // L: 84 this.indicesCount = 0; // L: 85 - this.field1714 = 0; // L: 86 - this.field1720 = -1; // L: 87 + this.field1721 = 0; // L: 86 + this.field1751 = -1; // L: 87 int var7; Model var8; @@ -207,22 +249,22 @@ public class Model extends Entity { if (var8 != null) { // L: 90 this.verticesCount += var8.verticesCount; // L: 91 this.indicesCount += var8.indicesCount; // L: 92 - this.field1714 += var8.field1714; // L: 93 + this.field1721 += var8.field1721; // L: 93 if (var8.faceRenderPriorities != null) { // L: 94 var3 = true; } else { - if (this.field1720 == -1) { // L: 96 - this.field1720 = var8.field1720; + if (this.field1751 == -1) { // L: 96 + this.field1751 = var8.field1751; } - if (this.field1720 != var8.field1720) { // L: 97 + if (this.field1751 != var8.field1751) { // L: 97 var3 = true; } } var4 |= var8.faceAlphas != null; // L: 99 var5 |= var8.faceTextures != null; // L: 100 - var6 |= var8.field1757 != null; // L: 101 + var6 |= var8.field1712 != null; // L: 101 } } @@ -248,18 +290,18 @@ public class Model extends Entity { } if (var6) { // L: 116 - this.field1757 = new byte[this.indicesCount]; + this.field1712 = new byte[this.indicesCount]; } - if (this.field1714 > 0) { // L: 117 - this.field1715 = new int[this.field1714]; // L: 118 - this.field1716 = new int[this.field1714]; // L: 119 - this.field1717 = new int[this.field1714]; // L: 120 + if (this.field1721 > 0) { // L: 117 + this.field1716 = new int[this.field1721]; // L: 118 + this.field1717 = new int[this.field1721]; // L: 119 + this.field1718 = new int[this.field1721]; // L: 120 } this.verticesCount = 0; // L: 122 this.indicesCount = 0; // L: 123 - this.field1714 = 0; // L: 124 + this.field1721 = 0; // L: 124 for (var7 = 0; var7 < var2; ++var7) { // L: 125 var8 = var1[var7]; // L: 126 @@ -276,7 +318,7 @@ public class Model extends Entity { if (var8.faceRenderPriorities != null) { // L: 136 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field1720; // L: 137 + this.faceRenderPriorities[this.indicesCount] = var8.field1751; // L: 137 } } @@ -293,21 +335,21 @@ public class Model extends Entity { } if (var6) { // L: 146 - if (var8.field1757 != null && var8.field1757[var9] != -1) { // L: 147 - this.field1757[this.indicesCount] = (byte)(this.field1714 + var8.field1757[var9]); + if (var8.field1712 != null && var8.field1712[var9] != -1) { // L: 147 + this.field1712[this.indicesCount] = (byte)(this.field1721 + var8.field1712[var9]); } else { - this.field1757[this.indicesCount] = -1; // L: 148 + this.field1712[this.indicesCount] = -1; // L: 148 } } ++this.indicesCount; // L: 150 } - for (var9 = 0; var9 < var8.field1714; ++var9) { // L: 152 - this.field1715[this.field1714] = this.verticesCount + var8.field1715[var9]; // L: 153 - this.field1716[this.field1714] = this.verticesCount + var8.field1716[var9]; // L: 154 - this.field1717[this.field1714] = this.verticesCount + var8.field1717[var9]; // L: 155 - ++this.field1714; // L: 156 + for (var9 = 0; var9 < var8.field1721; ++var9) { // L: 152 + this.field1716[this.field1721] = this.verticesCount + var8.field1716[var9]; // L: 153 + this.field1717[this.field1721] = this.verticesCount + var8.field1717[var9]; // L: 154 + this.field1718[this.field1721] = this.verticesCount + var8.field1718[var9]; // L: 155 + ++this.field1721; // L: 156 } for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158 @@ -321,10 +363,11 @@ public class Model extends Entity { } // L: 166 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Ler;" + descriptor = "([[IIIIZI)Leh;" ) + @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBoundsCylinder(); // L: 169 int var7 = var2 - this.xzRadius; // L: 170 @@ -344,7 +387,7 @@ public class Model extends Entity { var11 = new Model(); // L: 182 var11.verticesCount = this.verticesCount; // L: 183 var11.indicesCount = this.indicesCount; // L: 184 - var11.field1714 = this.field1714; // L: 185 + var11.field1721 = this.field1721; // L: 185 var11.verticesX = this.verticesX; // L: 186 var11.verticesZ = this.verticesZ; // L: 187 var11.indices1 = this.indices1; // L: 188 @@ -355,12 +398,12 @@ public class Model extends Entity { var11.faceColors3 = this.faceColors3; // L: 193 var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194 var11.faceAlphas = this.faceAlphas; // L: 195 - var11.field1757 = this.field1757; // L: 196 + var11.field1712 = this.field1712; // L: 196 var11.faceTextures = this.faceTextures; // L: 197 - var11.field1720 = this.field1720; // L: 198 - var11.field1715 = this.field1715; // L: 199 - var11.field1716 = this.field1716; // L: 200 - var11.field1717 = this.field1717; // L: 201 + var11.field1751 = this.field1751; // L: 198 + var11.field1716 = this.field1716; // L: 199 + var11.field1717 = this.field1717; // L: 200 + var11.field1718 = this.field1718; // L: 201 var11.vertexLabels = this.vertexLabels; // L: 202 var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203 var11.isSingleTile = this.isSingleTile; // L: 204 @@ -418,10 +461,11 @@ public class Model extends Entity { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Z)Ler;" + descriptor = "(Z)Leh;" ) + @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 246 Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; @@ -430,10 +474,11 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Z)Ler;" + descriptor = "(Z)Leh;" ) + @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 251 Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; @@ -442,14 +487,15 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ZLer;[B)Ler;" + descriptor = "(ZLeh;[B)Leh;" ) + @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 256 var2.indicesCount = this.indicesCount; // L: 257 - var2.field1714 = this.field1714; // L: 258 + var2.field1721 = this.field1721; // L: 258 if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 259 var2.verticesX = new int[this.verticesCount + 100]; // L: 260 var2.verticesY = new int[this.verticesCount + 100]; // L: 261 @@ -485,12 +531,12 @@ public class Model extends Entity { var2.faceColors2 = this.faceColors2; // L: 283 var2.faceColors3 = this.faceColors3; // L: 284 var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285 - var2.field1757 = this.field1757; // L: 286 + var2.field1712 = this.field1712; // L: 286 var2.faceTextures = this.faceTextures; // L: 287 - var2.field1720 = this.field1720; // L: 288 - var2.field1715 = this.field1715; // L: 289 - var2.field1716 = this.field1716; // L: 290 - var2.field1717 = this.field1717; // L: 291 + var2.field1751 = this.field1751; // L: 288 + var2.field1716 = this.field1716; // L: 289 + var2.field1717 = this.field1717; // L: 290 + var2.field1718 = this.field1718; // L: 291 var2.vertexLabels = this.vertexLabels; // L: 292 var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293 var2.isSingleTile = this.isSingleTile; // L: 294 @@ -498,7 +544,8 @@ public class Model extends Entity { return var2; // L: 296 } - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 300 int var2 = 0; // L: 301 @@ -511,9 +558,9 @@ public class Model extends Entity { int var9 = Model_sine[var1]; // L: 308 for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309 - int var11 = Rasterizer3D.method3129(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 + int var11 = Rasterizer3D.method3157(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 int var12 = this.verticesY[var10]; // L: 311 - int var13 = Rasterizer3D.method3130(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 + int var13 = Rasterizer3D.method3179(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 if (var11 < var2) { // L: 313 var2 = var11; } @@ -561,7 +608,8 @@ public class Model extends Entity { } } // L: 334 - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { // L: 337 this.boundsType = 1; // L: 338 @@ -593,8 +641,8 @@ public class Model extends Entity { } } // L: 354 - @ObfuscatedName("x") - void method2992() { + @ObfuscatedName("k") + void method3069() { if (this.boundsType != 2) { // L: 357 this.boundsType = 2; // L: 358 this.xzRadius = 0; // L: 359 @@ -615,22 +663,24 @@ public class Model extends Entity { } } // L: 370 - @ObfuscatedName("w") - public int method3016() { + @ObfuscatedName("c") + public int method3013() { this.calculateBoundsCylinder(); // L: 373 return this.xzRadius; // L: 374 } - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("resetBounds") void resetBounds() { this.boundsType = 0; // L: 378 this.xMidOffset = -1; // L: 379 } // L: 380 - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lef;I)V" + descriptor = "(Lex;I)V" ) + @Export("animate") public void animate(Frames var1, int var2) { if (this.vertexLabels != null) { // L: 383 if (var2 != -1) { // L: 384 @@ -650,10 +700,11 @@ public class Model extends Entity { } } // L: 395 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lef;ILef;I[I)V" + descriptor = "(Lex;ILex;I[I)V" ) + @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { if (var2 != -1) { // L: 398 if (var5 != null && var4 != -1) { // L: 399 @@ -701,7 +752,8 @@ public class Model extends Entity { } } // L: 401 427 - @ObfuscatedName("h") + @ObfuscatedName("n") + @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 430 int var7; @@ -868,7 +920,8 @@ public class Model extends Entity { } } // L: 459 474 516 537 555 557 - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560 int var2 = this.verticesX[var1]; // L: 561 @@ -879,7 +932,8 @@ public class Model extends Entity { this.resetBounds(); // L: 565 } // L: 566 - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 this.verticesX[var1] = -this.verticesX[var1]; // L: 570 @@ -889,7 +943,8 @@ public class Model extends Entity { this.resetBounds(); // L: 573 } // L: 574 - @ObfuscatedName("c") + @ObfuscatedName("r") + @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 int var2 = this.verticesZ[var1]; // L: 578 @@ -900,7 +955,8 @@ public class Model extends Entity { this.resetBounds(); // L: 582 } // L: 583 - @ObfuscatedName("j") + @ObfuscatedName("y") + @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 586 int var3 = Model_cosine[var1]; // L: 587 @@ -914,7 +970,8 @@ public class Model extends Entity { this.resetBounds(); // L: 593 } // L: 594 - @ObfuscatedName("r") + @ObfuscatedName("s") + @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 int[] var10000 = this.verticesX; // L: 598 @@ -928,7 +985,8 @@ public class Model extends Entity { this.resetBounds(); // L: 602 } // L: 603 - @ObfuscatedName("u") + @ObfuscatedName("j") + @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 607 @@ -939,11 +997,11 @@ public class Model extends Entity { this.resetBounds(); // L: 611 } // L: 612 - @ObfuscatedName("p") - public final void method3003(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1742[0] = -1; // L: 615 + @ObfuscatedName("d") + public final void method3064(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1743[0] = -1; // L: 615 if (this.boundsType != 2 && this.boundsType != 1) { // L: 616 - this.method2992(); + this.method3069(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617 @@ -986,13 +1044,13 @@ public class Model extends Entity { var22 += var7; // L: 649 var23 = var21 * var17 - var22 * var16 >> 16; // L: 650 var22 = var21 * var16 + var22 * var17 >> 16; // L: 651 - field1760[var19] = var22 - var18; // L: 653 + field1752[var19] = var22 - var18; // L: 653 modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 654 modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 655 - if (this.field1714 > 0) { // L: 656 - field1728[var19] = var20; // L: 657 - field1739[var19] = var23; // L: 658 - field1740[var19] = var22; // L: 659 + if (this.field1721 > 0) { // L: 656 + field1739[var19] = var20; // L: 657 + field1709[var19] = var23; // L: 658 + field1741[var19] = var22; // L: 659 } } @@ -1003,11 +1061,11 @@ public class Model extends Entity { } // L: 666 - @ObfuscatedName("b") - public final void method3005(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1742[0] = -1; // L: 669 + @ObfuscatedName("a") + public final void method3025(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field1743[0] = -1; // L: 669 if (this.boundsType != 2 && this.boundsType != 1) { // L: 670 - this.method2992(); + this.method3069(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671 @@ -1050,13 +1108,13 @@ public class Model extends Entity { var23 += var7; // L: 703 var24 = var22 * var18 - var23 * var17 >> 16; // L: 704 var23 = var22 * var17 + var23 * var18 >> 16; // L: 705 - field1760[var20] = var23 - var19; // L: 707 + field1752[var20] = var23 - var19; // L: 707 modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 708 modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 709 - if (this.field1714 > 0) { // L: 710 - field1728[var20] = var21; // L: 711 - field1739[var20] = var24; // L: 712 - field1740[var20] = var23; // L: 713 + if (this.field1721 > 0) { // L: 710 + field1739[var20] = var21; // L: 711 + field1709[var20] = var24; // L: 712 + field1741[var20] = var23; // L: 713 } } @@ -1067,15 +1125,16 @@ public class Model extends Entity { } // L: 720 - @ObfuscatedName("l") + @ObfuscatedName("g") + @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 844 + if (this.diameter < 1600) { // L: 840 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 845 - field1742[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 841 + field1743[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 846 + var6 = var3 ? 20 : 5; // L: 842 int var7; int var8; @@ -1087,424 +1146,455 @@ public class Model extends Entity { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 847 - if (this.faceColors3[var7] != -2) { // L: 848 - var8 = this.indices1[var7]; // L: 849 - var9 = this.indices2[var7]; // L: 850 - var10 = this.indices3[var7]; // L: 851 - var11 = modelViewportXs[var8]; // L: 852 - var12 = modelViewportXs[var9]; // L: 853 - var28 = modelViewportXs[var10]; // L: 854 - int var29; - if (var1 && (var11 == -5000 || var12 == -5000 || var28 == -5000)) { // L: 855 - var29 = field1728[var8]; // L: 856 - var15 = field1728[var9]; // L: 857 - var16 = field1728[var10]; // L: 858 - int var30 = field1739[var8]; // L: 859 - var18 = field1739[var9]; // L: 860 - int var19 = field1739[var10]; // L: 861 - int var20 = field1740[var8]; // L: 862 - int var21 = field1740[var9]; // L: 863 - int var22 = field1740[var10]; // L: 864 - var29 -= var15; // L: 865 - var16 -= var15; // L: 866 - var30 -= var18; // L: 867 - var19 -= var18; // L: 868 - var20 -= var21; // L: 869 - var22 -= var21; // L: 870 - int var23 = var30 * var22 - var20 * var19; // L: 871 - int var24 = var20 * var16 - var29 * var22; // L: 872 - int var25 = var29 * var19 - var30 * var16; // L: 873 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 874 - field1734[var7] = true; // L: 875 - int var26 = (field1760[var8] + field1760[var9] + field1760[var10]) / 3 + this.radius; // L: 876 - field1743[var26][field1742[var26]++] = var7; // L: 877 + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 843 + if (this.faceColors3[var7] != -2) { // L: 844 + var8 = this.indices1[var7]; // L: 845 + var9 = this.indices2[var7]; // L: 846 + var10 = this.indices3[var7]; // L: 847 + var11 = modelViewportXs[var8]; // L: 848 + var12 = modelViewportXs[var9]; // L: 849 + var28 = modelViewportXs[var10]; // L: 850 + int var30; + int var32; + if (var1 && (var11 == -5000 || var12 == -5000 || var28 == -5000)) { // L: 851 + var32 = field1739[var8]; // L: 852 + var15 = field1739[var9]; // L: 853 + var16 = field1739[var10]; // L: 854 + var30 = field1709[var8]; // L: 855 + var18 = field1709[var9]; // L: 856 + int var19 = field1709[var10]; // L: 857 + int var20 = field1741[var8]; // L: 858 + int var21 = field1741[var9]; // L: 859 + int var22 = field1741[var10]; // L: 860 + var32 -= var15; // L: 861 + var16 -= var15; // L: 862 + var30 -= var18; // L: 863 + var19 -= var18; // L: 864 + var20 -= var21; // L: 865 + var22 -= var21; // L: 866 + int var23 = var30 * var22 - var20 * var19; // L: 867 + int var24 = var20 * var16 - var32 * var22; // L: 868 + int var25 = var32 * var19 - var30 * var16; // L: 869 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 870 + field1735[var7] = true; // L: 871 + int var26 = (field1752[var8] + field1752[var9] + field1752[var10]) / 3 + this.radius; // L: 872 + field1744[var26][field1743[var26]++] = var7; // L: 873 } } else { - if (var2 && SoundSystem.method2592(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 881 - DynamicObject.addEntityUnderMouse(var4); // L: 882 - var2 = false; // L: 883 - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 885 - field1734[var7] = false; // L: 886 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 887 - field1747[var7] = false; // L: 888 + if (var2) { // L: 877 + var15 = modelViewportYs[var8]; // L: 879 + var16 = modelViewportYs[var9]; // L: 880 + var30 = modelViewportYs[var10]; // L: 881 + var18 = var6 + ViewportMouse.ViewportMouse_y; // L: 883 + boolean var29; + if (var18 < var15 && var18 < var16 && var18 < var30) { // L: 884 + var29 = false; // L: 885 } else { - field1747[var7] = true; + var18 = ViewportMouse.ViewportMouse_y - var6; // L: 888 + if (var18 > var15 && var18 > var16 && var18 > var30) { // L: 889 + var29 = false; // L: 890 + } else { + var18 = var6 + ViewportMouse.ViewportMouse_x; // L: 893 + if (var18 < var11 && var18 < var12 && var18 < var28) { // L: 894 + var29 = false; // L: 895 + } else { + var18 = ViewportMouse.ViewportMouse_x - var6; // L: 898 + if (var18 > var11 && var18 > var12 && var18 > var28) { // L: 899 + var29 = false; // L: 900 + } else { + var29 = true; // L: 903 + } + } + } } - var29 = (field1760[var8] + field1760[var9] + field1760[var10]) / 3 + this.radius; // L: 889 - field1743[var29][field1742[var29]++] = var7; // L: 890 + if (var29) { // L: 905 + Message.addEntityUnderMouse(var4); // L: 906 + var2 = false; // L: 907 + } + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 910 + field1735[var7] = false; // L: 911 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 912 + field1734[var7] = false; // L: 913 + } else { + field1734[var7] = true; + } + + var32 = (field1752[var8] + field1752[var9] + field1752[var10]) / 3 + this.radius; // L: 914 + field1744[var32][field1743[var32]++] = var7; // L: 915 } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 894 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 895 - var8 = field1742[var7]; // L: 896 - if (var8 > 0) { // L: 897 - var27 = field1743[var7]; // L: 898 + if (this.faceRenderPriorities == null) { // L: 919 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 920 + var8 = field1743[var7]; // L: 921 + if (var8 > 0) { // L: 922 + var27 = field1744[var7]; // L: 923 - for (var10 = 0; var10 < var8; ++var10) { // L: 899 + for (var10 = 0; var10 < var8; ++var10) { // L: 924 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 904 - field1744[var7] = 0; // L: 905 - field1748[var7] = 0; // L: 906 + for (var7 = 0; var7 < 12; ++var7) { // L: 929 + field1719[var7] = 0; // L: 930 + field1750[var7] = 0; // L: 931 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 908 - var8 = field1742[var7]; // L: 909 - if (var8 > 0) { // L: 910 - var27 = field1743[var7]; // L: 911 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 933 + var8 = field1743[var7]; // L: 934 + if (var8 > 0) { // L: 935 + var27 = field1744[var7]; // L: 936 - for (var10 = 0; var10 < var8; ++var10) { // L: 912 - var11 = var27[var10]; // L: 913 - byte var31 = this.faceRenderPriorities[var11]; // L: 914 - var28 = field1744[var31]++; // L: 915 - field1745[var31][var28] = var11; // L: 916 - if (var31 < 10) { // L: 917 - int[] var10000 = field1748; + for (var10 = 0; var10 < var8; ++var10) { // L: 937 + var11 = var27[var10]; // L: 938 + byte var31 = this.faceRenderPriorities[var11]; // L: 939 + var28 = field1719[var31]++; // L: 940 + field1746[var31][var28] = var11; // L: 941 + if (var31 < 10) { // L: 942 + int[] var10000 = field1750; var10000[var31] += var7; - } else if (var31 == 10) { // L: 918 - field1746[var28] = var7; + } else if (var31 == 10) { // L: 943 + field1747[var28] = var7; } else { - field1701[var28] = var7; // L: 919 + field1748[var28] = var7; // L: 944 } } } } - var7 = 0; // L: 923 - if (field1744[1] > 0 || field1744[2] > 0) { // L: 924 - var7 = (field1748[1] + field1748[2]) / (field1744[1] + field1744[2]); + var7 = 0; // L: 948 + if (field1719[1] > 0 || field1719[2] > 0) { // L: 949 + var7 = (field1750[1] + field1750[2]) / (field1719[1] + field1719[2]); } - var8 = 0; // L: 925 - if (field1744[3] > 0 || field1744[4] > 0) { // L: 926 - var8 = (field1748[3] + field1748[4]) / (field1744[3] + field1744[4]); + var8 = 0; // L: 950 + if (field1719[3] > 0 || field1719[4] > 0) { // L: 951 + var8 = (field1750[3] + field1750[4]) / (field1719[3] + field1719[4]); } - var9 = 0; // L: 927 - if (field1744[6] > 0 || field1744[8] > 0) { // L: 928 - var9 = (field1748[8] + field1748[6]) / (field1744[8] + field1744[6]); + var9 = 0; // L: 952 + if (field1719[6] > 0 || field1719[8] > 0) { // L: 953 + var9 = (field1750[8] + field1750[6]) / (field1719[8] + field1719[6]); } - var11 = 0; // L: 930 - var12 = field1744[10]; // L: 931 - int[] var13 = field1745[10]; // L: 932 - int[] var14 = field1746; // L: 933 - if (var11 == var12) { // L: 934 - var11 = 0; // L: 935 - var12 = field1744[11]; // L: 936 - var13 = field1745[11]; // L: 937 - var14 = field1701; // L: 938 + var11 = 0; // L: 955 + var12 = field1719[10]; // L: 956 + int[] var13 = field1746[10]; // L: 957 + int[] var14 = field1747; // L: 958 + if (var11 == var12) { // L: 959 + var11 = 0; // L: 960 + var12 = field1719[11]; // L: 961 + var13 = field1746[11]; // L: 962 + var14 = field1748; // L: 963 } - if (var11 < var12) { // L: 940 + if (var11 < var12) { // L: 965 var10 = var14[var11]; } else { - var10 = -1000; // L: 941 + var10 = -1000; // L: 966 } - for (var15 = 0; var15 < 10; ++var15) { // L: 942 - while (var15 == 0 && var10 > var7) { // L: 943 - this.drawFace(var13[var11++]); // L: 944 - if (var11 == var12 && var13 != field1745[11]) { // L: 945 - var11 = 0; // L: 946 - var12 = field1744[11]; // L: 947 - var13 = field1745[11]; // L: 948 - var14 = field1701; // L: 949 + for (var15 = 0; var15 < 10; ++var15) { // L: 967 + while (var15 == 0 && var10 > var7) { // L: 968 + this.drawFace(var13[var11++]); // L: 969 + if (var11 == var12 && var13 != field1746[11]) { // L: 970 + var11 = 0; // L: 971 + var12 = field1719[11]; // L: 972 + var13 = field1746[11]; // L: 973 + var14 = field1748; // L: 974 } - if (var11 < var12) { // L: 951 + if (var11 < var12) { // L: 976 var10 = var14[var11]; } else { - var10 = -1000; // L: 952 + var10 = -1000; // L: 977 } } - while (var15 == 3 && var10 > var8) { // L: 954 - this.drawFace(var13[var11++]); // L: 955 - if (var11 == var12 && var13 != field1745[11]) { // L: 956 - var11 = 0; // L: 957 - var12 = field1744[11]; // L: 958 - var13 = field1745[11]; // L: 959 - var14 = field1701; // L: 960 + while (var15 == 3 && var10 > var8) { // L: 979 + this.drawFace(var13[var11++]); // L: 980 + if (var11 == var12 && var13 != field1746[11]) { // L: 981 + var11 = 0; // L: 982 + var12 = field1719[11]; // L: 983 + var13 = field1746[11]; // L: 984 + var14 = field1748; // L: 985 } - if (var11 < var12) { // L: 962 + if (var11 < var12) { // L: 987 var10 = var14[var11]; } else { - var10 = -1000; // L: 963 + var10 = -1000; // L: 988 } } - while (var15 == 5 && var10 > var9) { // L: 965 - this.drawFace(var13[var11++]); // L: 966 - if (var11 == var12 && var13 != field1745[11]) { // L: 967 - var11 = 0; // L: 968 - var12 = field1744[11]; // L: 969 - var13 = field1745[11]; // L: 970 - var14 = field1701; // L: 971 + while (var15 == 5 && var10 > var9) { // L: 990 + this.drawFace(var13[var11++]); // L: 991 + if (var11 == var12 && var13 != field1746[11]) { // L: 992 + var11 = 0; // L: 993 + var12 = field1719[11]; // L: 994 + var13 = field1746[11]; // L: 995 + var14 = field1748; // L: 996 } - if (var11 < var12) { // L: 973 + if (var11 < var12) { // L: 998 var10 = var14[var11]; } else { - var10 = -1000; // L: 974 + var10 = -1000; // L: 999 } } - var16 = field1744[var15]; // L: 976 - int[] var17 = field1745[var15]; // L: 977 + var16 = field1719[var15]; // L: 1001 + int[] var17 = field1746[var15]; // L: 1002 - for (var18 = 0; var18 < var16; ++var18) { // L: 978 - this.drawFace(var17[var18]); // L: 979 + for (var18 = 0; var18 < var16; ++var18) { // L: 1003 + this.drawFace(var17[var18]); // L: 1004 } } - while (var10 != -1000) { // L: 982 - this.drawFace(var13[var11++]); // L: 983 - if (var11 == var12 && var13 != field1745[11]) { // L: 984 - var11 = 0; // L: 985 - var13 = field1745[11]; // L: 986 - var12 = field1744[11]; // L: 987 - var14 = field1701; // L: 988 + while (var10 != -1000) { // L: 1007 + this.drawFace(var13[var11++]); // L: 1008 + if (var11 == var12 && var13 != field1746[11]) { // L: 1009 + var11 = 0; // L: 1010 + var13 = field1746[11]; // L: 1011 + var12 = field1719[11]; // L: 1012 + var14 = field1748; // L: 1013 } - if (var11 < var12) { // L: 990 + if (var11 < var12) { // L: 1015 var10 = var14[var11]; } else { - var10 = -1000; // L: 991 + var10 = -1000; // L: 1016 } } } } - } // L: 902 993 + } // L: 927 1018 - @ObfuscatedName("e") + @ObfuscatedName("h") + @Export("drawFace") final void drawFace(int var1) { - if (field1734[var1]) { // L: 996 - this.method3051(var1); // L: 997 + if (field1735[var1]) { // L: 1021 + this.method3029(var1); // L: 1022 } else { - int var2 = this.indices1[var1]; // L: 1000 - int var3 = this.indices2[var1]; // L: 1001 - int var4 = this.indices3[var1]; // L: 1002 - Rasterizer3D.field1791 = field1747[var1]; // L: 1003 - if (this.faceAlphas == null) { // L: 1004 + int var2 = this.indices1[var1]; // L: 1025 + int var3 = this.indices2[var1]; // L: 1026 + int var4 = this.indices3[var1]; // L: 1027 + Rasterizer3D.field1800 = field1734[var1]; // L: 1028 + if (this.faceAlphas == null) { // L: 1029 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1005 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1030 } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1006 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1031 int var5; int var6; int var7; - if (this.field1757 != null && this.field1757[var1] != -1) { // L: 1014 - int var8 = this.field1757[var1] & 255; // L: 1015 - var5 = this.field1715[var8]; // L: 1016 - var6 = this.field1716[var8]; // L: 1017 - var7 = this.field1717[var8]; // L: 1018 + if (this.field1712 != null && this.field1712[var1] != -1) { // L: 1039 + int var8 = this.field1712[var1] & 255; // L: 1040 + var5 = this.field1716[var8]; // L: 1041 + var6 = this.field1717[var8]; // L: 1042 + var7 = this.field1718[var8]; // L: 1043 } else { - var5 = var2; // L: 1021 - var6 = var3; // L: 1022 - var7 = var4; // L: 1023 + var5 = var2; // L: 1046 + var6 = var3; // L: 1047 + var7 = var4; // L: 1048 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3144(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var5], field1728[var6], field1728[var7], field1739[var5], field1739[var6], field1739[var7], field1740[var5], field1740[var6], field1740[var7], this.faceTextures[var1]); // L: 1025 + Rasterizer3D.method3156(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1739[var5], field1739[var6], field1739[var7], field1709[var5], field1709[var6], field1709[var7], field1741[var5], field1741[var6], field1741[var7], this.faceTextures[var1]); // L: 1050 } else { - Rasterizer3D.method3144(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1728[var5], field1728[var6], field1728[var7], field1739[var5], field1739[var6], field1739[var7], field1740[var5], field1740[var6], field1740[var7], this.faceTextures[var1]); // L: 1026 + Rasterizer3D.method3156(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1739[var5], field1739[var6], field1739[var7], field1709[var5], field1709[var6], field1709[var7], field1741[var5], field1741[var6], field1741[var7], this.faceTextures[var1]); // L: 1051 } - } else if (this.faceColors3[var1] == -1) { // L: 1007 - Rasterizer3D.method3172(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1756[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1032 + Rasterizer3D.method3149(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1761[this.faceColors1[var1]]); } else { - Rasterizer3D.method3117(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1008 + Rasterizer3D.method3155(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1033 } } - } // L: 998 1028 + } // L: 1023 1053 @ObfuscatedName("ab") - final void method3051(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1031 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1032 - int var4 = 0; // L: 1033 - int var5 = this.indices1[var1]; // L: 1034 - int var6 = this.indices2[var1]; // L: 1035 - int var7 = this.indices3[var1]; // L: 1036 - int var8 = field1740[var5]; // L: 1037 - int var9 = field1740[var6]; // L: 1038 - int var10 = field1740[var7]; // L: 1039 - if (this.faceAlphas == null) { // L: 1040 + final void method3029(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1056 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1057 + int var4 = 0; // L: 1058 + int var5 = this.indices1[var1]; // L: 1059 + int var6 = this.indices2[var1]; // L: 1060 + int var7 = this.indices3[var1]; // L: 1061 + int var8 = field1741[var5]; // L: 1062 + int var9 = field1741[var6]; // L: 1063 + int var10 = field1741[var7]; // L: 1064 + if (this.faceAlphas == null) { // L: 1065 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1041 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1066 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1042 - field1749[var4] = modelViewportXs[var5]; // L: 1043 - field1750[var4] = modelViewportYs[var5]; // L: 1044 - field1751[var4++] = this.faceColors1[var1]; // L: 1045 + if (var8 >= 50) { // L: 1067 + field1695[var4] = modelViewportXs[var5]; // L: 1068 + field1724[var4] = modelViewportYs[var5]; // L: 1069 + field1754[var4++] = this.faceColors1[var1]; // L: 1070 } else { - var11 = field1728[var5]; // L: 1048 - var12 = field1739[var5]; // L: 1049 - var13 = this.faceColors1[var1]; // L: 1050 - if (var10 >= 50) { // L: 1051 - var14 = field1761[var10 - var8] * (50 - var8); // L: 1052 - field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var7] - var11) * var14 >> 16)) / 50; // L: 1053 - field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var7] - var12) * var14 >> 16)) / 50; // L: 1054 - field1751[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1055 + var11 = field1739[var5]; // L: 1073 + var12 = field1709[var5]; // L: 1074 + var13 = this.faceColors1[var1]; // L: 1075 + if (var10 >= 50) { // L: 1076 + var14 = field1762[var10 - var8] * (50 - var8); // L: 1077 + field1695[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1739[var7] - var11) * var14 >> 16)) / 50; // L: 1078 + field1724[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1709[var7] - var12) * var14 >> 16)) / 50; // L: 1079 + field1754[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1080 } - if (var9 >= 50) { // L: 1057 - var14 = field1761[var9 - var8] * (50 - var8); // L: 1058 - field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var6] - var11) * var14 >> 16)) / 50; // L: 1059 - field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var6] - var12) * var14 >> 16)) / 50; // L: 1060 - field1751[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1061 + if (var9 >= 50) { // L: 1082 + var14 = field1762[var9 - var8] * (50 - var8); // L: 1083 + field1695[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1739[var6] - var11) * var14 >> 16)) / 50; // L: 1084 + field1724[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1709[var6] - var12) * var14 >> 16)) / 50; // L: 1085 + field1754[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1086 } } - if (var9 >= 50) { // L: 1064 - field1749[var4] = modelViewportXs[var6]; // L: 1065 - field1750[var4] = modelViewportYs[var6]; // L: 1066 - field1751[var4++] = this.faceColors2[var1]; // L: 1067 + if (var9 >= 50) { // L: 1089 + field1695[var4] = modelViewportXs[var6]; // L: 1090 + field1724[var4] = modelViewportYs[var6]; // L: 1091 + field1754[var4++] = this.faceColors2[var1]; // L: 1092 } else { - var11 = field1728[var6]; // L: 1070 - var12 = field1739[var6]; // L: 1071 - var13 = this.faceColors2[var1]; // L: 1072 - if (var8 >= 50) { // L: 1073 - var14 = field1761[var8 - var9] * (50 - var9); // L: 1074 - field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var5] - var11) * var14 >> 16)) / 50; // L: 1075 - field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var5] - var12) * var14 >> 16)) / 50; // L: 1076 - field1751[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1077 + var11 = field1739[var6]; // L: 1095 + var12 = field1709[var6]; // L: 1096 + var13 = this.faceColors2[var1]; // L: 1097 + if (var8 >= 50) { // L: 1098 + var14 = field1762[var8 - var9] * (50 - var9); // L: 1099 + field1695[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1739[var5] - var11) * var14 >> 16)) / 50; // L: 1100 + field1724[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1709[var5] - var12) * var14 >> 16)) / 50; // L: 1101 + field1754[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1102 } - if (var10 >= 50) { // L: 1079 - var14 = field1761[var10 - var9] * (50 - var9); // L: 1080 - field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var7] - var11) * var14 >> 16)) / 50; // L: 1081 - field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var7] - var12) * var14 >> 16)) / 50; // L: 1082 - field1751[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1083 + if (var10 >= 50) { // L: 1104 + var14 = field1762[var10 - var9] * (50 - var9); // L: 1105 + field1695[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1739[var7] - var11) * var14 >> 16)) / 50; // L: 1106 + field1724[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1709[var7] - var12) * var14 >> 16)) / 50; // L: 1107 + field1754[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1108 } } - if (var10 >= 50) { // L: 1086 - field1749[var4] = modelViewportXs[var7]; // L: 1087 - field1750[var4] = modelViewportYs[var7]; // L: 1088 - field1751[var4++] = this.faceColors3[var1]; // L: 1089 + if (var10 >= 50) { // L: 1111 + field1695[var4] = modelViewportXs[var7]; // L: 1112 + field1724[var4] = modelViewportYs[var7]; // L: 1113 + field1754[var4++] = this.faceColors3[var1]; // L: 1114 } else { - var11 = field1728[var7]; // L: 1092 - var12 = field1739[var7]; // L: 1093 - var13 = this.faceColors3[var1]; // L: 1094 - if (var9 >= 50) { // L: 1095 - var14 = field1761[var9 - var10] * (50 - var10); // L: 1096 - field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var6] - var11) * var14 >> 16)) / 50; // L: 1097 - field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var6] - var12) * var14 >> 16)) / 50; // L: 1098 - field1751[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1099 + var11 = field1739[var7]; // L: 1117 + var12 = field1709[var7]; // L: 1118 + var13 = this.faceColors3[var1]; // L: 1119 + if (var9 >= 50) { // L: 1120 + var14 = field1762[var9 - var10] * (50 - var10); // L: 1121 + field1695[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1739[var6] - var11) * var14 >> 16)) / 50; // L: 1122 + field1724[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1709[var6] - var12) * var14 >> 16)) / 50; // L: 1123 + field1754[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1124 } - if (var8 >= 50) { // L: 1101 - var14 = field1761[var8 - var10] * (50 - var10); // L: 1102 - field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var5] - var11) * var14 >> 16)) / 50; // L: 1103 - field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var5] - var12) * var14 >> 16)) / 50; // L: 1104 - field1751[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1105 + if (var8 >= 50) { // L: 1126 + var14 = field1762[var8 - var10] * (50 - var10); // L: 1127 + field1695[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1739[var5] - var11) * var14 >> 16)) / 50; // L: 1128 + field1724[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1709[var5] - var12) * var14 >> 16)) / 50; // L: 1129 + field1754[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1130 } } - var11 = field1749[0]; // L: 1108 - var12 = field1749[1]; // L: 1109 - var13 = field1749[2]; // L: 1110 - var14 = field1750[0]; // L: 1111 - int var15 = field1750[1]; // L: 1112 - int var16 = field1750[2]; // L: 1113 - Rasterizer3D.field1791 = false; // L: 1114 + var11 = field1695[0]; // L: 1133 + var12 = field1695[1]; // L: 1134 + var13 = field1695[2]; // L: 1135 + var14 = field1724[0]; // L: 1136 + int var15 = field1724[1]; // L: 1137 + int var16 = field1724[2]; // L: 1138 + Rasterizer3D.field1800 = false; // L: 1139 int var17; int var18; int var19; int var20; - if (var4 == 3) { // L: 1115 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1116 - Rasterizer3D.field1791 = true; - } - - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1117 - if (this.field1757 != null && this.field1757[var1] != -1) { // L: 1125 - var20 = this.field1757[var1] & 255; // L: 1126 - var17 = this.field1715[var20]; // L: 1127 - var18 = this.field1716[var20]; // L: 1128 - var19 = this.field1717[var20]; // L: 1129 - } else { - var17 = var5; // L: 1132 - var18 = var6; // L: 1133 - var19 = var7; // L: 1134 - } - - if (this.faceColors3[var1] == -1) { // L: 1136 - Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], this.faceTextures[var1]); - } else { - Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], this.faceTextures[var1]); // L: 1137 - } - } else if (this.faceColors3[var1] == -1) { // L: 1118 - Rasterizer3D.method3172(var14, var15, var16, var11, var12, var13, field1756[this.faceColors1[var1]]); - } else { - Rasterizer3D.method3117(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2]); // L: 1119 - } - } - - if (var4 == 4) { // L: 1140 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1749[3] < 0 || field1749[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1141 - Rasterizer3D.field1791 = true; + if (var4 == 3) { // L: 1140 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1141 + Rasterizer3D.field1800 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1142 - if (this.field1757 != null && this.field1757[var1] != -1) { // L: 1157 - var20 = this.field1757[var1] & 255; // L: 1158 - var17 = this.field1715[var20]; // L: 1159 - var18 = this.field1716[var20]; // L: 1160 - var19 = this.field1717[var20]; // L: 1161 + if (this.field1712 != null && this.field1712[var1] != -1) { // L: 1150 + var20 = this.field1712[var1] & 255; // L: 1151 + var17 = this.field1716[var20]; // L: 1152 + var18 = this.field1717[var20]; // L: 1153 + var19 = this.field1718[var20]; // L: 1154 } else { - var17 = var5; // L: 1164 - var18 = var6; // L: 1165 - var19 = var7; // L: 1166 + var17 = var5; // L: 1157 + var18 = var6; // L: 1158 + var19 = var7; // L: 1159 } - short var21 = this.faceTextures[var1]; // L: 1168 - if (this.faceColors3[var1] == -1) { // L: 1169 - Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1170 - Rasterizer3D.method3144(var14, var16, field1750[3], var11, var13, field1749[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1171 + if (this.faceColors3[var1] == -1) { // L: 1161 + Rasterizer3D.method3156(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1739[var17], field1739[var18], field1739[var19], field1709[var17], field1709[var18], field1709[var19], field1741[var17], field1741[var18], field1741[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1174 - Rasterizer3D.method3144(var14, var16, field1750[3], var11, var13, field1749[3], field1751[0], field1751[2], field1751[3], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1175 + Rasterizer3D.method3156(var14, var15, var16, var11, var12, var13, field1754[0], field1754[1], field1754[2], field1739[var17], field1739[var18], field1739[var19], field1709[var17], field1709[var18], field1709[var19], field1741[var17], field1741[var18], field1741[var19], this.faceTextures[var1]); // L: 1162 } } else if (this.faceColors3[var1] == -1) { // L: 1143 - var17 = field1756[this.faceColors1[var1]]; // L: 1144 - Rasterizer3D.method3172(var14, var15, var16, var11, var12, var13, var17); // L: 1145 - Rasterizer3D.method3172(var14, var16, field1750[3], var11, var13, field1749[3], var17); // L: 1146 + Rasterizer3D.method3149(var14, var15, var16, var11, var12, var13, field1761[this.faceColors1[var1]]); } else { - Rasterizer3D.method3117(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2]); // L: 1149 - Rasterizer3D.method3117(var14, var16, field1750[3], var11, var13, field1749[3], field1751[0], field1751[2], field1751[3]); // L: 1150 + Rasterizer3D.method3155(var14, var15, var16, var11, var12, var13, field1754[0], field1754[1], field1754[2]); // L: 1144 } } - } // L: 1179 + if (var4 == 4) { // L: 1165 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1695[3] < 0 || field1695[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1166 + Rasterizer3D.field1800 = true; + } - @ObfuscatedName("cb") + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1167 + if (this.field1712 != null && this.field1712[var1] != -1) { // L: 1182 + var20 = this.field1712[var1] & 255; // L: 1183 + var17 = this.field1716[var20]; // L: 1184 + var18 = this.field1717[var20]; // L: 1185 + var19 = this.field1718[var20]; // L: 1186 + } else { + var17 = var5; // L: 1189 + var18 = var6; // L: 1190 + var19 = var7; // L: 1191 + } + + short var21 = this.faceTextures[var1]; // L: 1193 + if (this.faceColors3[var1] == -1) { // L: 1194 + Rasterizer3D.method3156(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1739[var17], field1739[var18], field1739[var19], field1709[var17], field1709[var18], field1709[var19], field1741[var17], field1741[var18], field1741[var19], var21); // L: 1195 + Rasterizer3D.method3156(var14, var16, field1724[3], var11, var13, field1695[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1739[var17], field1739[var18], field1739[var19], field1709[var17], field1709[var18], field1709[var19], field1741[var17], field1741[var18], field1741[var19], var21); // L: 1196 + } else { + Rasterizer3D.method3156(var14, var15, var16, var11, var12, var13, field1754[0], field1754[1], field1754[2], field1739[var17], field1739[var18], field1739[var19], field1709[var17], field1709[var18], field1709[var19], field1741[var17], field1741[var18], field1741[var19], var21); // L: 1199 + Rasterizer3D.method3156(var14, var16, field1724[3], var11, var13, field1695[3], field1754[0], field1754[2], field1754[3], field1739[var17], field1739[var18], field1739[var19], field1709[var17], field1709[var18], field1709[var19], field1741[var17], field1741[var18], field1741[var19], var21); // L: 1200 + } + } else if (this.faceColors3[var1] == -1) { // L: 1168 + var17 = field1761[this.faceColors1[var1]]; // L: 1169 + Rasterizer3D.method3149(var14, var15, var16, var11, var12, var13, var17); // L: 1170 + Rasterizer3D.method3149(var14, var16, field1724[3], var11, var13, field1695[3], var17); // L: 1171 + } else { + Rasterizer3D.method3155(var14, var15, var16, var11, var12, var13, field1754[0], field1754[1], field1754[2]); // L: 1174 + Rasterizer3D.method3155(var14, var16, field1724[3], var11, var13, field1695[3], field1754[0], field1754[2], field1754[3]); // L: 1175 + } + } + + } // L: 1204 + + @ObfuscatedName("cg") + @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1742[0] = -1; // L: 723 + field1743[0] = -1; // L: 723 if (this.boundsType != 1) { // L: 724 this.calculateBoundsCylinder(); } @@ -1534,104 +1624,104 @@ public class Model extends Entity { var25 = true; } - boolean var26 = var25 || this.field1714 > 0; // L: 747 - int var27 = ViewportMouse.ViewportMouse_x; // L: 750 - int var29 = ViewportMouse.ViewportMouse_y; // L: 755 - boolean var31 = class200.method3760(); // L: 758 - boolean var32 = GrandExchangeOfferTotalQuantityComparator.method173(var9); // L: 759 - boolean var33 = false; // L: 760 + boolean var26 = var25 || this.field1721 > 0; // L: 747 + int var27 = ArchiveDiskAction.method4291(); // L: 748 + int var28 = ViewportMouse.ViewportMouse_y; // L: 751 + boolean var30 = WorldMapSection2.method425(); // L: 754 + boolean var31 = DevicePcmPlayerProvider.method941(var9); // L: 755 + boolean var32 = false; // L: 756 + int var34; int var35; int var36; - int var37; - if (var32 && var31) { // L: 761 - boolean var34 = false; // L: 762 - if (field1700) { // L: 763 - var34 = class227.method4186(this, var6, var7, var8); // L: 764 + if (var31 && var30) { // L: 757 + boolean var33 = false; // L: 758 + if (field1756) { // L: 759 + var33 = ModeWhere.method3818(this, var6, var7, var8); // L: 760 } else { - var35 = var12 - var13; // L: 767 - if (var35 <= 50) { // L: 768 - var35 = 50; + var34 = var12 - var13; // L: 763 + if (var34 <= 50) { // L: 764 + var34 = 50; } - if (var15 > 0) { // L: 769 - var16 /= var14; // L: 770 - var17 /= var35; // L: 771 + if (var15 > 0) { // L: 765 + var16 /= var14; // L: 766 + var17 /= var34; // L: 767 } else { - var17 /= var14; // L: 774 - var16 /= var35; // L: 775 + var17 /= var14; // L: 770 + var16 /= var34; // L: 771 } - if (var18 > 0) { // L: 777 - var22 /= var14; // L: 778 - var20 /= var35; // L: 779 + if (var18 > 0) { // L: 773 + var22 /= var14; // L: 774 + var20 /= var34; // L: 775 } else { - var20 /= var14; // L: 782 - var22 /= var35; // L: 783 + var20 /= var14; // L: 778 + var22 /= var34; // L: 779 } - var36 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 785 - var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 786 - if (var36 > var16 && var36 < var17 && var37 > var22 && var37 < var20) { // L: 787 - var34 = true; // L: 788 + var35 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 781 + var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 782 + if (var35 > var16 && var35 < var17 && var36 > var22 && var36 < var20) { // L: 783 + var33 = true; // L: 784 } } - if (var34) { // L: 791 - if (this.isSingleTile) { // L: 792 - DynamicObject.addEntityUnderMouse(var9); + if (var33) { // L: 787 + if (this.isSingleTile) { // L: 788 + Message.addEntityUnderMouse(var9); } else { - var33 = true; // L: 793 + var32 = true; // L: 789 } } } - int var45 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 796 - var35 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 797 - var36 = 0; // L: 798 - var37 = 0; // L: 799 - if (var1 != 0) { // L: 800 - var36 = Model_sine[var1]; // L: 801 - var37 = Model_cosine[var1]; // L: 802 + int var44 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 792 + var34 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 793 + var35 = 0; // L: 794 + var36 = 0; // L: 795 + if (var1 != 0) { // L: 796 + var35 = Model_sine[var1]; // L: 797 + var36 = Model_cosine[var1]; // L: 798 } - for (int var38 = 0; var38 < this.verticesCount; ++var38) { // L: 804 - int var39 = this.verticesX[var38]; // L: 805 - int var40 = this.verticesY[var38]; // L: 806 - int var41 = this.verticesZ[var38]; // L: 807 - int var42; - if (var1 != 0) { // L: 808 - var42 = var41 * var36 + var39 * var37 >> 16; // L: 809 - var41 = var41 * var37 - var39 * var36 >> 16; // L: 810 - var39 = var42; // L: 811 + for (int var37 = 0; var37 < this.verticesCount; ++var37) { // L: 800 + int var38 = this.verticesX[var37]; // L: 801 + int var39 = this.verticesY[var37]; // L: 802 + int var40 = this.verticesZ[var37]; // L: 803 + int var41; + if (var1 != 0) { // L: 804 + var41 = var40 * var35 + var38 * var36 >> 16; // L: 805 + var40 = var40 * var36 - var38 * var35 >> 16; // L: 806 + var38 = var41; // L: 807 } - var39 += var6; // L: 813 - var40 += var7; // L: 814 - var41 += var8; // L: 815 - var42 = var41 * var4 + var5 * var39 >> 16; // L: 816 - var41 = var5 * var41 - var39 * var4 >> 16; // L: 817 - var39 = var42; // L: 818 - var42 = var3 * var40 - var41 * var2 >> 16; // L: 819 - var41 = var40 * var2 + var3 * var41 >> 16; // L: 820 - field1760[var38] = var41 - var12; // L: 822 - if (var41 >= 50) { // L: 823 - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var45; // L: 824 - modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; // L: 825 + var38 += var6; // L: 809 + var39 += var7; // L: 810 + var40 += var8; // L: 811 + var41 = var40 * var4 + var5 * var38 >> 16; // L: 812 + var40 = var5 * var40 - var38 * var4 >> 16; // L: 813 + var38 = var41; // L: 814 + var41 = var3 * var39 - var40 * var2 >> 16; // L: 815 + var40 = var39 * var2 + var3 * var40 >> 16; // L: 816 + field1752[var37] = var40 - var12; // L: 818 + if (var40 >= 50) { // L: 819 + modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var40 + var44; // L: 820 + modelViewportYs[var37] = var41 * Rasterizer3D.Rasterizer3D_zoom / var40 + var34; // L: 821 } else { - modelViewportXs[var38] = -5000; // L: 828 - var24 = true; // L: 829 + modelViewportXs[var37] = -5000; // L: 824 + var24 = true; // L: 825 } - if (var26) { // L: 831 - field1728[var38] = var39; // L: 832 - field1739[var38] = var42; // L: 833 - field1740[var38] = var41; // L: 834 + if (var26) { // L: 827 + field1739[var37] = var38; // L: 828 + field1709[var37] = var41; // L: 829 + field1741[var37] = var40; // L: 830 } } try { - this.draw0(var24, var33, this.isSingleTile, var9); // L: 838 - } catch (Exception var44) { // L: 840 + this.draw0(var24, var32, this.isSingleTile, var9); // L: 834 + } catch (Exception var43) { // L: 836 } } @@ -1639,5 +1729,5 @@ public class Model extends Entity { } } } - } // L: 841 + } // L: 837 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index a6310da7a7..ee556ad790 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1,102 +1,136 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("en") +@Implements("ModelData") public class ModelData extends Entity { - @ObfuscatedName("ar") - static int[] field1606; - @ObfuscatedName("at") - static int[] field1602; - @ObfuscatedName("aq") - static int field1605; - @ObfuscatedName("al") + @ObfuscatedName("ak") + static int[] field1608; + @ObfuscatedName("au") + static int[] field1576; + @ObfuscatedName("ai") + static int field1610; + @ObfuscatedName("ax") + @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("ah") + @ObfuscatedName("ag") + @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("z") - int verticesCount; - @ObfuscatedName("k") - int[] verticesX; - @ObfuscatedName("s") - int[] verticesY; - @ObfuscatedName("t") - int[] verticesZ; - @ObfuscatedName("i") - int faceCount; - @ObfuscatedName("o") - int[] indices1; - @ObfuscatedName("x") - int[] indices2; - @ObfuscatedName("w") - int[] indices3; - @ObfuscatedName("g") - byte[] faceRenderTypes; - @ObfuscatedName("m") - byte[] faceRenderPriorities; - @ObfuscatedName("n") - byte[] faceAlphas; - @ObfuscatedName("d") - byte[] textureCoords; - @ObfuscatedName("h") - short[] faceColors; - @ObfuscatedName("a") - short[] faceTextures; - @ObfuscatedName("q") - byte priority; - @ObfuscatedName("c") - int textureTriangleCount; @ObfuscatedName("f") - byte[] textureRenderTypes; - @ObfuscatedName("y") - short[] texTriangleX; - @ObfuscatedName("v") - short[] texTriangleY; - @ObfuscatedName("j") - short[] texTriangleZ; - @ObfuscatedName("r") - int[] vertexSkins; - @ObfuscatedName("u") - int[] faceSkins; - @ObfuscatedName("p") - int[][] vertexLabels; + @Export("verticesCount") + int verticesCount; @ObfuscatedName("b") - int[][] faceLabelsAlpha; + @Export("verticesX") + int[] verticesX; @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Let;" - ) - FaceNormal[] faceNormals; + @Export("verticesY") + int[] verticesY; + @ObfuscatedName("m") + @Export("verticesZ") + int[] verticesZ; + @ObfuscatedName("z") + @Export("faceCount") + int faceCount; + @ObfuscatedName("q") + @Export("indices1") + int[] indices1; + @ObfuscatedName("k") + @Export("indices2") + int[] indices2; + @ObfuscatedName("c") + @Export("indices3") + int[] indices3; + @ObfuscatedName("u") + @Export("faceRenderTypes") + byte[] faceRenderTypes; + @ObfuscatedName("t") + @Export("faceRenderPriorities") + byte[] faceRenderPriorities; @ObfuscatedName("e") + @Export("faceAlphas") + byte[] faceAlphas; + @ObfuscatedName("o") + @Export("textureCoords") + byte[] textureCoords; + @ObfuscatedName("n") + @Export("faceColors") + short[] faceColors; + @ObfuscatedName("x") + @Export("faceTextures") + short[] faceTextures; + @ObfuscatedName("p") + @Export("priority") + byte priority; + @ObfuscatedName("r") + @Export("textureTriangleCount") + int textureTriangleCount; + @ObfuscatedName("y") + @Export("textureRenderTypes") + byte[] textureRenderTypes; + @ObfuscatedName("s") + @Export("texTriangleX") + short[] texTriangleX; + @ObfuscatedName("j") + @Export("texTriangleY") + short[] texTriangleY; + @ObfuscatedName("w") + @Export("texTriangleZ") + short[] texTriangleZ; + @ObfuscatedName("v") + @Export("vertexSkins") + int[] vertexSkins; + @ObfuscatedName("d") + @Export("faceSkins") + int[] faceSkins; + @ObfuscatedName("a") + @Export("vertexLabels") + int[][] vertexLabels; + @ObfuscatedName("g") + @Export("faceLabelsAlpha") + int[][] faceLabelsAlpha; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Leg;" + descriptor = "[Leb;" ) + @Export("faceNormals") + FaceNormal[] faceNormals; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "[Lep;" + ) + @Export("vertexNormals") VertexNormal[] vertexNormals; @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Leg;" + descriptor = "[Lep;" ) VertexNormal[] field1599; - @ObfuscatedName("ag") + @ObfuscatedName("ac") + @Export("ambient") public short ambient; @ObfuscatedName("ao") + @Export("contrast") public short contrast; - @ObfuscatedName("ae") + @ObfuscatedName("af") + @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("an") - int field1598; - @ObfuscatedName("am") - int field1601; - @ObfuscatedName("ap") + @ObfuscatedName("av") int field1603; - @ObfuscatedName("au") + @ObfuscatedName("ar") int field1604; - @ObfuscatedName("aa") - int field1589; + @ObfuscatedName("ay") + int field1605; + @ObfuscatedName("ah") + int field1587; + @ObfuscatedName("az") + int field1607; static { - field1606 = new int[10000]; // L: 44 - field1602 = new int[10000]; // L: 45 - field1605 = 0; // L: 46 + field1608 = new int[10000]; // L: 44 + field1576 = new int[10000]; // L: 45 + field1610 = 0; // L: 46 ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47 ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48 } @@ -109,7 +143,7 @@ public class ModelData extends Entity { } // L: 50 @ObfuscatedSignature( - descriptor = "([Lee;I)V" + descriptor = "([Len;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -240,18 +274,18 @@ public class ModelData extends Entity { } this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547 - this.indices1[this.faceCount] = this.method2904(var10, var10.indices1[var11]); // L: 548 - this.indices2[this.faceCount] = this.method2904(var10, var10.indices2[var11]); // L: 549 - this.indices3[this.faceCount] = this.method2904(var10, var10.indices3[var11]); // L: 550 + this.indices1[this.faceCount] = this.method2952(var10, var10.indices1[var11]); // L: 548 + this.indices2[this.faceCount] = this.method2952(var10, var10.indices2[var11]); // L: 549 + this.indices3[this.faceCount] = this.method2952(var10, var10.indices3[var11]); // L: 550 ++this.faceCount; // L: 551 } for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553 byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554 if (var12 == 0) { // L: 555 - this.texTriangleX[this.textureTriangleCount] = (short)this.method2904(var10, var10.texTriangleX[var11]); // L: 556 - this.texTriangleY[this.textureTriangleCount] = (short)this.method2904(var10, var10.texTriangleY[var11]); // L: 557 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2904(var10, var10.texTriangleZ[var11]); // L: 558 + this.texTriangleX[this.textureTriangleCount] = (short)this.method2952(var10, var10.texTriangleX[var11]); // L: 556 + this.texTriangleY[this.textureTriangleCount] = (short)this.method2952(var10, var10.texTriangleY[var11]); // L: 557 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method2952(var10, var10.texTriangleZ[var11]); // L: 558 } ++this.textureTriangleCount; // L: 560 @@ -267,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) { // L: 59 - this.method2880(var1); + this.method2913(var1); } else { - this.method2920(var1); // L: 60 + this.method2914(var1); // L: 60 } } // L: 61 @ObfuscatedSignature( - descriptor = "(Lee;ZZZZ)V", + descriptor = "(Len;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -346,8 +380,8 @@ public class ModelData extends Entity { this.contrast = var1.contrast; // L: 645 } - @ObfuscatedName("k") - void method2880(byte[] var1) { + @ObfuscatedName("b") + void method2913(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 64 Buffer var3 = new Buffer(var1); // L: 65 Buffer var4 = new Buffer(var1); // L: 66 @@ -652,8 +686,8 @@ public class ModelData extends Entity { } // L: 273 - @ObfuscatedName("s") - void method2920(byte[] var1) { + @ObfuscatedName("l") + void method2914(byte[] var1) { boolean var2 = false; // L: 276 boolean var3 = false; // L: 277 Buffer var4 = new Buffer(var1); // L: 278 @@ -929,11 +963,11 @@ public class ModelData extends Entity { } // L: 468 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lee;I)I" + descriptor = "(Len;I)I" ) - final int method2904(ModelData var1, int var2) { + final int method2952(ModelData var1, int var2) { int var3 = -1; // L: 567 int var4 = var1.verticesX[var2]; // L: 568 int var5 = var1.verticesY[var2]; // L: 569 @@ -960,11 +994,11 @@ public class ModelData extends Entity { return var3; // L: 584 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lee;" + descriptor = "()Len;" ) - public ModelData method2945() { + public ModelData method2932() { ModelData var1 = new ModelData(); // L: 650 if (this.faceRenderTypes != null) { // L: 651 var1.faceRenderTypes = new byte[this.faceCount]; // L: 652 @@ -1004,16 +1038,16 @@ public class ModelData extends Entity { return var1; // L: 682 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lee;" + descriptor = "([[IIIIZI)Len;" ) - public ModelData method2883(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method2915(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); // L: 686 - int var7 = var2 + this.field1601; // L: 687 - int var8 = var2 + this.field1603; // L: 688 - int var9 = var4 + this.field1589; // L: 689 - int var10 = var4 + this.field1604; // L: 690 + int var7 = var2 + this.field1604; // L: 687 + int var8 = var2 + this.field1605; // L: 688 + int var9 = var4 + this.field1607; // L: 689 + int var10 = var4 + this.field1587; // L: 690 if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691 var7 >>= 7; // L: 692 var8 = var8 + 127 >> 7; // L: 693 @@ -1098,8 +1132,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("x") - void method2884() { + @ObfuscatedName("k") + void method2919() { int[] var1; int var2; int var10002; @@ -1159,8 +1193,8 @@ public class ModelData extends Entity { } // L: 804 - @ObfuscatedName("w") - public void method2885() { + @ObfuscatedName("c") + public void method2940() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807 int var2 = this.verticesX[var1]; // L: 808 this.verticesX[var1] = this.verticesZ[var1]; // L: 809 @@ -1170,8 +1204,8 @@ public class ModelData extends Entity { this.invalidate(); // L: 812 } // L: 813 - @ObfuscatedName("m") - public void method2886() { + @ObfuscatedName("t") + public void method2921() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816 this.verticesX[var1] = -this.verticesX[var1]; // L: 817 this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818 @@ -1180,8 +1214,8 @@ public class ModelData extends Entity { this.invalidate(); // L: 820 } // L: 821 - @ObfuscatedName("n") - public void method2881() { + @ObfuscatedName("e") + public void method2922() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824 int var2 = this.verticesZ[var1]; // L: 825 this.verticesZ[var1] = this.verticesX[var1]; // L: 826 @@ -1191,8 +1225,8 @@ public class ModelData extends Entity { this.invalidate(); // L: 829 } // L: 830 - @ObfuscatedName("d") - public void method2888(int var1) { + @ObfuscatedName("o") + public void method2937(int var1) { int var2 = ModelData_sine[var1]; // L: 833 int var3 = ModelData_cosine[var1]; // L: 834 @@ -1205,7 +1239,8 @@ public class ModelData extends Entity { this.invalidate(); // L: 840 } // L: 841 - @ObfuscatedName("h") + @ObfuscatedName("n") + @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 int[] var10000 = this.verticesX; // L: 845 @@ -1219,7 +1254,8 @@ public class ModelData extends Entity { this.invalidate(); // L: 849 } // L: 850 - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853 if (this.faceColors[var3] == var1) { // L: 854 @@ -1229,7 +1265,8 @@ public class ModelData extends Entity { } // L: 856 - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 859 for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 860 @@ -1241,8 +1278,8 @@ public class ModelData extends Entity { } } // L: 863 - @ObfuscatedName("c") - public void method2892() { + @ObfuscatedName("r") + public void method2927() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866 this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1257,7 +1294,8 @@ public class ModelData extends Entity { this.invalidate(); // L: 872 } // L: 873 - @ObfuscatedName("j") + @ObfuscatedName("y") + @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 877 @@ -1268,7 +1306,8 @@ public class ModelData extends Entity { this.invalidate(); // L: 881 } // L: 882 - @ObfuscatedName("r") + @ObfuscatedName("s") + @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 885 this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 886 @@ -1343,7 +1382,8 @@ public class ModelData extends Entity { } } // L: 940 - @ObfuscatedName("u") + @ObfuscatedName("j") + @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 943 this.field1599 = null; // L: 944 @@ -1351,42 +1391,43 @@ public class ModelData extends Entity { this.isBoundsCalculated = false; // L: 946 } // L: 947 - @ObfuscatedName("p") + @ObfuscatedName("d") + @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { // L: 950 super.height = 0; // L: 951 - this.field1598 = 0; // L: 952 - this.field1601 = 999999; // L: 953 - this.field1603 = -999999; // L: 954 - this.field1604 = -99999; // L: 955 - this.field1589 = 99999; // L: 956 + this.field1603 = 0; // L: 952 + this.field1604 = 999999; // L: 953 + this.field1605 = -999999; // L: 954 + this.field1587 = -99999; // L: 955 + this.field1607 = 99999; // L: 956 for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957 int var2 = this.verticesX[var1]; // L: 958 int var3 = this.verticesY[var1]; // L: 959 int var4 = this.verticesZ[var1]; // L: 960 - if (var2 < this.field1601) { // L: 961 - this.field1601 = var2; + if (var2 < this.field1604) { // L: 961 + this.field1604 = var2; } - if (var2 > this.field1603) { // L: 962 - this.field1603 = var2; + if (var2 > this.field1605) { // L: 962 + this.field1605 = var2; } - if (var4 < this.field1589) { // L: 963 - this.field1589 = var4; + if (var4 < this.field1607) { // L: 963 + this.field1607 = var4; } - if (var4 > this.field1604) { // L: 964 - this.field1604 = var4; + if (var4 > this.field1587) { // L: 964 + this.field1587 = var4; } if (-var3 > super.height) { // L: 965 super.height = -var3; } - if (var3 > this.field1598) { // L: 966 - this.field1598 = var3; + if (var3 > this.field1603) { // L: 966 + this.field1603 = var3; } } @@ -1394,10 +1435,11 @@ public class ModelData extends Entity { } } // L: 969 - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIII)Ler;" + descriptor = "(IIIII)Leh;" ) + @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { this.calculateVertexNormals(); // L: 1028 int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1029 @@ -1416,38 +1458,38 @@ public class ModelData extends Entity { } } - var8.field1714 = 0; // L: 1040 + var8.field1721 = 0; // L: 1040 for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041 if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042 - ++var8.field1714; + ++var8.field1721; } } - var8.field1715 = new int[var8.field1714]; // L: 1044 - var8.field1716 = new int[var8.field1714]; // L: 1045 - var8.field1717 = new int[var8.field1714]; // L: 1046 + var8.field1716 = new int[var8.field1721]; // L: 1044 + var8.field1717 = new int[var8.field1721]; // L: 1045 + var8.field1718 = new int[var8.field1721]; // L: 1046 var10 = 0; // L: 1047 int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048 if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049 - var8.field1715[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 - var8.field1716[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 - var8.field1717[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 + var8.field1716[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 + var8.field1717[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 + var8.field1718[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 var9[var11] = var10++; // L: 1053 } else { var9[var11] = -1; // L: 1055 } } - var8.field1757 = new byte[this.faceCount]; // L: 1057 + var8.field1712 = new byte[this.faceCount]; // L: 1057 for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058 if (this.textureCoords[var11] != -1) { // L: 1059 - var8.field1757[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field1712[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1757[var11] = -1; // L: 1060 + var8.field1712[var11] = -1; // L: 1060 } } } @@ -1490,7 +1532,7 @@ public class ModelData extends Entity { if (var17 == 1) { // L: 1093 var19 = this.faceNormals[var16]; // L: 1094 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095 - var8.faceColors1[var16] = method2956(this.faceColors[var16] & '\uffff', var14); // L: 1096 + var8.faceColors1[var16] = method2934(this.faceColors[var16] & '\uffff', var14); // L: 1096 var8.faceColors3[var16] = -1; // L: 1097 } else if (var17 == 3) { // L: 1099 var8.faceColors1[var16] = 128; // L: 1100 @@ -1507,7 +1549,7 @@ public class ModelData extends Entity { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082 - var8.faceColors1[var16] = method2956(var15, var14); // L: 1083 + var8.faceColors1[var16] = method2934(var15, var14); // L: 1083 if (this.field1599 != null && this.field1599[this.indices2[var16]] != null) { // L: 1084 var13 = this.field1599[this.indices2[var16]]; } else { @@ -1515,7 +1557,7 @@ public class ModelData extends Entity { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086 - var8.faceColors2[var16] = method2956(var15, var14); // L: 1087 + var8.faceColors2[var16] = method2934(var15, var14); // L: 1087 if (this.field1599 != null && this.field1599[this.indices3[var16]] != null) { // L: 1088 var13 = this.field1599[this.indices3[var16]]; } else { @@ -1523,13 +1565,13 @@ public class ModelData extends Entity { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090 - var8.faceColors3[var16] = method2956(var15, var14); // L: 1091 + var8.faceColors3[var16] = method2934(var15, var14); // L: 1091 } } else if (var17 != 0) { // L: 1108 if (var17 == 1) { // L: 1124 var19 = this.faceNormals[var16]; // L: 1125 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126 - var8.faceColors1[var16] = method2900(var14); // L: 1127 + var8.faceColors1[var16] = method2983(var14); // L: 1127 var8.faceColors3[var16] = -1; // L: 1128 } else { var8.faceColors3[var16] = -2; // L: 1131 @@ -1542,7 +1584,7 @@ public class ModelData extends Entity { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113 - var8.faceColors1[var16] = method2900(var14); // L: 1114 + var8.faceColors1[var16] = method2983(var14); // L: 1114 if (this.field1599 != null && this.field1599[this.indices2[var16]] != null) { // L: 1115 var13 = this.field1599[this.indices2[var16]]; } else { @@ -1550,7 +1592,7 @@ public class ModelData extends Entity { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117 - var8.faceColors2[var16] = method2900(var14); // L: 1118 + var8.faceColors2[var16] = method2983(var14); // L: 1118 if (this.field1599 != null && this.field1599[this.indices3[var16]] != null) { // L: 1119 var13 = this.field1599[this.indices3[var16]]; } else { @@ -1558,11 +1600,11 @@ public class ModelData extends Entity { } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121 - var8.faceColors3[var16] = method2900(var14); // L: 1122 + var8.faceColors3[var16] = method2983(var14); // L: 1122 } } - this.method2884(); // L: 1135 + this.method2919(); // L: 1135 var8.verticesCount = this.verticesCount; // L: 1136 var8.verticesX = this.verticesX; // L: 1137 var8.verticesY = this.verticesY; // L: 1138 @@ -1573,32 +1615,33 @@ public class ModelData extends Entity { var8.indices3 = this.indices3; // L: 1143 var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144 var8.faceAlphas = this.faceAlphas; // L: 1145 - var8.field1720 = this.priority; // L: 1146 + var8.field1751 = this.priority; // L: 1146 var8.vertexLabels = this.vertexLabels; // L: 1147 var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148 var8.faceTextures = this.faceTextures; // L: 1149 return var8; // L: 1150 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;II)Lee;" + descriptor = "(Liw;II)Len;" ) + @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 53 return var3 == null ? null : new ModelData(var3); // L: 54 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lee;Lee;IIIZ)V" + descriptor = "(Len;Len;IIIZ)V" ) - static void method2935(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method2929(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); // L: 972 var0.calculateVertexNormals(); // L: 973 var1.calculateBounds(); // L: 974 var1.calculateVertexNormals(); // L: 975 - ++field1605; // L: 976 + ++field1610; // L: 976 int var6 = 0; // L: 977 int[] var7 = var1.verticesX; // L: 978 int var8 = var1.verticesCount; // L: 979 @@ -1608,11 +1651,11 @@ public class ModelData extends Entity { VertexNormal var10 = var0.vertexNormals[var9]; // L: 981 if (var10.magnitude != 0) { // L: 982 int var11 = var0.verticesY[var9] - var3; // L: 983 - if (var11 <= var1.field1598) { // L: 984 + if (var11 <= var1.field1603) { // L: 984 int var12 = var0.verticesX[var9] - var2; // L: 985 - if (var12 >= var1.field1601 && var12 <= var1.field1603) { // L: 986 + if (var12 >= var1.field1604 && var12 <= var1.field1605) { // L: 986 int var13 = var0.verticesZ[var9] - var4; // L: 987 - if (var13 >= var1.field1589 && var13 <= var1.field1604) { // L: 988 + if (var13 >= var1.field1607 && var13 <= var1.field1587) { // L: 988 for (int var14 = 0; var14 < var8; ++var14) { // L: 989 VertexNormal var15 = var1.vertexNormals[var14]; // L: 990 if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991 @@ -1643,8 +1686,8 @@ public class ModelData extends Entity { var17.z += var10.z; // L: 1004 var17.magnitude += var10.magnitude; // L: 1005 ++var6; // L: 1006 - field1606[var9] = field1605; // L: 1007 - field1602[var14] = field1605; // L: 1008 + field1608[var9] = field1610; // L: 1007 + field1576[var14] = field1610; // L: 1008 } } } @@ -1655,7 +1698,7 @@ public class ModelData extends Entity { if (var6 >= 3 && var5) { // L: 1012 for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013 - if (field1606[var0.indices1[var9]] == field1605 && field1606[var0.indices2[var9]] == field1605 && field1606[var0.indices3[var9]] == field1605) { // L: 1014 + if (field1608[var0.indices1[var9]] == field1610 && field1608[var0.indices2[var9]] == field1610 && field1608[var0.indices3[var9]] == field1610) { // L: 1014 if (var0.faceRenderTypes == null) { // L: 1015 var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1665,7 +1708,7 @@ public class ModelData extends Entity { } for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019 - if (field1605 == field1602[var1.indices1[var9]] && field1605 == field1602[var1.indices2[var9]] && field1605 == field1602[var1.indices3[var9]]) { // L: 1020 + if (field1610 == field1576[var1.indices1[var9]] && field1610 == field1576[var1.indices2[var9]] && field1610 == field1576[var1.indices3[var9]]) { // L: 1020 if (var1.faceRenderTypes == null) { // L: 1021 var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1677,8 +1720,8 @@ public class ModelData extends Entity { } } // L: 1025 - @ObfuscatedName("e") - static final int method2956(int var0, int var1) { + @ObfuscatedName("h") + static final int method2934(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1154 if (var1 < 2) { // L: 1155 var1 = 2; @@ -1690,7 +1733,7 @@ public class ModelData extends Entity { } @ObfuscatedName("ab") - static final int method2900(int var0) { + static final int method2983(int var0) { if (var0 < 2) { // L: 1161 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 403207f012..6ec8904503 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,66 +1,91 @@ -import java.io.IOException; -import java.net.Socket; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("ec") +@Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("sl") + @ObfuscatedName("sv") + @ObfuscatedSignature( + descriptor = "Liq;" + ) + public static class248 field1895; + @ObfuscatedName("ez") @ObfuscatedSignature( descriptor = "Lid;" ) - public static class247 field1901; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static AbstractArchive soundEffectsArchive; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("au") - static String field1904; + @Export("archive18") + static Archive archive18; ModelData0() { } // L: 4 - @ObfuscatedName("o") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lct;Lct;IZIZB)I", - garbageValue = "73" + descriptor = "(I)Lcf;", + garbageValue = "1326128676" ) - static int method3376(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = class2.compareWorlds(var0, var1, var2, var3); // L: 199 - if (var6 != 0) { // L: 200 - return var3 ? -var6 : var6; // L: 201 - } else if (var4 == -1) { // L: 204 - return 0; - } else { - int var7 = class2.compareWorlds(var0, var1, var4, var5); // L: 205 - return var5 ? -var7 : var7; // L: 206 - } + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 237 + return FileSystem.getNextWorldListWorld(); // L: 238 } - @ObfuscatedName("g") + @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1145056768" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", + garbageValue = "-117" ) - static final void method3377(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); // L: 112 - WorldMapRectangle.addGameMessage(30, "", var1); // L: 114 - } // L: 116 + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + KeyHandler.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8934 + } // L: 8935 - @ObfuscatedName("e") + @ObfuscatedName("jt") @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;IIB)Lln;", - garbageValue = "14" + descriptor = "(IIII)Lbs;", + garbageValue = "1523932767" ) - public static AbstractSocket method3375(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); // L: 10 + static final InterfaceParent method3381(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 11261 + var3.group = var1; // L: 11262 + var3.type = var2; // L: 11263 + Client.interfaceParents.put(var3, (long)var0); // L: 11264 + FontName.Widget_resetModelFrames(var1); // L: 11265 + Widget var4 = UserComparator4.getWidget(var0); // L: 11266 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var4); // L: 11267 + if (Client.meslayerContinueWidget != null) { // L: 11268 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(Client.meslayerContinueWidget); // L: 11269 + Client.meslayerContinueWidget = null; // L: 11270 + } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 11273 + if (DynamicObject.method2362(Client.menuOpcodes[var5])) { // L: 11274 + if (var5 < Client.menuOptionsCount - 1) { // L: 11275 + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { // L: 11276 + Client.menuActions[var6] = Client.menuActions[var6 + 1]; // L: 11277 + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; // L: 11278 + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; // L: 11279 + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; // L: 11280 + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; // L: 11281 + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; // L: 11282 + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; // L: 11283 + } + } + + --var5; // L: 11286 + --Client.menuOptionsCount; // L: 11287 + } + } + + TileItemPile.method2908(); // L: 11290 + UserComparator9.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11292 + ScriptFrame.runWidgetOnLoadListener(var1); // L: 11293 + if (Client.rootInterface != -1) { // L: 11294 + WorldMapAreaData.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 11295 } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 0e8df2546d..f7271c7930 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,592 +3,337 @@ 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 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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("be") +@ObfuscatedName("bt") +@Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 551932135 - ) - public static int MouseHandler_x; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lbe;" - ) - static MouseHandler MouseHandler_instance; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1641634033 - ) - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1212010463 - ) - public static int MouseHandler_y; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 569317801 - ) - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 476051061 - ) - static volatile int MouseHandler_xVolatile; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1924891607 + @ObfuscatedSignature( + descriptor = "Lbt;" ) - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("n") + @Export("MouseHandler_instance") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -5989118801596156891L + intValue = 996345837 ) - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1364176147 - ) - public static int MouseHandler_currentButton; - @ObfuscatedName("h") - @ObfuscatedGetter( - longValue = 1548820219885674609L - ) - public static long MouseHandler_millis; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1745887067 - ) - static volatile int MouseHandler_lastButtonVolatile; + @Export("MouseHandler_idleCycles") + public static volatile int MouseHandler_idleCycles; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2031476779 + intValue = 1273849555 ) - static volatile int MouseHandler_lastPressedXVolatile; + @Export("MouseHandler_currentButtonVolatile") + public static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -2115208813 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -604562201 + intValue = -575888969 ) - static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("f") + @Export("MouseHandler_xVolatile") + public static volatile int MouseHandler_xVolatile; + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -1684843054653501119L + intValue = -393031685 ) - static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("y") + @Export("MouseHandler_yVolatile") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 376699801 + longValue = -2981327926764741279L ) - public static int MouseHandler_lastButton; - @ObfuscatedName("v") + @Export("MouseHandler_lastMovedVolatile") + public static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1229832903 + intValue = -279954639 ) - public static int MouseHandler_lastPressedX; - @ObfuscatedName("j") + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -434332357 + intValue = -581221331 ) - public static int MouseHandler_lastPressedY; + @Export("MouseHandler_y") + public static int MouseHandler_y; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = -6548306948160213705L + ) + @Export("MouseHandler_millis") + public static long MouseHandler_millis; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 950852407 + ) + @Export("MouseHandler_lastButtonVolatile") + public static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 53768097 + ) + @Export("MouseHandler_lastPressedXVolatile") + public static volatile int MouseHandler_lastPressedXVolatile; @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -2055163658116269707L + intValue = -1335668523 ) - public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("fg") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - static AbstractSocket field508; - @ObfuscatedName("ij") + @Export("MouseHandler_lastPressedYVolatile") + public static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1280773695 + longValue = -8304358038408735417L ) - static int oculusOrbFocalPointY; + @Export("MouseHandler_lastPressedTimeMillisVolatile") + public static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1344493173 + ) + @Export("MouseHandler_lastButton") + public static int MouseHandler_lastButton; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -42560979 + ) + @Export("MouseHandler_lastPressedX") + public static int MouseHandler_lastPressedX; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1647084327 + ) + @Export("MouseHandler_lastPressedY") + public static int MouseHandler_lastPressedY; + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = -4462860366380858355L + ) + @Export("MouseHandler_lastPressedTimeMillis") + public static long MouseHandler_lastPressedTimeMillis; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + static IndexedSprite field523; + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + static Widget field525; static { MouseHandler_instance = new MouseHandler(); // L: 15 - MouseHandler_idleCycles = 0; // L: 16 - MouseHandler_currentButtonVolatile = 0; // L: 17 - MouseHandler_xVolatile = -1; // L: 18 - MouseHandler_yVolatile = -1; // L: 19 - MouseHandler_lastMovedVolatile = -1L; + MouseHandler_idleCycles = 0; + MouseHandler_currentButtonVolatile = 0; + MouseHandler_xVolatile = -1; + MouseHandler_yVolatile = -1; + MouseHandler_lastMovedVolatile = -1L; // L: 20 MouseHandler_currentButton = 0; // L: 21 - MouseHandler_x = 0; - MouseHandler_y = 0; - MouseHandler_millis = 0L; - MouseHandler_lastButtonVolatile = 0; - MouseHandler_lastPressedXVolatile = 0; - MouseHandler_lastPressedYVolatile = 0; - MouseHandler_lastPressedTimeMillisVolatile = 0L; + MouseHandler_x = 0; // L: 22 + MouseHandler_y = 0; // L: 23 + MouseHandler_millis = 0L; // L: 24 + MouseHandler_lastButtonVolatile = 0; // L: 25 + MouseHandler_lastPressedXVolatile = 0; // L: 26 + MouseHandler_lastPressedYVolatile = 0; // L: 27 + MouseHandler_lastPressedTimeMillisVolatile = 0L; // L: 28 MouseHandler_lastButton = 0; // L: 29 - MouseHandler_lastPressedX = 0; - MouseHandler_lastPressedY = 0; - MouseHandler_lastPressedTimeMillis = 0L; + MouseHandler_lastPressedX = 0; // L: 30 + MouseHandler_lastPressedY = 0; // L: 31 + MouseHandler_lastPressedTimeMillis = 0L; // L: 32 } MouseHandler() { } // L: 34 - @ObfuscatedName("i") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;B)I", - garbageValue = "-11" + descriptor = "(Ljava/awt/event/MouseEvent;I)I", + garbageValue = "1643778515" ) + @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 72 - if (!var1.isAltDown() && var2 != 2) { // L: 73 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 74 75 + int var2 = var1.getButton(); // L: 55 + if (!var1.isAltDown() && var2 != 2) { // L: 56 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 57 58 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 120 - MouseHandler_idleCycles = 0; // L: 121 - MouseHandler_xVolatile = var1.getX(); // L: 122 - MouseHandler_yVolatile = var1.getY(); // L: 123 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 124 + if (MouseHandler_instance != null) { // L: 103 + MouseHandler_idleCycles = 0; // L: 104 + MouseHandler_xVolatile = var1.getX(); // L: 105 + MouseHandler_yVolatile = var1.getY(); // L: 106 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 107 } - } // L: 126 - - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 99 - var1.consume(); - } - - } // L: 100 - - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 103 - } // L: 104 - - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 107 - MouseHandler_idleCycles = 0; // L: 108 - MouseHandler_xVolatile = -1; // L: 109 - MouseHandler_yVolatile = -1; // L: 110 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 111 - } - - } // L: 113 - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 116 - } // L: 117 - - public final void focusGained(FocusEvent var1) { - } // L: 128 - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 131 - MouseHandler_currentButtonVolatile = 0; - } - - } // L: 132 + } // L: 109 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 79 - MouseHandler_idleCycles = 0; // L: 80 - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 81 - MouseHandler_lastPressedYVolatile = var1.getY(); // L: 82 - MouseHandler_lastPressedTimeMillisVolatile = PacketWriter.currentTimeMillis(); // L: 83 - MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 84 - if (MouseHandler_lastButtonVolatile != 0) { // L: 85 + if (MouseHandler_instance != null) { // L: 62 + MouseHandler_idleCycles = 0; // L: 63 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 64 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 65 + MouseHandler_lastPressedTimeMillisVolatile = User.currentTimeMillis(); // L: 66 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 67 + if (MouseHandler_lastButtonVolatile != 0) { // L: 68 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 87 + if (var1.isPopupTrigger()) { // L: 70 var1.consume(); } - } // L: 88 + } // L: 71 public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 91 - MouseHandler_idleCycles = 0; // L: 92 - MouseHandler_currentButtonVolatile = 0; // L: 93 + if (MouseHandler_instance != null) { // L: 74 + MouseHandler_idleCycles = 0; // L: 75 + MouseHandler_currentButtonVolatile = 0; // L: 76 } - if (var1.isPopupTrigger()) { // L: 95 + if (var1.isPopupTrigger()) { var1.consume(); } + } + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); + } + + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 82 + var1.consume(); + } + + } + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 99 + } // L: 100 + + public final void focusGained(FocusEvent var1) { + } // L: 111 + + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { // L: 114 + MouseHandler_currentButtonVolatile = 0; + } + + } // L: 115 + + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; // L: 91 + MouseHandler_xVolatile = -1; // L: 92 + MouseHandler_yVolatile = -1; // L: 93 + MouseHandler_lastMovedVolatile = var1.getWhen(); + } + } // L: 96 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BI)Llp;", - garbageValue = "1839748509" + descriptor = "(Ljava/io/File;I)V", + garbageValue = "-203771743" ) - public static final Sprite convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; // L: 20 - - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 - int var2 = var1.getWidth(); // L: 23 - int var3 = var1.getHeight(); // L: 24 - int[] var4 = new int[var2 * var3]; // L: 25 - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 - var5.grabPixels(); // L: 27 - return new Sprite(var4, var2, var3); // L: 28 - } catch (IOException var7) { // L: 30 - } catch (InterruptedException var8) { // L: 31 + static void method1177(File var0) { + FileSystem.FileSystem_cacheDir = var0; // L: 16 + if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; // L: 18 } + } // L: 19 - return new Sprite(0, 0); // L: 32 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;IB)Z", + garbageValue = "1" + ) + static boolean method1176(String var0, int var1) { + return WorldMapManager.method735(var0, var1, "openjs"); // L: 50 } - @ObfuscatedName("m") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lhq;IIII)V", - garbageValue = "1755181117" + descriptor = "([BIIIIIII[Lfh;B)V", + garbageValue = "-2" ) - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2682 == null) { // L: 926 - throw new RuntimeException(); // L: 927 - } else { - var0.field2682[var1] = var2; // L: 929 - var0.field2683[var1] = var3; // L: 930 + static final void method1174(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { + int var10; + for (int var9 = 0; var9 < 8; ++var9) { // L: 78 + for (var10 = 0; var10 < 8; ++var10) { // L: 79 + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { + int[] var10000 = var8[var1].flags[var9 + var2]; // L: 80 + var10000[var3 + var10] &= -16777217; + } + } } - } // L: 931 - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(ILhg;ZB)V", - garbageValue = "70" - ) - static void method1150(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = WorldMapSection0.getWorldMap().getMapArea(var0); // L: 3851 - int var4 = WorldMapLabelSize.localPlayer.plane; // L: 3852 - int var5 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 3853 - int var6 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 3854 - Coord var7 = new Coord(var4, var5, var6); // L: 3855 - WorldMapSection0.getWorldMap().method6549(var3, var7, var1, var2); // L: 3856 - } // L: 3857 + Buffer var13 = new Buffer(var0); // L: 83 - @ObfuscatedName("gq") - @ObfuscatedSignature( - descriptor = "(Lgd;I)V", - garbageValue = "-930522600" - ) - static final void method1134(class194 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6341 - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - if (class194.field2361 == var0) { // L: 6342 - var2 = var1.method5656(); // L: 6343 - var3 = var1.method5646(); // L: 6344 - var4 = (var3 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6345 - var5 = (var3 & 7) + ScriptEvent.field597; // L: 6346 - var6 = var1.method5656(); // L: 6347 - var7 = var1.readUnsignedShort(); // L: 6348 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 6349 - NodeDeque var42 = Client.groundItems[Huffman.Client_plane][var4][var5]; // L: 6350 - if (var42 != null) { // L: 6351 - for (TileItem var36 = (TileItem)var42.last(); var36 != null; var36 = (TileItem)var42.previous()) { // L: 6352 6353 6358 - if ((var6 & 32767) == var36.id && var2 == var36.quantity) { // L: 6354 - var36.quantity = var7; // L: 6355 - break; - } - } - - class13.updateItemPile(var4, var5); // L: 6360 - } - } - - } else { - int var8; - int var9; - int var10; - if (class194.field2371 == var0) { // L: 6365 - var2 = var1.method5612(); // L: 6366 - var3 = var2 >> 4 & 15; // L: 6367 - var4 = var2 & 7; // L: 6368 - var5 = var1.method5612(); // L: 6369 - var6 = var1.readUnsignedByte(); // L: 6370 - var7 = (var6 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6371 - var8 = (var6 & 7) + ScriptEvent.field597; // L: 6372 - var9 = var1.method5656(); // L: 6373 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6374 - var10 = var3 + 1; // L: 6375 - if (WorldMapLabelSize.localPlayer.pathX[0] >= var7 - var10 && WorldMapLabelSize.localPlayer.pathX[0] <= var7 + var10 && WorldMapLabelSize.localPlayer.pathY[0] >= var8 - var10 && WorldMapLabelSize.localPlayer.pathY[0] <= var10 + var8 && Client.areaSoundEffectVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { // L: 6376 6377 - Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 6378 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 6379 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; // L: 6380 - Client.soundEffects[Client.soundEffectCount] = null; // L: 6381 - Client.soundLocations[Client.soundEffectCount] = var3 + (var8 << 8) + (var7 << 16); // L: 6382 - ++Client.soundEffectCount; // L: 6383 + for (var10 = 0; var10 < 4; ++var10) { // L: 84 + for (int var11 = 0; var11 < 64; ++var11) { // L: 85 + for (int var12 = 0; var12 < 64; ++var12) { // L: 86 + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 87 + HealthBarUpdate.loadTerrain(var13, var1, var2 + Varps.method4122(var11 & 7, var12 & 7, var7), var3 + MusicPatchNode2.method3831(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 88 + } else { + HealthBarUpdate.loadTerrain(var13, 0, -1, -1, 0, 0, 0); // L: 90 } } } + } - int var11; - int var12; - int var13; - int var14; - byte var38; - if (class194.field2364 == var0) { // L: 6388 - var2 = var1.method5656(); // L: 6389 - var38 = var1.method5649(); // L: 6390 - var4 = var1.method5646(); // L: 6391 - var5 = (var4 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6392 - var6 = (var4 & 7) + ScriptEvent.field597; // L: 6393 - var7 = var1.readUnsignedByte(); // L: 6394 - var8 = var1.method5612() * 4; // L: 6395 - var9 = var1.method5639(); // L: 6396 - var10 = var1.method5655(); // L: 6397 - var11 = var1.readUnsignedShort(); // L: 6398 - var12 = var1.method5658(); // L: 6399 - var13 = var1.method5646() * 4; // L: 6400 - byte var41 = var1.method5649(); // L: 6401 - var3 = var38 + var5; // L: 6402 - var14 = var41 + var6; // L: 6403 - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var3 >= 0 && var14 >= 0 && var3 < 104 && var14 < 104 && var2 != 65535) { // L: 6404 - var5 = var5 * 128 + 64; // L: 6405 - var6 = var6 * 128 + 64; // L: 6406 - var3 = var3 * 128 + 64; // L: 6407 - var14 = var14 * 128 + 64; // L: 6408 - Projectile var35 = new Projectile(var2, Huffman.Client_plane, var5, var6, ArchiveLoader.getTileHeight(var5, var6, Huffman.Client_plane) - var8, var10 + Client.cycle, var11 + Client.cycle, var9, var7, var12, var13); // L: 6409 - var35.setDestination(var3, var14, ArchiveLoader.getTileHeight(var3, var14, Huffman.Client_plane) - var13, var10 + Client.cycle); // L: 6410 - Client.projectiles.addFirst(var35); // L: 6411 - } - - } else if (class194.field2365 == var0) { // L: 6415 - var2 = var1.method5639(); // L: 6416 - var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6417 - var4 = (var2 & 7) + ScriptEvent.field597; // L: 6418 - var5 = var1.method5612(); // L: 6419 - var6 = var5 >> 2; // L: 6420 - var7 = var5 & 3; // L: 6421 - var8 = Client.field736[var6]; // L: 6422 - var9 = var1.readUnsignedShort(); // L: 6423 - if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 6424 - if (var8 == 0) { // L: 6425 - BoundaryObject var34 = ScriptEvent.scene.method3276(Huffman.Client_plane, var3, var4); // L: 6426 - if (var34 != null) { // L: 6427 - var11 = UserComparator9.Entity_unpackID(var34.tag); // L: 6428 - if (var6 == 2) { // L: 6429 - var34.entity1 = new DynamicObject(var11, 2, var7 + 4, Huffman.Client_plane, var3, var4, var9, false, var34.entity1); // L: 6430 - var34.entity2 = new DynamicObject(var11, 2, var7 + 1 & 3, Huffman.Client_plane, var3, var4, var9, false, var34.entity2); // L: 6431 - } else { - var34.entity1 = new DynamicObject(var11, var6, var7, Huffman.Client_plane, var3, var4, var9, false, var34.entity1); // L: 6433 - } - } - } - - if (var8 == 1) { // L: 6436 - WallDecoration var43 = ScriptEvent.scene.method3211(Huffman.Client_plane, var3, var4); // L: 6437 - if (var43 != null) { // L: 6438 - var11 = UserComparator9.Entity_unpackID(var43.tag); // L: 6439 - if (var6 != 4 && var6 != 5) { // L: 6440 - if (var6 == 6) { // L: 6441 - var43.entity1 = new DynamicObject(var11, 4, var7 + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); - } else if (var6 == 7) { // L: 6442 - var43.entity1 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); - } else if (var6 == 8) { // L: 6443 - var43.entity1 = new DynamicObject(var11, 4, var7 + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); // L: 6444 - var43.entity2 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity2); - } - } else { - var43.entity1 = new DynamicObject(var11, 4, var7, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); // L: 6445 - } - } - } - - if (var8 == 2) { // L: 6449 - GameObject var44 = ScriptEvent.scene.method3197(Huffman.Client_plane, var3, var4); // L: 6450 - if (var6 == 11) { // L: 6451 - var6 = 10; - } - - if (var44 != null) { // L: 6452 - var44.entity = new DynamicObject(UserComparator9.Entity_unpackID(var44.tag), var6, var7, Huffman.Client_plane, var3, var4, var9, false, var44.entity); - } - } - - if (var8 == 3) { // L: 6454 - FloorDecoration var45 = ScriptEvent.scene.getFloorDecoration(Huffman.Client_plane, var3, var4); // L: 6455 - if (var45 != null) { // L: 6456 - var45.entity = new DynamicObject(UserComparator9.Entity_unpackID(var45.tag), 22, var7, Huffman.Client_plane, var3, var4, var9, false, var45.entity); - } - } - } - - } else if (class194.field2368 == var0) { // L: 6461 - var2 = var1.method5657(); // L: 6462 - var3 = var1.method5639(); // L: 6463 - var4 = (var3 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6464 - var5 = (var3 & 7) + ScriptEvent.field597; // L: 6465 - var6 = var1.method5639(); // L: 6466 - var7 = var1.method5655(); // L: 6467 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 6468 - var4 = var4 * 128 + 64; // L: 6469 - var5 = var5 * 128 + 64; // L: 6470 - GraphicsObject var33 = new GraphicsObject(var2, Huffman.Client_plane, var4, var5, ArchiveLoader.getTileHeight(var4, var5, Huffman.Client_plane) - var6, var7, Client.cycle); // L: 6471 - Client.graphicsObjects.addFirst(var33); // L: 6472 - } - - } else if (class194.field2362 == var0) { // L: 6476 - var2 = var1.method5646(); // L: 6477 - var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6478 - var4 = (var2 & 7) + ScriptEvent.field597; // L: 6479 - var5 = var1.method5639(); // L: 6480 - var6 = var5 >> 2; // L: 6481 - var7 = var5 & 3; // L: 6482 - var8 = Client.field736[var6]; // L: 6483 - var9 = var1.method5657(); // L: 6484 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6485 - class9.updatePendingSpawn(Huffman.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 6486 - } - - } else if (class194.field2367 == var0) { // L: 6490 - var2 = var1.method5646(); // L: 6491 - var3 = var2 >> 2; // L: 6492 - var4 = var2 & 3; // L: 6493 - var5 = Client.field736[var3]; // L: 6494 - var6 = var1.method5612(); // L: 6495 - var7 = (var6 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6496 - var8 = (var6 & 7) + ScriptEvent.field597; // L: 6497 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6498 - class9.updatePendingSpawn(Huffman.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 6499 - } - - } else { - TileItem var31; - if (class194.field2363 == var0) { // L: 6503 - var2 = var1.method5612(); // L: 6504 - var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6505 - var4 = (var2 & 7) + ScriptEvent.field597; // L: 6506 - var5 = var1.readUnsignedShort(); // L: 6507 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6508 - NodeDeque var32 = Client.groundItems[Huffman.Client_plane][var3][var4]; // L: 6509 - if (var32 != null) { // L: 6510 - for (var31 = (TileItem)var32.last(); var31 != null; var31 = (TileItem)var32.previous()) { // L: 6511 6512 6517 - if ((var5 & 32767) == var31.id) { // L: 6513 - var31.remove(); // L: 6514 - break; - } - } - - if (var32.last() == null) { // L: 6519 - Client.groundItems[Huffman.Client_plane][var3][var4] = null; - } - - class13.updateItemPile(var3, var4); // L: 6520 - } - } - - } else if (class194.field2370 == var0) { // L: 6525 - var2 = var1.readUnsignedByte(); // L: 6526 - var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6527 - var4 = (var2 & 7) + ScriptEvent.field597; // L: 6528 - var5 = var1.method5656(); // L: 6529 - var6 = var1.method5657(); // L: 6530 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6531 - var31 = new TileItem(); // L: 6532 - var31.id = var6; // L: 6533 - var31.quantity = var5; // L: 6534 - if (Client.groundItems[Huffman.Client_plane][var3][var4] == null) { // L: 6535 - Client.groundItems[Huffman.Client_plane][var3][var4] = new NodeDeque(); - } - - Client.groundItems[Huffman.Client_plane][var3][var4].addFirst(var31); // L: 6536 - class13.updateItemPile(var3, var4); // L: 6537 - } + } // L: 94 + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-128859351" + ) + static int method1152(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 1122 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1123 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = JagexCache.Widget_unpackTargetMask(WorldMapData_0.getWidgetFlags(var3)); // L: 1124 + return 1; // L: 1125 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1127 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1134 + if (var3.dataText == null) { // L: 1135 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; } else { - if (class194.field2366 == var0) { // L: 6541 - byte var37 = var1.readByte(); // L: 6542 - var38 = var1.method5649(); // L: 6543 - var4 = var1.readUnsignedShort(); // L: 6544 - byte var39 = var1.readByte(); // L: 6545 - byte var40 = var1.method5649(); // L: 6546 - var7 = var1.readUnsignedShort(); // L: 6547 - var8 = var1.method5656(); // L: 6548 - var9 = var1.readUnsignedByte(); // L: 6549 - var10 = (var9 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6550 - var11 = (var9 & 7) + ScriptEvent.field597; // L: 6551 - var12 = var1.method5646(); // L: 6552 - var13 = var12 >> 2; // L: 6553 - var14 = var12 & 3; // L: 6554 - int var15 = Client.field736[var13]; // L: 6555 - int var16 = var1.readUnsignedShort(); // L: 6556 - Player var17; - if (var4 == Client.localPlayerIndex) { // L: 6558 - var17 = WorldMapLabelSize.localPlayer; - } else { - var17 = Client.players[var4]; // L: 6559 - } - - if (var17 != null) { // L: 6560 - ObjectDefinition var18 = MidiPcmStream.getObjectDefinition(var16); // L: 6561 - int var19; - int var20; - if (var14 != 1 && var14 != 3) { // L: 6564 - var19 = var18.sizeX; // L: 6569 - var20 = var18.sizeY; // L: 6570 - } else { - var19 = var18.sizeY; // L: 6565 - var20 = var18.sizeX; // L: 6566 - } - - int var21 = var10 + (var19 >> 1); // L: 6572 - int var22 = var10 + (var19 + 1 >> 1); // L: 6573 - int var23 = var11 + (var20 >> 1); // L: 6574 - int var24 = var11 + (var20 + 1 >> 1); // L: 6575 - int[][] var25 = Tiles.Tiles_heights[Huffman.Client_plane]; // L: 6576 - int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; // L: 6577 - int var27 = (var10 << 7) + (var19 << 6); // L: 6578 - int var28 = (var11 << 7) + (var20 << 6); // L: 6579 - Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 6580 - if (var29 != null) { // L: 6581 - class9.updatePendingSpawn(Huffman.Client_plane, var10, var11, var15, -1, 0, 0, var8 + 1, var7 + 1); // L: 6582 - var17.animationCycleStart = var8 + Client.cycle; // L: 6583 - var17.animationCycleEnd = var7 + Client.cycle; // L: 6584 - var17.model0 = var29; // L: 6585 - var17.field645 = var19 * 64 + var10 * 128; // L: 6586 - var17.field640 = var20 * 64 + var11 * 128; // L: 6587 - var17.tileHeight2 = var26; // L: 6588 - byte var30; - if (var38 > var40) { // L: 6589 - var30 = var38; // L: 6590 - var38 = var40; // L: 6591 - var40 = var30; // L: 6592 - } - - if (var37 > var39) { // L: 6594 - var30 = var37; // L: 6595 - var37 = var39; // L: 6596 - var39 = var30; // L: 6597 - } - - var17.field649 = var10 + var38; // L: 6599 - var17.field651 = var40 + var10; // L: 6600 - var17.field635 = var11 + var37; // L: 6601 - var17.field643 = var11 + var39; // L: 6602 - } - } - } - + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1136 } + + return 1; // L: 1137 + } else { + return 2; // L: 1139 } + } else { + int var4 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1128 + --var4; // L: 1129 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1130 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1131 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1132 } - } // L: 6363 6413 6459 6474 6488 6501 6523 6539 6606 + } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 9aaf64403b..2ce6148148 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,38 +1,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("bo") +@ObfuscatedName("bh") +@Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("rc") - @ObfuscatedGetter( - intValue = 829134311 - ) - static int field609; - @ObfuscatedName("eu") + @ObfuscatedName("c") + public static short[][] field628; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lht;" ) - static Archive archive18; - @ObfuscatedName("fc") + static Widget field621; + @ObfuscatedName("v") + public static String field617; + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Llv;" ) - static Task socketTask; - @ObfuscatedName("z") + static AbstractSocket field615; + @ObfuscatedName("f") + @Export("isRunning") boolean isRunning; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("lock") Object lock; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -587598223 + intValue = -973723423 ) + @Export("index") int index; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("xs") int[] xs; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("ys") int[] ys; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("millis") long[] millis; MouseRecorder() { @@ -45,61 +53,77 @@ public class MouseRecorder implements Runnable { } // L: 14 public void run() { - for (; this.isRunning; class227.sleepExact(50L)) { // L: 17 26 + for (; this.isRunning; WorldMapSection3.sleepExact(50L)) { // L: 17 26 synchronized(this.lock) { // L: 18 if (this.index < 500) { // L: 19 - this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20 - this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 21 - this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 22 + this.xs[this.index] = MouseHandler.MouseHandler_x; + this.ys[this.index] = MouseHandler.MouseHandler_y; + this.millis[this.index] = MouseHandler.MouseHandler_millis; ++this.index; // L: 23 } } } - } // L: 28 + } - @ObfuscatedName("id") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lhq;IIZS)V", - garbageValue = "338" + descriptor = "(II)Llb;", + garbageValue = "-2124586789" ) - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 9242 - int var5 = var0.height; // L: 9243 - if (var0.widthAlignment == 0) { // L: 9244 - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 9245 - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 9246 - var0.width = var0.rawWidth * var1 >> 14; + public static PrivateChatMode method1287(int var0) { + PrivateChatMode[] var1 = FloorDecoration.method2989(); // L: 20 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 + PrivateChatMode var3 = var1[var2]; // L: 22 + if (var0 == var3.field3825) { + return var3; // L: 24 + } } - if (var0.heightAlignment == 0) { // L: 9247 - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 9248 - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; // L: 9249 + return null; // L: 28 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1737054142" + ) + public static void method1283() { + VarpDefinition.VarpDefinition_cached.clear(); // L: 46 + } // L: 47 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-500540968" + ) + static final void method1286() { + Object var10000 = null; // L: 133 + String var0 = "You can't add yourself to your own friend list"; + DevicePcmPlayerProvider.addGameMessage(30, "", var0); // L: 135 + } // L: 137 + + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1123050484" + ) + static final void method1285() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4901 4902 4909 + if (var0.plane == GrandExchangeOfferUnitPriceComparator.Client_plane && !var0.isFinished) { // L: 4903 + if (Client.cycle >= var0.cycleStart) { // L: 4904 + var0.advance(Client.field743); // L: 4905 + if (var0.isFinished) { // L: 4906 + var0.remove(); + } else { + ModeWhere.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 4907 + } + } + } else { + var0.remove(); + } } - if (var0.widthAlignment == 4) { // L: 9250 - var0.width = var0.height * var0.field2622 / var0.field2623; - } - - if (var0.heightAlignment == 4) { // L: 9251 - var0.height = var0.field2623 * var0.width / var0.field2622; - } - - if (var0.contentType == 1337) { // L: 9252 - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9253 - ScriptEvent var6 = new ScriptEvent(); // L: 9254 - var6.widget = var0; // L: 9255 - var6.args = var0.onResize; // L: 9256 - Client.scriptEvents.addFirst(var6); // L: 9257 - } - - } // L: 9259 + } // L: 4911 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 1f341347df..44933b9cca 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -1,12 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("fq") +@Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1668209919" + descriptor = "(S)I", + garbageValue = "128" ) + @Export("useRotation") int useRotation(); } diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 4b057e307b..dedaddcd77 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -1,45 +1,52 @@ import java.awt.Component; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bf") +@Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1614539885 + intValue = 507951149 ) + @Export("rotation") int rotation; MouseWheelHandler() { this.rotation = 0; // L: 8 } // L: 10 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "1793602712" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "-12" ) + @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1289798046" + descriptor = "(Ljava/awt/Component;S)V", + garbageValue = "13978" ) + @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1668209919" + descriptor = "(S)I", + garbageValue = "128" ) + @Export("useRotation") public synchronized int useRotation() { int var1 = this.rotation; // L: 26 this.rotation = 0; // L: 27 diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 4457279629..a47f80b962 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,326 +1,337 @@ +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("hx") +@ObfuscatedName("hk") +@Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1168420419 - ) - int field2513; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "[Lde;" - ) - RawSound[] rawSounds; - @ObfuscatedName("s") - short[] field2510; @ObfuscatedName("t") - byte[] field2507; - @ObfuscatedName("i") - byte[] field2509; - @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1306227375 + ) + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1308325501 + ) + int field2507; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lgo;" + descriptor = "[Ldo;" + ) + @Export("rawSounds") + RawSound[] rawSounds; + @ObfuscatedName("l") + short[] field2504; + @ObfuscatedName("m") + byte[] field2502; + @ObfuscatedName("z") + byte[] field2505; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "[Lgi;" ) MusicPatchNode2[] field2506; - @ObfuscatedName("x") - byte[] field2511; - @ObfuscatedName("w") - int[] field2512; + @ObfuscatedName("k") + byte[] field2509; + @ObfuscatedName("c") + int[] field2508; MusicPatch(byte[] var1) { - this.rawSounds = new RawSound[128]; // L: 21 - this.field2510 = new short[128]; // L: 22 - this.field2507 = new byte[128]; // L: 23 - this.field2509 = new byte[128]; // L: 24 - this.field2506 = new MusicPatchNode2[128]; // L: 25 - this.field2511 = new byte[128]; // L: 26 - this.field2512 = new int[128]; // L: 27 - Buffer var2 = new Buffer(var1); // L: 28 + this.rawSounds = new RawSound[128]; // L: 27 + this.field2504 = new short[128]; // L: 28 + this.field2502 = new byte[128]; // L: 29 + this.field2505 = new byte[128]; // L: 30 + this.field2506 = new MusicPatchNode2[128]; // L: 31 + this.field2509 = new byte[128]; // L: 32 + this.field2508 = new int[128]; // L: 33 + Buffer var2 = new Buffer(var1); // L: 34 int var3; - for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 + for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 35 36 } - byte[] var4 = new byte[var3]; // L: 31 + byte[] var4 = new byte[var3]; // L: 37 int var5; - for (var5 = 0; var5 < var3; ++var5) { // L: 32 + for (var5 = 0; var5 < var3; ++var5) { // L: 38 var4[var5] = var2.readByte(); } - ++var2.offset; // L: 33 - ++var3; // L: 34 - var5 = var2.offset; // L: 35 - var2.offset += var3; // L: 36 + ++var2.offset; // L: 39 + ++var3; // L: 40 + var5 = var2.offset; // L: 41 + var2.offset += var3; // L: 42 int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38 + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 43 44 } - byte[] var7 = new byte[var6]; // L: 39 + byte[] var7 = new byte[var6]; // L: 45 int var8; - for (var8 = 0; var8 < var6; ++var8) { // L: 40 + for (var8 = 0; var8 < var6; ++var8) { // L: 46 var7[var8] = var2.readByte(); } - ++var2.offset; // L: 41 - ++var6; // L: 42 - var8 = var2.offset; // L: 43 - var2.offset += var6; // L: 44 + ++var2.offset; // L: 47 + ++var6; // L: 48 + var8 = var2.offset; // L: 49 + var2.offset += var6; // L: 50 int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46 + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 51 52 } - byte[] var10 = new byte[var9]; // L: 47 + byte[] var10 = new byte[var9]; // L: 53 - for (int var11 = 0; var11 < var9; ++var11) { // L: 48 + for (int var11 = 0; var11 < var9; ++var11) { // L: 54 var10[var11] = var2.readByte(); } - ++var2.offset; // L: 49 - ++var9; // L: 50 - byte[] var38 = new byte[var9]; // L: 51 + ++var2.offset; // L: 55 + ++var9; // L: 56 + byte[] var36 = new byte[var9]; // L: 57 int var12; int var14; - if (var9 > 1) { // L: 53 - var38[1] = 1; // L: 54 - int var13 = 1; // L: 55 - var12 = 2; // L: 56 + if (var9 > 1) { // L: 59 + var36[1] = 1; // L: 60 + int var13 = 1; // L: 61 + var12 = 2; // L: 62 - for (var14 = 2; var14 < var9; ++var14) { // L: 57 - int var43 = var2.readUnsignedByte(); // L: 58 - if (var43 == 0) { // L: 59 + for (var14 = 2; var14 < var9; ++var14) { // L: 63 + int var41 = var2.readUnsignedByte(); // L: 64 + if (var41 == 0) { // L: 65 var13 = var12++; } else { - if (var43 <= var13) { // L: 61 - --var43; + if (var41 <= var13) { // L: 67 + --var41; } - var13 = var43; // L: 62 + var13 = var41; // L: 68 } - var38[var14] = (byte)var13; // L: 64 + var36[var14] = (byte)var13; // L: 70 } } else { - var12 = var9; // L: 67 + var12 = var9; // L: 73 } - MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 68 + MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; // L: 74 MusicPatchNode2 var15; - for (var14 = 0; var14 < var39.length; ++var14) { // L: 69 - var15 = var39[var14] = new MusicPatchNode2(); // L: 70 - int var42 = var2.readUnsignedByte(); // L: 71 - if (var42 > 0) { // L: 72 - var15.field2426 = new byte[var42 * 2]; + for (var14 = 0; var14 < var37.length; ++var14) { // L: 75 + var15 = var37[var14] = new MusicPatchNode2(); // L: 76 + int var40 = var2.readUnsignedByte(); // L: 77 + if (var40 > 0) { // L: 78 + var15.field2423 = new byte[var40 * 2]; } - var42 = var2.readUnsignedByte(); // L: 73 - if (var42 > 0) { // L: 74 - var15.field2433 = new byte[var42 * 2 + 2]; // L: 75 - var15.field2433[1] = 64; // L: 76 + var40 = var2.readUnsignedByte(); // L: 79 + if (var40 > 0) { // L: 80 + var15.field2426 = new byte[var40 * 2 + 2]; // L: 81 + var15.field2426[1] = 64; // L: 82 } } - var14 = var2.readUnsignedByte(); // L: 79 - byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80 - var14 = var2.readUnsignedByte(); // L: 81 - byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82 + var14 = var2.readUnsignedByte(); // L: 85 + byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; // L: 86 + var14 = var2.readUnsignedByte(); // L: 87 + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 88 int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84 + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 89 90 } - byte[] var18 = new byte[var17]; // L: 85 + byte[] var18 = new byte[var17]; // L: 91 int var19; - for (var19 = 0; var19 < var17; ++var19) { // L: 86 + for (var19 = 0; var19 < var17; ++var19) { // L: 92 var18[var19] = var2.readByte(); } - ++var2.offset; // L: 87 - ++var17; // L: 88 - var19 = 0; // L: 89 + ++var2.offset; // L: 93 + ++var17; // L: 94 + var19 = 0; // L: 95 int var20; - for (var20 = 0; var20 < 128; ++var20) { // L: 90 - var19 += var2.readUnsignedByte(); // L: 91 - this.field2510[var20] = (short)var19; // L: 92 + for (var20 = 0; var20 < 128; ++var20) { // L: 96 + var19 += var2.readUnsignedByte(); // L: 97 + this.field2504[var20] = (short)var19; // L: 98 } - var19 = 0; // L: 94 + var19 = 0; // L: 100 - short[] var50; - for (var20 = 0; var20 < 128; ++var20) { // L: 95 - var19 += var2.readUnsignedByte(); // L: 96 - var50 = this.field2510; // L: 97 - var50[var20] = (short)(var50[var20] + (var19 << 8)); + short[] var48; + for (var20 = 0; var20 < 128; ++var20) { // L: 101 + var19 += var2.readUnsignedByte(); // L: 102 + var48 = this.field2504; // L: 103 + var48[var20] = (short)(var48[var20] + (var19 << 8)); } - var20 = 0; // L: 99 - int var21 = 0; // L: 100 - int var22 = 0; // L: 101 + var20 = 0; // L: 105 + int var21 = 0; // L: 106 + int var22 = 0; // L: 107 int var23; - for (var23 = 0; var23 < 128; ++var23) { // L: 102 - if (var20 == 0) { // L: 103 - if (var21 < var18.length) { // L: 104 + for (var23 = 0; var23 < 128; ++var23) { // L: 108 + if (var20 == 0) { // L: 109 + if (var21 < var18.length) { // L: 110 var20 = var18[var21++]; } else { - var20 = -1; // L: 105 + var20 = -1; // L: 111 } - var22 = var2.readVarInt(); // L: 106 + var22 = var2.readVarInt(); // L: 112 } - var50 = this.field2510; // L: 108 - var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); - this.field2512[var23] = var22; // L: 109 - --var20; // L: 110 + var48 = this.field2504; // L: 114 + var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); + this.field2508[var23] = var22; // L: 115 + --var20; // L: 116 } - var20 = 0; // L: 112 - var21 = 0; // L: 113 - var23 = 0; // L: 114 + var20 = 0; // L: 118 + var21 = 0; // L: 119 + var23 = 0; // L: 120 int var24; - for (var24 = 0; var24 < 128; ++var24) { // L: 115 - if (this.field2512[var24] != 0) { // L: 116 - if (var20 == 0) { // L: 117 - if (var21 < var4.length) { // L: 118 + for (var24 = 0; var24 < 128; ++var24) { // L: 121 + if (this.field2508[var24] != 0) { // L: 122 + if (var20 == 0) { // L: 123 + if (var21 < var4.length) { // L: 124 var20 = var4[var21++]; } else { - var20 = -1; // L: 119 + var20 = -1; // L: 125 } - var23 = var2.array[var5++] - 1; // L: 120 + var23 = var2.array[var5++] - 1; // L: 126 } - this.field2511[var24] = (byte)var23; // L: 122 - --var20; // L: 123 + this.field2509[var24] = (byte)var23; // L: 128 + --var20; // L: 129 } } - var20 = 0; // L: 125 - var21 = 0; // L: 126 - var24 = 0; // L: 127 + var20 = 0; // L: 131 + var21 = 0; // L: 132 + var24 = 0; // L: 133 - for (int var25 = 0; var25 < 128; ++var25) { // L: 128 - if (this.field2512[var25] != 0) { // L: 129 - if (var20 == 0) { // L: 130 - if (var21 < var7.length) { // L: 131 + for (int var25 = 0; var25 < 128; ++var25) { // L: 134 + if (this.field2508[var25] != 0) { // L: 135 + if (var20 == 0) { // L: 136 + if (var21 < var7.length) { // L: 137 var20 = var7[var21++]; } else { - var20 = -1; // L: 132 + var20 = -1; // L: 138 } - var24 = var2.array[var8++] + 16 << 2; // L: 133 + var24 = var2.array[var8++] + 16 << 2; // L: 139 } - this.field2509[var25] = (byte)var24; // L: 135 - --var20; // L: 136 + this.field2505[var25] = (byte)var24; // L: 141 + --var20; // L: 142 } } - var20 = 0; // L: 138 - var21 = 0; // L: 139 - MusicPatchNode2 var40 = null; // L: 140 + var20 = 0; // L: 144 + var21 = 0; // L: 145 + MusicPatchNode2 var38 = null; // L: 146 int var26; - for (var26 = 0; var26 < 128; ++var26) { // L: 141 - if (this.field2512[var26] != 0) { // L: 142 - if (var20 == 0) { // L: 143 - var40 = var39[var38[var21]]; // L: 144 - if (var21 < var10.length) { // L: 145 + for (var26 = 0; var26 < 128; ++var26) { // L: 147 + if (this.field2508[var26] != 0) { // L: 148 + if (var20 == 0) { // L: 149 + var38 = var37[var36[var21]]; // L: 150 + if (var21 < var10.length) { // L: 151 var20 = var10[var21++]; } else { - var20 = -1; // L: 146 + var20 = -1; // L: 152 } } - this.field2506[var26] = var40; // L: 148 - --var20; // L: 149 + this.field2506[var26] = var38; // L: 154 + --var20; // L: 155 } } - var20 = 0; // L: 151 - var21 = 0; // L: 152 - var26 = 0; // L: 153 + var20 = 0; // L: 157 + var21 = 0; // L: 158 + var26 = 0; // L: 159 int var27; - for (var27 = 0; var27 < 128; ++var27) { // L: 154 - if (var20 == 0) { // L: 155 - if (var21 < var18.length) { // L: 156 + for (var27 = 0; var27 < 128; ++var27) { // L: 160 + if (var20 == 0) { // L: 161 + if (var21 < var18.length) { // L: 162 var20 = var18[var21++]; } else { - var20 = -1; // L: 157 + var20 = -1; // L: 163 } - if (this.field2512[var27] > 0) { // L: 158 + if (this.field2508[var27] > 0) { // L: 164 var26 = var2.readUnsignedByte() + 1; } } - this.field2507[var27] = (byte)var26; // L: 160 - --var20; // L: 161 + this.field2502[var27] = (byte)var26; // L: 166 + --var20; // L: 167 } - this.field2513 = var2.readUnsignedByte() + 1; // L: 163 + this.field2507 = var2.readUnsignedByte() + 1; // L: 169 int var29; - MusicPatchNode2 var41; - for (var27 = 0; var27 < var12; ++var27) { // L: 164 - var41 = var39[var27]; // L: 165 - if (var41.field2426 != null) { // L: 166 - for (var29 = 1; var29 < var41.field2426.length; var29 += 2) { // L: 167 - var41.field2426[var29] = var2.readByte(); + MusicPatchNode2 var39; + for (var27 = 0; var27 < var12; ++var27) { // L: 170 + var39 = var37[var27]; // L: 171 + if (var39.field2423 != null) { // L: 172 + for (var29 = 1; var29 < var39.field2423.length; var29 += 2) { // L: 173 + var39.field2423[var29] = var2.readByte(); } } - if (var41.field2433 != null) { // L: 169 - for (var29 = 3; var29 < var41.field2433.length - 2; var29 += 2) { // L: 170 - var41.field2433[var29] = var2.readByte(); + if (var39.field2426 != null) { // L: 175 + for (var29 = 3; var29 < var39.field2426.length - 2; var29 += 2) { // L: 176 + var39.field2426[var29] = var2.readByte(); } } } - if (var44 != null) { // L: 173 - for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 174 - var44[var27] = var2.readByte(); + if (var42 != null) { // L: 179 + for (var27 = 1; var27 < var42.length; var27 += 2) { // L: 180 + var42[var27] = var2.readByte(); } } - if (var16 != null) { // L: 176 - for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177 + if (var16 != null) { // L: 182 + for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 183 var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 179 - var41 = var39[var27]; // L: 180 - if (var41.field2433 != null) { // L: 181 - var19 = 0; // L: 182 + for (var27 = 0; var27 < var12; ++var27) { // L: 185 + var39 = var37[var27]; // L: 186 + if (var39.field2426 != null) { // L: 187 + var19 = 0; // L: 188 - for (var29 = 2; var29 < var41.field2433.length; var29 += 2) { // L: 183 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184 - var41.field2433[var29] = (byte)var19; // L: 185 + for (var29 = 2; var29 < var39.field2426.length; var29 += 2) { // L: 189 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 190 + var39.field2426[var29] = (byte)var19; // L: 191 } } } - for (var27 = 0; var27 < var12; ++var27) { // L: 189 - var41 = var39[var27]; // L: 190 - if (var41.field2426 != null) { // L: 191 - var19 = 0; // L: 192 + for (var27 = 0; var27 < var12; ++var27) { // L: 195 + var39 = var37[var27]; // L: 196 + if (var39.field2423 != null) { // L: 197 + var19 = 0; // L: 198 - for (var29 = 2; var29 < var41.field2426.length; var29 += 2) { // L: 193 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 - var41.field2426[var29] = (byte)var19; // L: 195 + for (var29 = 2; var29 < var39.field2423.length; var29 += 2) { // L: 199 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 200 + var39.field2423[var29] = (byte)var19; // L: 201 } } } @@ -329,45 +340,41 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var35; - int var36; - int var47; - byte var49; - if (var44 != null) { // L: 199 - var19 = var2.readUnsignedByte(); // L: 200 - var44[0] = (byte)var19; // L: 201 + int var45; + byte var47; + if (var42 != null) { + var19 = var2.readUnsignedByte(); + var42[0] = (byte)var19; // L: 207 - for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 202 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203 - var44[var27] = (byte)var19; // L: 204 + for (var27 = 2; var27 < var42.length; var27 += 2) { + var19 = 1 + var19 + var2.readUnsignedByte(); + var42[var27] = (byte)var19; // L: 210 } - var49 = var44[0]; // L: 206 - byte var28 = var44[1]; // L: 207 + var47 = var42[0]; // L: 212 + byte var28 = var42[1]; // L: 213 - for (var29 = 0; var29 < var49; ++var29) { // L: 208 - this.field2507[var29] = (byte)(var28 * this.field2507[var29] + 32 >> 6); + for (var29 = 0; var29 < var47; ++var29) { // L: 214 + this.field2502[var29] = (byte)(var28 * this.field2502[var29] + 32 >> 6); } - for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 209 210 227 - var30 = var44[var29]; // L: 211 - byte var31 = var44[var29 + 1]; // L: 212 - var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 213 + for (var29 = 2; var29 < var42.length; var29 += 2) { // L: 215 216 227 + var30 = var42[var29]; // L: 217 + byte var31 = var42[var29 + 1]; // L: 218 + var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 219 - for (var33 = var49; var33 < var30; ++var33) { // L: 214 - var35 = var30 - var49; // L: 216 - var36 = var32 >>> 31; // L: 218 - var34 = (var32 + var36) / var35 - var36; // L: 219 - this.field2507[var33] = (byte)(var34 * this.field2507[var33] + 32 >> 6); // L: 222 + for (var33 = var47; var33 < var30; ++var33) { // L: 220 + var34 = SecureRandomCallable.method1238(var32, var30 - var47); // L: 221 + this.field2502[var33] = (byte)(var34 * this.field2502[var33] + 32 >> 6); // L: 222 var32 += var31 - var28; // L: 223 } - var49 = var30; // L: 225 + var47 = var30; // L: 225 var28 = var31; // L: 226 } - for (var47 = var49; var47 < 128; ++var47) { // L: 229 - this.field2507[var47] = (byte)(var28 * this.field2507[var47] + 32 >> 6); + for (var45 = var47; var45 < 128; ++var45) { // L: 229 + this.field2502[var45] = (byte)(var28 * this.field2502[var45] + 32 >> 6); } var15 = null; // L: 230 @@ -378,185 +385,626 @@ public class MusicPatch extends Node { var16[0] = (byte)var19; // L: 234 for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 236 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 236 var16[var27] = (byte)var19; // L: 237 } - var49 = var16[0]; // L: 239 - int var46 = var16[1] << 1; // L: 240 + var47 = var16[0]; // L: 239 + int var44 = var16[1] << 1; // L: 240 - for (var29 = 0; var29 < var49; ++var29) { // L: 241 - var47 = var46 + (this.field2509[var29] & 255); // L: 242 - if (var47 < 0) { // L: 243 - var47 = 0; + for (var29 = 0; var29 < var47; ++var29) { // L: 241 + var45 = var44 + (this.field2505[var29] & 255); // L: 242 + if (var45 < 0) { // L: 243 + var45 = 0; } - if (var47 > 128) { // L: 244 - var47 = 128; + if (var45 > 128) { // L: 244 + var45 = 128; } - this.field2509[var29] = (byte)var47; // L: 245 + this.field2505[var29] = (byte)var45; // L: 245 } - int var48; - for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 268 + int var46; + for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 262 var30 = var16[var29]; // L: 249 - var48 = var16[var29 + 1] << 1; // L: 250 - var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 251 + var46 = var16[var29 + 1] << 1; // L: 250 + var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 251 - for (var33 = var49; var33 < var30; ++var33) { // L: 252 - var35 = var30 - var49; // L: 254 - var36 = var32 >>> 31; // L: 256 - var34 = (var32 + var36) / var35 - var36; // L: 257 - int var37 = var34 + (this.field2509[var33] & 255); // L: 260 - if (var37 < 0) { // L: 261 - var37 = 0; + for (var33 = var47; var33 < var30; ++var33) { // L: 252 + var34 = SecureRandomCallable.method1238(var32, var30 - var47); // L: 253 + int var35 = var34 + (this.field2505[var33] & 255); // L: 254 + if (var35 < 0) { // L: 255 + var35 = 0; } - if (var37 > 128) { // L: 262 - var37 = 128; + if (var35 > 128) { // L: 256 + var35 = 128; } - this.field2509[var33] = (byte)var37; // L: 263 - var32 += var48 - var46; // L: 264 + this.field2505[var33] = (byte)var35; // L: 257 + var32 += var46 - var44; // L: 258 } - var49 = var30; // L: 266 - var46 = var48; // L: 267 + var47 = var30; // L: 260 + var44 = var46; // L: 261 } - for (var47 = var49; var47 < 128; ++var47) { // L: 270 - var48 = var46 + (this.field2509[var47] & 255); // L: 271 - if (var48 < 0) { // L: 272 - var48 = 0; + for (var45 = var47; var45 < 128; ++var45) { // L: 264 + var46 = var44 + (this.field2505[var45] & 255); // L: 265 + if (var46 < 0) { // L: 266 + var46 = 0; } - if (var48 > 128) { // L: 273 - var48 = 128; + if (var46 > 128) { // L: 267 + var46 = 128; } - this.field2509[var47] = (byte)var48; // L: 274 + this.field2505[var45] = (byte)var46; // L: 268 } - Object var45 = null; // L: 276 + Object var43 = null; // L: 270 } - for (var27 = 0; var27 < var12; ++var27) { // L: 278 - var39[var27].field2425 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 272 + var37[var27].field2419 = var2.readUnsignedByte(); + } + + for (var27 = 0; var27 < var12; ++var27) { // L: 273 + var39 = var37[var27]; // L: 274 + if (var39.field2423 != null) { // L: 275 + var39.field2420 = var2.readUnsignedByte(); + } + + if (var39.field2426 != null) { // L: 276 + var39.field2421 = var2.readUnsignedByte(); + } + + if (var39.field2419 > 0) { // L: 277 + var39.field2422 = var2.readUnsignedByte(); + } } for (var27 = 0; var27 < var12; ++var27) { // L: 279 - var41 = var39[var27]; // L: 280 - if (var41.field2426 != null) { // L: 281 - var41.field2427 = var2.readUnsignedByte(); - } + var37[var27].field2424 = var2.readUnsignedByte(); + } - if (var41.field2433 != null) { // L: 282 - var41.field2428 = var2.readUnsignedByte(); - } - - if (var41.field2425 > 0) { // L: 283 - var41.field2429 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 280 + var39 = var37[var27]; // L: 281 + if (var39.field2424 > 0) { // L: 282 + var39.field2418 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 285 - var39[var27].field2431 = var2.readUnsignedByte(); - } - - for (var27 = 0; var27 < var12; ++var27) { // L: 286 - var41 = var39[var27]; // L: 287 - if (var41.field2431 > 0) { // L: 288 - var41.field2430 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 284 + var39 = var37[var27]; // L: 285 + if (var39.field2418 > 0) { // L: 286 + var39.field2425 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 290 - var41 = var39[var27]; // L: 291 - if (var41.field2430 > 0) { // L: 292 - var41.field2432 = var2.readUnsignedByte(); - } - } + } // L: 288 - } // L: 294 - - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(Lds;[B[IB)Z", - garbageValue = "-93" + garbageValue = "-125" ) - boolean method3979(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; // L: 297 - int var5 = 0; // L: 298 - RawSound var6 = null; // L: 299 + boolean method4026(SoundCache var1, byte[] var2, int[] var3) { + boolean var4 = true; // L: 291 + int var5 = 0; // L: 292 + RawSound var6 = null; // L: 293 - for (int var7 = 0; var7 < 128; ++var7) { // L: 300 - if (var2 == null || var2[var7] != 0) { // L: 301 - int var8 = this.field2512[var7]; // L: 302 - if (var8 != 0) { // L: 303 - if (var8 != var5) { // L: 304 - var5 = var8--; // L: 305 306 - if ((var8 & 1) == 0) { // L: 307 + for (int var7 = 0; var7 < 128; ++var7) { // L: 294 + if (var2 == null || var2[var7] != 0) { // L: 295 + int var8 = this.field2508[var7]; // L: 296 + if (var8 != 0) { // L: 297 + if (var8 != var5) { // L: 298 + var5 = var8--; // L: 299 300 + if ((var8 & 1) == 0) { // L: 301 var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); // L: 308 + var6 = var1.getMusicSample(var8 >> 2, var3); // L: 302 } - if (var6 == null) { // L: 309 + if (var6 == null) { // L: 303 var4 = false; } } - if (var6 != null) { // L: 311 - this.rawSounds[var7] = var6; // L: 312 - this.field2512[var7] = 0; // L: 313 + if (var6 != null) { // L: 305 + this.rawSounds[var7] = var6; // L: 306 + this.field2508[var7] = 0; // L: 307 } } } } - return var4; // L: 317 + return var4; // L: 311 } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "25153" + descriptor = "(I)V", + garbageValue = "793986731" ) + @Export("clear") void clear() { - this.field2512 = null; // L: 321 - } // L: 322 + this.field2508 = null; // L: 315 + } // L: 316 - @ObfuscatedName("ib") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lhq;I)Z", - garbageValue = "-2027629220" + descriptor = "(IB)Z", + garbageValue = "87" ) - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 9332 - return false; + public static boolean method4039(int var0) { + return (var0 >> 20 & 1) != 0; // L: 17 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1645227256" + ) + static void method4038() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 203 + if (GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername != null) { // L: 204 + Login.Login_username = GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername; // L: 205 + Client.Login_isUsernameRemembered = true; // L: 206 + } else { + Client.Login_isUsernameRemembered = false; // L: 208 + } + + } + } // L: 209 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "733181439" + ) + static int method4036(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 3470 + var3 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 3471 + int var15 = (PlayerType.localPlayer.x >> 7) + FloorDecoration.baseX; // L: 3472 + int var8 = (PlayerType.localPlayer.y >> 7) + WorldMapData_0.baseY; // L: 3473 + Canvas.getWorldMap().method6464(var3, var15, var8, true); // L: 3474 + return 1; // L: 3475 } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 9333 - int var2 = GrandExchangeOfferNameComparator.method230(var0, var1); // L: 9334 - int var3 = var0.cs1ComparisonValues[var1]; // L: 9335 - if (var0.cs1Comparisons[var1] == 2) { // L: 9336 - if (var2 >= var3) { // L: 9337 - return false; + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3477 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3478 + String var16 = ""; // L: 3479 + var9 = Canvas.getWorldMap().getMapArea(var3); // L: 3480 + if (var9 != null) { // L: 3481 + var16 = var9.getExternalName(); // L: 3482 + } + + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var16; // L: 3484 + return 1; // L: 3485 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3487 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3488 + Canvas.getWorldMap().setCurrentMapAreaId(var3); // L: 3489 + return 1; // L: 3490 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3492 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getZoomLevel(); // L: 3493 + return 1; // L: 3494 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3496 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3497 + Canvas.getWorldMap().setZoomPercentage(var3); // L: 3498 + return 1; // L: 3499 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3501 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3502 + return 1; // L: 3503 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3505 + var14 = new Coord(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3506 + Canvas.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3507 + return 1; // L: 3508 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3510 + var14 = new Coord(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3511 + Canvas.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3512 + return 1; // L: 3513 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3515 + var14 = new Coord(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3516 + Canvas.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3517 + return 1; // L: 3518 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3520 + var14 = new Coord(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3521 + Canvas.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3522 + return 1; // L: 3523 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3525 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayX(); // L: 3526 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayY(); // L: 3527 + return 1; // L: 3528 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3530 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3531 + var11 = Canvas.getWorldMap().getMapArea(var3); // L: 3532 + if (var11 == null) { // L: 3533 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3534 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3537 + } + + return 1; // L: 3539 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3541 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3542 + var11 = Canvas.getWorldMap().getMapArea(var3); // L: 3543 + if (var11 == null) { // L: 3544 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3545 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3546 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3549 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3550 + } + + return 1; // L: 3552 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3554 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3555 + var11 = Canvas.getWorldMap().getMapArea(var3); // L: 3556 + if (var11 == null) { // L: 3557 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3558 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3559 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3560 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3561 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3564 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3565 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3566 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3567 + } + + return 1; // L: 3569 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3571 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3572 + var11 = Canvas.getWorldMap().getMapArea(var3); // L: 3573 + if (var11 == null) { // L: 3574 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3575 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3578 + } + + return 1; // L: 3580 + } else if (var0 == 6615) { // L: 3582 + var14 = Canvas.getWorldMap().getDisplayCoord(); // L: 3583 + if (var14 == null) { // L: 3584 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3585 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3586 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var14.x; // L: 3589 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var14.y; // L: 3590 + } + + return 1; // L: 3592 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3594 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().currentMapAreaId(); // L: 3595 + return 1; // L: 3596 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3598 + var14 = new Coord(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3599 + var11 = Canvas.getWorldMap().getCurrentMapArea(); // L: 3600 + if (var11 == null) { // L: 3601 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3602 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3603 + return 1; // L: 3604 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3606 + if (var12 == null) { // L: 3607 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3608 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3609 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var12[0]; // L: 3612 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var12[1]; // L: 3613 + } + + return 1; // L: 3615 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 3617 + var14 = new Coord(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3618 + var11 = Canvas.getWorldMap().getCurrentMapArea(); // L: 3619 + if (var11 == null) { // L: 3620 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3621 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3622 + return 1; // L: 3623 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 3625 + if (var5 == null) { // L: 3626 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3627 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var5.packed(); // L: 3630 + } + + return 1; // L: 3632 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 3634 + MilliClock.Interpreter_intStackSize -= 2; // L: 3635 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3636 + var10 = new Coord(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 3637 + WorldMapData_1.method796(var3, var10, false); // L: 3638 + return 1; // L: 3639 + } else if (var0 == 6620) { // L: 3641 + MilliClock.Interpreter_intStackSize -= 2; // L: 3642 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3643 + var10 = new Coord(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 3644 + WorldMapData_1.method796(var3, var10, true); // L: 3645 + return 1; // L: 3646 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3648 + MilliClock.Interpreter_intStackSize -= 2; // L: 3649 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3650 + var10 = new Coord(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 3651 + var9 = Canvas.getWorldMap().getMapArea(var3); // L: 3652 + if (var9 == null) { // L: 3653 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3654 + return 1; // L: 3655 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3657 + return 1; // L: 3658 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3660 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayWith(); // L: 3661 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getDisplayHeight(); // L: 3662 + return 1; // L: 3663 + } else if (var0 == 6623) { // L: 3665 + var14 = new Coord(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3666 + var11 = Canvas.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3667 + if (var11 == null) { // L: 3668 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3669 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var11.getId(); // L: 3672 + } + + return 1; // L: 3674 + } else if (var0 == 6624) { // L: 3676 + Canvas.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3677 + return 1; // L: 3678 + } else if (var0 == 6625) { // L: 3680 + Canvas.getWorldMap().resetMaxFlashCount(); // L: 3681 + return 1; // L: 3682 + } else if (var0 == 6626) { // L: 3684 + Canvas.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 3685 + return 1; // L: 3686 + } else if (var0 == 6627) { // L: 3688 + Canvas.getWorldMap().resetCyclesPerFlash(); // L: 3689 + return 1; // L: 3690 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 3692 + var13 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 3693 + Canvas.getWorldMap().setPerpetualFlash(var13); // L: 3694 + return 1; // L: 3695 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 3697 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3698 + Canvas.getWorldMap().flashElement(var3); // L: 3699 + return 1; // L: 3700 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 3702 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3703 + Canvas.getWorldMap().flashCategory(var3); // L: 3704 + return 1; // L: 3705 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 3707 + Canvas.getWorldMap().stopCurrentFlashes(); // L: 3708 + return 1; // L: 3709 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 3711 + var13 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 3712 + Canvas.getWorldMap().setElementsDisabled(var13); // L: 3713 + return 1; // L: 3714 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 3716 + MilliClock.Interpreter_intStackSize -= 2; // L: 3717 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3718 + var7 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1] == 1; // L: 3719 + Canvas.getWorldMap().disableElement(var3, var7); // L: 3720 + return 1; // L: 3721 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 3723 + MilliClock.Interpreter_intStackSize -= 2; // L: 3724 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3725 + var7 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1] == 1; // L: 3726 + Canvas.getWorldMap().setCategoryDisabled(var3, var7); // L: 3727 + return 1; // L: 3728 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 3730 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 3731 + return 1; // L: 3732 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 3734 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3735 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 3736 + return 1; // L: 3737 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 3739 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3740 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Canvas.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 3741 + return 1; // L: 3742 + } else if (var0 == 6638) { // L: 3744 + MilliClock.Interpreter_intStackSize -= 2; // L: 3745 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3746 + var10 = new Coord(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 3747 + var5 = Canvas.getWorldMap().method6481(var3, var10); // L: 3748 + if (var5 == null) { // L: 3749 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3750 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var5.packed(); // L: 3753 + } + + return 1; // L: 3755 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 3757 + var6 = Canvas.getWorldMap().iconStart(); // L: 3758 + if (var6 == null) { // L: 3759 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3760 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3761 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3764 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3765 + } + + return 1; // L: 3767 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 3769 + var6 = Canvas.getWorldMap().iconNext(); // L: 3770 + if (var6 == null) { // L: 3771 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3772 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3773 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3776 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3777 + } + + return 1; // L: 3779 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 3781 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3782 + var4 = class194.WorldMapElement_get(var3); // L: 3783 + if (var4.name == null) { // L: 3784 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 3785 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var4.name; // L: 3788 + } + + return 1; // L: 3790 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 3792 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3793 + var4 = class194.WorldMapElement_get(var3); // L: 3794 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.textSize; // L: 3795 + return 1; // L: 3796 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 3798 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3799 + var4 = class194.WorldMapElement_get(var3); // L: 3800 + if (var4 == null) { // L: 3801 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3802 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.category; // L: 3805 + } + + return 1; // L: 3807 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 3809 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3810 + var4 = class194.WorldMapElement_get(var3); // L: 3811 + if (var4 == null) { // L: 3812 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3813 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.sprite1; // L: 3816 + } + + return 1; // L: 3818 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 3820 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapSection0.worldMapEvent.mapElement; // L: 3821 + return 1; // L: 3822 + } else if (var0 == 6698) { // L: 3824 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapSection0.worldMapEvent.coord1.packed(); // L: 3825 + return 1; // L: 3826 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 3828 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapSection0.worldMapEvent.coord2.packed(); // L: 3829 + return 1; // L: 3830 + } else { + return 2; // L: 3832 + } + } + } + } + } + } } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 9339 - if (var2 <= var3) { // L: 9340 - return false; + } + } + } + } + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(ZLks;B)V", + garbageValue = "44" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field802 = 0; // L: 7460 + Client.field726 = 0; // L: 7461 + PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 7463 + var2.importIndex(); // L: 7464 + int var3 = var2.readBits(8); // L: 7465 + int var4; + if (var3 < Client.npcCount) { // L: 7466 + for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 7467 + Client.field803[++Client.field802 - 1] = Client.npcIndices[var4]; + } + } + + if (var3 > Client.npcCount) { // L: 7469 + throw new RuntimeException(""); + } else { + Client.npcCount = 0; // L: 7470 + + for (var4 = 0; var4 < var3; ++var4) { // L: 7471 + int var5 = Client.npcIndices[var4]; // L: 7472 + NPC var6 = Client.npcs[var5]; // L: 7473 + int var7 = var2.readBits(1); // L: 7474 + if (var7 == 0) { // L: 7475 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7476 + var6.npcCycle = Client.cycle; // L: 7477 + } else { + int var8 = var2.readBits(2); // L: 7480 + if (var8 == 0) { // L: 7481 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7482 + var6.npcCycle = Client.cycle; // L: 7483 + Client.field727[++Client.field726 - 1] = var5; // L: 7484 + } else { + int var9; + int var10; + if (var8 == 1) { // L: 7487 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7488 + var6.npcCycle = Client.cycle; // L: 7489 + var9 = var2.readBits(3); // L: 7490 + var6.method2150(var9, (byte)1); // L: 7491 + var10 = var2.readBits(1); // L: 7492 + if (var10 == 1) { // L: 7493 + Client.field727[++Client.field726 - 1] = var5; + } + } else if (var8 == 2) { // L: 7496 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7497 + var6.npcCycle = Client.cycle; // L: 7498 + var9 = var2.readBits(3); // L: 7499 + var6.method2150(var9, (byte)2); // L: 7500 + var10 = var2.readBits(3); // L: 7501 + var6.method2150(var10, (byte)2); // L: 7502 + int var11 = var2.readBits(1); // L: 7503 + if (var11 == 1) { // L: 7504 + Client.field727[++Client.field726 - 1] = var5; + } + } else if (var8 == 3) { // L: 7507 + Client.field803[++Client.field802 - 1] = var5; // L: 7508 + } } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 9342 - if (var2 == var3) { // L: 9343 - return false; - } - } else if (var3 != var2) { // L: 9345 - return false; } } - return true; // L: 9347 + WorldMapCacheName.method724(var0, var1); // L: 7513 + SoundSystem.method2632(var1); // L: 7514 + + int var12; + for (var12 = 0; var12 < Client.field802; ++var12) { // L: 7515 + var3 = Client.field803[var12]; // L: 7516 + if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 7517 + Client.npcs[var3].definition = null; // L: 7518 + Client.npcs[var3] = null; // L: 7519 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7522 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var12 = 0; var12 < Client.npcCount; ++var12) { // L: 7523 + if (Client.npcs[Client.npcIndices[var12]] == null) { // L: 7524 + throw new RuntimeException(var12 + "," + Client.npcCount); // L: 7525 + } + } + + } } - } + } // L: 7528 } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 0405e8d6a7..fd7473367d 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -1,167 +1,153 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("hl") +@Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "[Lls;" - ) - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 2053658771 - ) - int field2484; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhx;" - ) - MusicPatch patch; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lde;" - ) - RawSound rawSound; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgo;" - ) - MusicPatchNode2 field2472; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 227260251 - ) - int field2473; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -648254967 - ) - int field2474; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 479011763 - ) - int field2475; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 2012218471 - ) - int field2481; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1638523819 - ) - int field2477; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -585277595 - ) - int field2487; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 3127069 - ) - int field2479; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1851085 - ) - int field2480; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 2137879269 - ) - int field2478; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 310302327 - ) - int field2482; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -308754063 - ) - int field2483; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1275885009 - ) - int field2489; + @ObfuscatedName("dv") + @Export("mouseCam") + static boolean mouseCam; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 586999213 + intValue = 648896771 + ) + int field2479; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lhk;" + ) + @Export("patch") + MusicPatch patch; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ldo;" + ) + @Export("rawSound") + RawSound rawSound; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgi;" + ) + MusicPatchNode2 field2464; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -567152179 + ) + int field2468; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 63217979 + ) + int field2466; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1531269935 + ) + int field2469; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -2019958227 + ) + int field2465; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -441601487 + ) + int field2472; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2122667109 + ) + int field2470; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 419759473 + ) + int field2474; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1747326149 + ) + int field2475; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1604412873 + ) + int field2476; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -481757253 + ) + int field2477; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1285265109 + ) + int field2473; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1335006663 ) int field2485; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1374963465 + intValue = -46018309 ) - int field2469; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Ldm;" + int field2480; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -39925853 ) - RawPcmStream stream; + int field2467; @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 993070793 + @ObfuscatedSignature( + descriptor = "Ldx;" ) - int field2488; - @ObfuscatedName("u") + @Export("stream") + RawPcmStream stream; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -178085679 + intValue = -631500041 ) - int field2486; + int field2483; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1318550711 + ) + int field2484; MusicPatchNode() { } // L: 31 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "10823" + descriptor = "(I)V", + garbageValue = "1941368303" ) - void method3926() { + void method3971() { this.patch = null; // L: 34 this.rawSound = null; // L: 35 - this.field2472 = null; // L: 36 + this.field2464 = null; // L: 36 this.stream = null; // L: 37 } // L: 38 - @ObfuscatedName("z") + @ObfuscatedName("gf") @ObfuscatedSignature( - descriptor = "(IB)Ljd;", - garbageValue = "-111" + descriptor = "(I)V", + garbageValue = "1392160704" ) - public static HitSplatDefinition method3929(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46 - if (var1 != null) { // L: 47 - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 48 - var1 = new HitSplatDefinition(); // L: 49 - if (var2 != null) { // L: 50 - var1.decode(new Buffer(var2)); + static void method3973() { + int var0 = Players.Players_count; // L: 4821 + int[] var1 = Players.Players_indices; // L: 4822 + + for (int var2 = 0; var2 < var0; ++var2) { // L: 4823 + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4824 + ArchiveLoader.addPlayerToScene(Client.players[var1[var2]], true); // L: 4825 } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51 - return var1; // L: 52 } - } - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-27" - ) - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 10695 - PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 10697 - var1.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0)); // L: 10698 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 10699 - Client.packetWriter.addNode(var1); // L: 10700 - } - } // L: 10701 + } // L: 4827 } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 8492139e74..64e7ac55ae 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,54 +1,86 @@ +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("go") +@ObfuscatedName("gi") +@Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("z") + @ObfuscatedName("f") + byte[] field2423; + @ObfuscatedName("b") byte[] field2426; - @ObfuscatedName("k") - byte[] field2433; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1592616107 + intValue = -261303639 + ) + int field2419; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -689759697 + ) + int field2420; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 164653841 + ) + int field2421; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 2055857397 + ) + int field2422; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1633678853 + ) + int field2418; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -451863831 + ) + int field2424; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -354420263 ) int field2425; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1659545793 - ) - int field2427; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 797409947 - ) - int field2428; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 172516803 - ) - int field2429; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1393523029 - ) - int field2430; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 369539099 - ) - int field2431; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1425584275 - ) - int field2432; MusicPatchNode2() { } // L: 14 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "-19" + ) + public static int method3831(int var0, int var1, int var2) { + var2 &= 3; // L: 17 + if (var2 == 0) { // L: 18 + return var1; + } else if (var2 == 1) { // L: 19 + return 7 - var0; + } else { + return var2 == 2 ? 7 - var1 : var0; // L: 20 + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lht;II)V", + garbageValue = "1909237816" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2668 == null) { // L: 934 + throw new RuntimeException(); // L: 935 + } else { + if (var0.field2594 == null) { // L: 937 + var0.field2594 = new int[var0.field2668.length]; // L: 938 + } + + var0.field2594[var1] = Integer.MAX_VALUE; // L: 940 + } + } // L: 941 } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index cc80ded676..0c7cb59609 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,31 +1,37 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hb") +@ObfuscatedName("hz") +@Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("ar") + @ObfuscatedName("t") + public static short[][] field2516; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llr;" - ) - static Bounds field2519; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgv;" ) + @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lja;" ) + @Export("queue") NodeDeque queue; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Ldf;" ) + @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lge;)V" + descriptor = "(Lgv;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); // L: 11 @@ -33,106 +39,108 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; // L: 15 } // L: 16 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhe;[IIIII)V", - garbageValue = "770177978" + descriptor = "(Lhl;[IIIII)V", + garbageValue = "1431385490" ) - void method3993(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2453[var1.field2484] & 4) != 0 && var1.field2483 < 0) { // L: 73 - int var6 = this.superStream.field2442[var1.field2484] / PcmPlayer.field1447; // L: 74 + void method4046(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2449[var1.field2479] & 4) != 0 && var1.field2473 < 0) { + int var6 = this.superStream.field2454[var1.field2479] / PcmPlayer.field1442; while (true) { - int var7 = (var6 + 1048575 - var1.field2486) / var6; // L: 76 + int var7 = (var6 + 1048575 - var1.field2484) / var6; // L: 76 if (var7 > var4) { // L: 77 - var1.field2486 += var4 * var6; // L: 99 + var1.field2484 += var4 * var6; // L: 99 break; } - var1.stream.fill(var2, var3, var7); // L: 78 - var3 += var7; // L: 79 - var4 -= var7; // L: 80 - var1.field2486 += var7 * var6 - 1048576; // L: 81 - int var8 = PcmPlayer.field1447 / 100; // L: 82 - int var9 = 262144 / var6; // L: 83 + var1.stream.fill(var2, var3, var7); + var3 += var7; + var4 -= var7; + var1.field2484 += var7 * var6 - 1048576; + int var8 = PcmPlayer.field1442 / 100; + int var9 = 262144 / var6; if (var9 < var8) { // L: 84 var8 = var9; } - RawPcmStream var10 = var1.stream; // L: 85 - if (this.superStream.field2441[var1.field2484] == 0) { // L: 86 - var1.stream = RawPcmStream.method2638(var1.rawSound, var10.method2687(), var10.method2644(), var10.method2675()); // L: 87 + RawPcmStream var10 = var1.stream; + if (this.superStream.field2452[var1.field2479] == 0) { + var1.stream = RawPcmStream.method2683(var1.rawSound, var10.method2689(), var10.method2680(), var10.method2681()); } else { - var1.stream = RawPcmStream.method2638(var1.rawSound, var10.method2687(), 0, var10.method2675()); // L: 90 - this.superStream.method3817(var1, var1.patch.field2510[var1.field2474] < 0); // L: 91 - var1.stream.method2744(var8, var10.method2644()); // L: 92 + var1.stream = RawPcmStream.method2683(var1.rawSound, var10.method2689(), 0, var10.method2681()); + this.superStream.method3867(var1, var1.patch.field2504[var1.field2466] < 0); + var1.stream.method2721(var8, var10.method2680()); } - if (var1.patch.field2510[var1.field2474] < 0) { // L: 94 + if (var1.patch.field2504[var1.field2466] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method2681(var8); // L: 95 - var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method2655()) { // L: 97 + var10.method2687(var8); + var10.fill(var2, var3, var5 - var3); + if (var10.method2786()) { // L: 97 this.mixer.addSubStream(var10); } } } - var1.stream.fill(var2, var3, var4); // L: 101 + var1.stream.fill(var2, var3, var4); } // L: 102 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lhe;II)V", - garbageValue = "-1243702200" + descriptor = "(Lhl;IB)V", + garbageValue = "-29" ) - void method3998(MusicPatchNode var1, int var2) { - if ((this.superStream.field2453[var1.field2484] & 4) != 0 && var1.field2483 < 0) { // L: 105 - int var3 = this.superStream.field2442[var1.field2484] / PcmPlayer.field1447; // L: 106 - int var4 = (var3 + 1048575 - var1.field2486) / var3; // L: 107 - var1.field2486 = var3 * var2 + var1.field2486 & 1048575; // L: 108 - if (var4 <= var2) { // L: 109 - if (this.superStream.field2441[var1.field2484] == 0) { // L: 110 - var1.stream = RawPcmStream.method2638(var1.rawSound, var1.stream.method2687(), var1.stream.method2644(), var1.stream.method2675()); // L: 111 + void method4047(MusicPatchNode var1, int var2) { + if ((this.superStream.field2449[var1.field2479] & 4) != 0 && var1.field2473 < 0) { + int var3 = this.superStream.field2454[var1.field2479] / PcmPlayer.field1442; + int var4 = (var3 + 1048575 - var1.field2484) / var3; // L: 107 + var1.field2484 = var3 * var2 + var1.field2484 & 1048575; // L: 108 + if (var4 <= var2) { + if (this.superStream.field2452[var1.field2479] == 0) { + var1.stream = RawPcmStream.method2683(var1.rawSound, var1.stream.method2689(), var1.stream.method2680(), var1.stream.method2681()); // L: 111 } else { - var1.stream = RawPcmStream.method2638(var1.rawSound, var1.stream.method2687(), 0, var1.stream.method2675()); // L: 114 - this.superStream.method3817(var1, var1.patch.field2510[var1.field2474] < 0); // L: 115 + var1.stream = RawPcmStream.method2683(var1.rawSound, var1.stream.method2689(), 0, var1.stream.method2681()); + this.superStream.method3867(var1, var1.patch.field2504[var1.field2466] < 0); } - if (var1.patch.field2510[var1.field2474] < 0) { // L: 117 + if (var1.patch.field2504[var1.field2466] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2486 / var3; // L: 118 + var2 = var1.field2484 / var3; } } - var1.stream.skip(var2); // L: 121 + var1.stream.skip(var2); } // L: 122 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("firstSubStream") protected PcmStream firstSubStream() { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 - if (var1 == null) { // L: 20 - return null; + if (var1 == null) { + return null; // L: 20 } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22 } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { - var1 = (MusicPatchNode)this.queue.previous(); + var1 = (MusicPatchNode)this.queue.previous(); // L: 27 if (var1 == null) { return null; // L: 28 } @@ -141,77 +149,297 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("w") - protected int vmethod3987() { + @ObfuscatedName("c") + protected int vmethod4043() { return 0; // L: 34 } - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("fill") protected void fill(int[] var1, int var2, int var3) { - this.mixer.fill(var1, var2, var3); // L: 40 + this.mixer.fill(var1, var2, var3); - for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 - if (!this.superStream.method3838(var6)) { // L: 42 - int var4 = var2; // L: 43 + for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { + if (!this.superStream.method3889(var6)) { // L: 42 + int var4 = var2; int var5 = var3; // L: 44 do { - if (var5 <= var6.field2488) { // L: 45 - this.method3993(var6, var1, var4, var5, var5 + var4); // L: 51 - var6.field2488 -= var5; // L: 52 + if (var5 <= var6.field2483) { + this.method4046(var6, var1, var4, var5, var4 + var5); + var6.field2483 -= var5; // L: 52 break; } - this.method3993(var6, var1, var4, var6.field2488, var5 + var4); // L: 46 - var4 += var6.field2488; // L: 47 - var5 -= var6.field2488; // L: 48 - } while(!this.superStream.method3839(var6, var1, var4, var5)); // L: 49 + this.method4046(var6, var1, var4, var6.field2483, var5 + var4); + var4 += var6.field2483; // L: 47 + var5 -= var6.field2483; + } while(!this.superStream.method3877(var6, var1, var4, var5)); // L: 49 } } } // L: 54 - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("skip") protected void skip(int var1) { this.mixer.skip(var1); // L: 58 - for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 - if (!this.superStream.method3838(var3)) { // L: 60 - int var2 = var1; // L: 61 + for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { + if (!this.superStream.method3889(var3)) { // L: 60 + int var2 = var1; do { - if (var2 <= var3.field2488) { // L: 62 - this.method3998(var3, var2); // L: 67 - var3.field2488 -= var2; // L: 68 + if (var2 <= var3.field2483) { // L: 62 + this.method4047(var3, var2); + var3.field2483 -= var2; // L: 68 break; } - this.method3998(var3, var3.field2488); // L: 63 - var2 -= var3.field2488; // L: 64 - } while(!this.superStream.method3839(var3, (int[])null, 0, var2)); // L: 65 + this.method4047(var3, var3.field2483); + var2 -= var3.field2483; + } while(!this.superStream.method3877(var3, (int[])null, 0, var2)); } } - } // L: 70 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Liq;", - garbageValue = "-367277844" - ) - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 - var1 = new InvDefinition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 - } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1711772520" + ) + public static void method4041(String var0, String var1, int var2, int var3) throws IOException { + class297.idxCount = var3; // L: 40 + AbstractUserComparator.cacheGamebuild = var2; // L: 41 + + try { + ApproximateRouteStrategy.field642 = System.getProperty("os.name"); // L: 43 + } catch (Exception var32) { // L: 45 + ApproximateRouteStrategy.field642 = "Unknown"; // L: 46 + } + + MouseRecorder.field617 = ApproximateRouteStrategy.field642.toLowerCase(); // L: 48 + + try { + class52.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (class52.userHomeDirectory != null) { // L: 51 + class52.userHomeDirectory = class52.userHomeDirectory + "/"; + } + } catch (Exception var31) { // L: 53 + } + + try { + if (MouseRecorder.field617.startsWith("win")) { // L: 55 + if (class52.userHomeDirectory == null) { // L: 56 + class52.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (class52.userHomeDirectory == null) { // L: 59 + class52.userHomeDirectory = System.getenv("HOME"); + } + + if (class52.userHomeDirectory != null) { // L: 61 + class52.userHomeDirectory = class52.userHomeDirectory + "/"; + } + } catch (Exception var30) { // L: 63 + } + + if (class52.userHomeDirectory == null) { // L: 64 + class52.userHomeDirectory = "~/"; + } + + GrandExchangeEvents.field68 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class52.userHomeDirectory, "/tmp/", ""}; // L: 65 + Client.field957 = new String[]{".jagex_cache_" + AbstractUserComparator.cacheGamebuild, ".file_store_" + AbstractUserComparator.cacheGamebuild}; // L: 66 + int var18 = 0; + + label256: + while (var18 < 4) { + String var6 = var18 == 0 ? "" : "" + var18; // L: 70 + class277.JagexCache_locationFile = new File(class52.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 + String var7 = null; // L: 72 + String var8 = null; // L: 73 + boolean var9 = false; // L: 74 + int var12; + int var14; + File var37; + if (class277.JagexCache_locationFile.exists()) { // L: 75 + try { + AccessFile var10 = new AccessFile(class277.JagexCache_locationFile, "rw", 10000L); // L: 78 + + Buffer var11; + for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83 + var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81 + if (var12 == -1) { // L: 82 + throw new IOException(); + } + } + + var11.offset = 0; // L: 85 + var12 = var11.readUnsignedByte(); // L: 86 + if (var12 < 1 || var12 > 3) { // L: 87 + throw new IOException("" + var12); + } + + int var13 = 0; // L: 88 + if (var12 > 1) { // L: 89 + var13 = var11.readUnsignedByte(); + } + + if (var12 <= 2) { // L: 90 + var7 = var11.readStringCp1252NullCircumfixed(); // L: 91 + if (var13 == 1) { // L: 92 + var8 = var11.readStringCp1252NullCircumfixed(); + } + } else { + var7 = var11.readCESU8(); // L: 95 + if (var13 == 1) { // L: 96 + var8 = var11.readCESU8(); + } + } + + var10.close(); // L: 98 + } catch (IOException var34) { // L: 100 + var34.printStackTrace(); // L: 101 + } + + if (var7 != null) { // L: 103 + var37 = new File(var7); // L: 104 + if (!var37.exists()) { // L: 105 + var7 = null; // L: 106 + } + } + + if (var7 != null) { // L: 109 + var37 = new File(var7, "test.dat"); // L: 110 + + boolean var40; + try { + RandomAccessFile var19 = new RandomAccessFile(var37, "rw"); // L: 114 + var14 = var19.read(); // L: 115 + var19.seek(0L); // L: 116 + var19.write(var14); // L: 117 + var19.seek(0L); // L: 118 + var19.close(); // L: 119 + var37.delete(); // L: 120 + var40 = true; // L: 121 + } catch (Exception var29) { // L: 123 + var40 = false; // L: 124 + } + + if (!var40) { // L: 127 + var7 = null; // L: 128 + } + } + } + + if (var7 == null && var18 == 0) { // L: 132 + label230: + for (int var20 = 0; var20 < Client.field957.length; ++var20) { // L: 133 + for (int var21 = 0; var21 < GrandExchangeEvents.field68.length; ++var21) { // L: 134 + File var22 = new File(GrandExchangeEvents.field68[var21] + Client.field957[var20] + File.separatorChar + var0 + File.separatorChar); // L: 135 + if (var22.exists()) { // L: 136 + File var23 = new File(var22, "test.dat"); // L: 138 + + boolean var41; + try { + RandomAccessFile var15 = new RandomAccessFile(var23, "rw"); // L: 141 + int var16 = var15.read(); // L: 142 + var15.seek(0L); // L: 143 + var15.write(var16); // L: 144 + var15.seek(0L); // L: 145 + var15.close(); // L: 146 + var23.delete(); // L: 147 + var41 = true; // L: 148 + } catch (Exception var28) { // L: 150 + var41 = false; // L: 151 + } + + if (var41) { // L: 154 + var7 = var22.toString(); // L: 155 + var9 = true; // L: 156 + break label230; // L: 157 + } + } + } + } + } + + if (var7 == null) { // L: 163 + var7 = class52.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 164 + var9 = true; // L: 165 + } + + if (var8 != null) { // L: 167 + File var36 = new File(var8); // L: 168 + var37 = new File(var7); // L: 169 + + try { + File[] var45 = var36.listFiles(); // L: 171 + File[] var43 = var45; // L: 173 + + for (var14 = 0; var14 < var43.length; ++var14) { // L: 174 + File var42 = var43[var14]; // L: 175 + File var24 = new File(var37, var42.getName()); // L: 177 + boolean var17 = var42.renameTo(var24); // L: 178 + if (!var17) { // L: 179 + throw new IOException(); + } + } + } catch (Exception var33) { // L: 184 + var33.printStackTrace(); // L: 185 + } + + var9 = true; // L: 187 + } + + if (var9) { // L: 189 + SecureRandomCallable.method1237(new File(var7), (File)null); + } + + File var5 = new File(var7); // L: 190 + JagexCache.cacheDir = var5; // L: 192 + if (!JagexCache.cacheDir.exists()) { // L: 193 + JagexCache.cacheDir.mkdirs(); + } + + File[] var35 = JagexCache.cacheDir.listFiles(); // L: 194 + if (var35 != null) { // L: 195 + File[] var38 = var35; // L: 197 + + for (int var25 = 0; var25 < var38.length; ++var25) { // L: 198 + File var26 = var38[var25]; // L: 199 + + boolean var44; + try { + RandomAccessFile var39 = new RandomAccessFile(var26, "rw"); // L: 204 + var12 = var39.read(); // L: 205 + var39.seek(0L); // L: 206 + var39.write(var12); // L: 207 + var39.seek(0L); // L: 208 + var39.close(); // L: 209 + var44 = true; // L: 211 + } catch (Exception var27) { // L: 213 + var44 = false; // L: 214 + } + + if (!var44) { // L: 217 + ++var18; // L: 67 + continue label256; + } + } + } + break; + } + + MouseHandler.method1177(JagexCache.cacheDir); // L: 224 + ClientPacket.method3745(); // L: 225 + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(BuddyRankComparator.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 226 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(BuddyRankComparator.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 227 + JagexCache.JagexCache_idxFiles = new BufferedFile[class297.idxCount]; // L: 228 + + for (var18 = 0; var18 < class297.idxCount; ++var18) { // L: 229 + JagexCache.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(BuddyRankComparator.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 230 + } + + } // L: 232 } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index f41119867a..025e5d31b6 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -1,18 +1,23 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hj") +@Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Llp;" ) + @Export("table") NodeHashTable table; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; // L: 22 @@ -191,7 +196,7 @@ public class MusicTrack extends Node { int[] var59 = new int[128]; // L: 172 var28 = 0; // L: 173 - label243: + label244: for (int var60 = 0; var60 < var2; ++var60) { // L: 174 var51.writeInt(1297379947); // L: 175 var51.offset += 4; // L: 176 @@ -213,7 +218,7 @@ public class MusicTrack extends Node { var51.writeByte(47); // L: 187 var51.writeByte(0); // L: 188 var51.writeLengthInt(var51.offset - var61); // L: 269 - continue label243; + continue label244; } if (var64 == 23) { // L: 191 @@ -330,8 +335,8 @@ public class MusicTrack extends Node { } // L: 271 - @ObfuscatedName("k") - void method4008() { + @ObfuscatedName("b") + void method4061() { if (this.table == null) { // L: 274 this.table = new NodeHashTable(16); // L: 275 int[] var1 = new int[16]; // L: 276 @@ -411,15 +416,17 @@ public class MusicTrack extends Node { } } // L: 331 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("clear") void clear() { this.table = null; // L: 334 } // L: 335 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;II)Lhj;" + descriptor = "(Liw;II)Lhj;" ) + @Export("readTrack") static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 16 return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index bd9158241d..1cd75f7e9a 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,23 +1,37 @@ +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("cw") +@ObfuscatedName("ca") +@Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ljx;" + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1244171609 ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("z") + static byte[][][] field1161; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Ljn;" + ) + @Export("definition") NPCDefinition definition; NPC() { } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IBI)V", - garbageValue = "307957287" + garbageValue = "-522302894" ) - final void method2115(int var1, byte var2) { + final void method2150(int var1, byte var2) { int var3 = super.pathX[0]; // L: 15 int var4 = super.pathY[0]; // L: 16 if (var1 == 0) { // L: 17 @@ -56,8 +70,8 @@ public final class NPC extends Actor { --var4; // L: 35 } - if (super.sequence != -1 && WorldMapRegion.SequenceDefinition_get(super.sequence).field3541 == 1) { - super.sequence = -1; // L: 37 + if (super.sequence != -1 && class105.SequenceDefinition_get(super.sequence).field3550 == 1) { // L: 37 + super.sequence = -1; } if (super.pathLength < 9) { // L: 38 @@ -70,18 +84,18 @@ public final class NPC extends Actor { super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42 } - super.pathX[0] = var3; // L: 44 - super.pathY[0] = var4; // L: 45 - super.pathTraversed[0] = var2; // L: 46 + super.pathX[0] = var3; + super.pathY[0] = var4; + super.pathTraversed[0] = var2; } // L: 47 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-1230759297" + descriptor = "(IIZB)V", + garbageValue = "124" ) - final void method2121(int var1, int var2, boolean var3) { - if (super.sequence != -1 && WorldMapRegion.SequenceDefinition_get(super.sequence).field3541 == 1) { // L: 50 + final void method2144(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class105.SequenceDefinition_get(super.sequence).field3550 == 1) { // L: 50 super.sequence = -1; } @@ -107,25 +121,26 @@ public final class NPC extends Actor { } super.pathLength = 0; // L: 67 - super.field973 = 0; // L: 68 - super.field1032 = 0; // L: 69 + super.field1034 = 0; // L: 68 + super.field978 = 0; // L: 69 super.pathX[0] = var1; // L: 70 super.pathY[0] = var2; // L: 71 - super.x = super.pathX[0] * 128 + super.field1014 * 64; // L: 72 - super.y = super.pathY[0] * 128 + super.field1014 * 64; // L: 73 + super.x = super.pathX[0] * 128 + super.field1011 * 64; // L: 72 + super.y = super.field1011 * 64 + super.pathY[0] * 128; // L: 73 } // L: 74 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ler;", - garbageValue = "-2026237468" + descriptor = "(I)Leh;", + garbageValue = "-2070677844" ) + @Export("getModel") protected final Model getModel() { if (this.definition == null) { // L: 77 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapRegion.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapRegion.SequenceDefinition_get(super.movementSequence); // L: 79 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class105.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? class105.SequenceDefinition_get(super.movementSequence) : null; // L: 79 Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 if (var3 == null) { // L: 81 return null; @@ -133,9 +148,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); // L: 82 super.defaultHeight = var3.height; // L: 83 if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 - Model var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + Model var4 = HealthBarUpdate.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 if (var4 != null) { // L: 86 - var4.offsetBy(0, -super.field1003, 0); // L: 87 + var4.offsetBy(0, -super.field1016, 0); // L: 87 Model[] var5 = new Model[]{var3, var4}; // L: 88 var3 = new Model(var5, 2); // L: 89 } @@ -150,12 +165,807 @@ public final class NPC extends Actor { } } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "68470795" + garbageValue = "2035007323" ) + @Export("isVisible") final boolean isVisible() { return this.definition != null; // L: 97 } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1437281786" + ) + public static void method2146() { + if (MouseHandler.MouseHandler_instance != null) { // L: 43 + synchronized(MouseHandler.MouseHandler_instance) { // L: 44 + MouseHandler.MouseHandler_instance = null; // L: 45 + } // L: 46 + } + + } // L: 48 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIIIIILef;Lfh;I)V", + garbageValue = "1419271309" + ) + static final void method2160(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) { // L: 155 156 157 + if (var0 < Tiles.Tiles_minPlane) { // L: 160 + Tiles.Tiles_minPlane = var0; + } + + ObjectDefinition var8 = ScriptEvent.getObjectDefinition(var3); // L: 161 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 164 + var9 = var8.sizeX; // L: 169 + var10 = var8.sizeY; // L: 170 + } else { + var9 = var8.sizeY; // L: 165 + var10 = var8.sizeX; // L: 166 + } + + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 176 + var11 = (var9 >> 1) + var1; // L: 177 + var12 = (var9 + 1 >> 1) + var1; // L: 178 + } else { + var11 = var1; // L: 181 + var12 = var1 + 1; // L: 182 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 184 + var13 = (var10 >> 1) + var2; // L: 185 + var14 = var2 + (var10 + 1 >> 1); // L: 186 + } else { + var13 = var2; // L: 189 + var14 = var2 + 1; // L: 190 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 192 + int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 193 + int var17 = (var1 << 7) + (var9 << 6); // L: 194 + int var18 = (var2 << 7) + (var10 << 6); // L: 195 + long var19 = GrandExchangeOfferOwnWorldComparator.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 196 + int var21 = var5 + (var4 << 6); // L: 197 + if (var8.int3 == 1) { // L: 198 + var21 += 256; + } + + int var23; + int var24; + if (var8.hasSound()) { // L: 199 + ObjectSound var22 = new ObjectSound(); // L: 200 + var22.plane = var0; // L: 201 + var22.x = var1 * 128; // L: 202 + var22.y = var2 * 128; // L: 203 + var23 = var8.sizeX; // L: 204 + var24 = var8.sizeY; // L: 205 + if (var4 == 1 || var4 == 3) { // L: 206 + var23 = var8.sizeY; // L: 207 + var24 = var8.sizeX; // L: 208 + } + + var22.field1103 = (var23 + var1) * 128; // L: 210 + var22.field1112 = (var24 + var2) * 128; // L: 211 + var22.soundEffectId = var8.ambientSoundId; // L: 212 + var22.field1104 = var8.int4 * 128; // L: 213 + var22.field1107 = var8.int5; // L: 214 + var22.field1109 = var8.int6; // L: 215 + var22.soundEffectIds = var8.soundEffectIds; // L: 216 + if (var8.transforms != null) { // L: 217 + var22.obj = var8; // L: 218 + var22.set(); // L: 219 + } + + ObjectSound.objectSounds.addFirst(var22); // L: 221 + if (var22.soundEffectIds != null) { // L: 222 + var22.field1108 = var22.field1107 + (int)(Math.random() * (double)(var22.field1109 - var22.field1107)); + } + } + + Object var34; + if (var5 == 22) { // L: 224 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 225 + if (var8.animationId == -1 && var8.transforms == null) { // L: 227 + var34 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 228 + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21); // L: 229 + if (var8.interactType == 1 && var7 != null) { // L: 230 + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else if (var5 != 10 && var5 != 11) { // L: 233 + int[] var10000; + if (var5 >= 12) { // L: 254 + if (var8.animationId == -1 && var8.transforms == null) { // L: 256 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 257 + } + + var6.method3227(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); // L: 258 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 259 + var10000 = UserComparator10.field2000[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 260 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 263 + if (var8.animationId == -1 && var8.transforms == null) { // L: 265 + var34 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 266 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field533[var4], 0, var19, var21); // L: 267 + if (var4 == 0) { // L: 268 + if (var8.clipped) { // L: 269 + class299.field3679[var0][var1][var2] = 50; // L: 270 + class299.field3679[var0][var1][var2 + 1] = 50; // L: 271 + } + + if (var8.modelClipped) { // L: 273 + var10000 = UserComparator10.field2000[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 275 + if (var8.clipped) { // L: 276 + class299.field3679[var0][var1][var2 + 1] = 50; // L: 277 + class299.field3679[var0][var1 + 1][var2 + 1] = 50; // L: 278 + } + + if (var8.modelClipped) { // L: 280 + var10000 = UserComparator10.field2000[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { // L: 282 + if (var8.clipped) { // L: 283 + class299.field3679[var0][var1 + 1][var2] = 50; // L: 284 + class299.field3679[var0][var1 + 1][var2 + 1] = 50; // L: 285 + } + + if (var8.modelClipped) { // L: 287 + var10000 = UserComparator10.field2000[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 289 + if (var8.clipped) { // L: 290 + class299.field3679[var0][var1][var2] = 50; // L: 291 + class299.field3679[var0][var1 + 1][var2] = 50; // L: 292 + } + + if (var8.modelClipped) { // L: 294 + var10000 = UserComparator10.field2000[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 296 + var7.method3683(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 297 + var6.method3233(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 300 + if (var8.animationId == -1 && var8.transforms == null) { // L: 302 + var34 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 303 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field534[var4], 0, var19, var21); // L: 304 + if (var8.clipped) { // L: 305 + if (var4 == 0) { // L: 306 + class299.field3679[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 307 + class299.field3679[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 308 + class299.field3679[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 309 + class299.field3679[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 311 + var7.method3683(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { // L: 314 + var28 = var4 + 1 & 3; // L: 315 + Object var31; + Object var32; + if (var8.animationId == -1 && var8.transforms == null) { // L: 318 + var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 319 + var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 320 + } else { + var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 323 + var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 324 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)var32, Tiles.field533[var4], Tiles.field533[var28], var19, var21); // L: 326 + if (var8.modelClipped) { // L: 327 + if (var4 == 0) { // L: 328 + var10000 = UserComparator10.field2000[var0][var1]; // L: 329 + var10000[var2] |= 585; + var10000 = UserComparator10.field2000[var0][var1]; // L: 330 + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { // L: 332 + var10000 = UserComparator10.field2000[var0][var1]; // L: 333 + var10000[1 + var2] |= 1170; + var10000 = UserComparator10.field2000[var0][var1 + 1]; // L: 334 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 336 + var10000 = UserComparator10.field2000[var0][var1 + 1]; // L: 337 + var10000[var2] |= 585; + var10000 = UserComparator10.field2000[var0][var1]; // L: 338 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 340 + var10000 = UserComparator10.field2000[var0][var1]; // L: 341 + var10000[var2] |= 1170; + var10000 = UserComparator10.field2000[var0][var1]; // L: 342 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 345 + var7.method3683(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 346 + var6.method3233(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 349 + if (var8.animationId == -1 && var8.transforms == null) { // L: 351 + var34 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 352 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field534[var4], 0, var19, var21); // L: 353 + if (var8.clipped) { // L: 354 + if (var4 == 0) { // L: 355 + class299.field3679[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 356 + class299.field3679[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 357 + class299.field3679[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 358 + class299.field3679[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 360 + var7.method3683(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 363 + if (var8.animationId == -1 && var8.transforms == null) { // L: 365 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 366 + } + + var6.method3227(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); // L: 367 + if (var8.interactType != 0 && var7 != null) { // L: 368 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 369 + var6.method3233(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 372 + if (var8.animationId == -1 && var8.transforms == null) { // L: 374 + var34 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 375 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field533[var4], 0, 0, 0, var19, var21); // L: 376 + } else { + Object var25; + long var29; + if (var5 == 5) { // L: 379 + var28 = 16; // L: 380 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 381 + if (var29 != 0L) { // L: 382 + var28 = ScriptEvent.getObjectDefinition(ObjectSound.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 384 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 385 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, Tiles.field533[var4], 0, var28 * Tiles.field528[var4], var28 * Tiles.field536[var4], var19, var21); // L: 386 + } else if (var5 == 6) { // L: 389 + var28 = 8; // L: 390 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 391 + if (0L != var29) { // L: 392 + var28 = ScriptEvent.getObjectDefinition(ObjectSound.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 394 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 395 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, 256, var4, var28 * Tiles.field535[var4], var28 * Tiles.field529[var4], var19, var21); // L: 396 + } else if (var5 == 7) { // L: 399 + var23 = var4 + 2 & 3; // L: 401 + if (var8.animationId == -1 && var8.transforms == null) { // L: 402 + 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); // L: 403 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21); // L: 404 + } else if (var5 == 8) { // L: 407 + var28 = 8; // L: 408 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 409 + if (var29 != 0L) { // L: 410 + var28 = ScriptEvent.getObjectDefinition(ObjectSound.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 413 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 414 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 415 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 416 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 419 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 420 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)var26, 256, var4, var28 * Tiles.field535[var4], var28 * Tiles.field529[var4], var19, var21); // L: 422 + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 235 + var34 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 236 + } + + if (var34 != null && var6.method3227(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 237 238 + var23 = 15; // L: 239 + if (var34 instanceof Model) { // L: 240 + var23 = ((Model)var34).method3013() / 4; // L: 241 + if (var23 > 30) { // L: 242 + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { // L: 244 + for (int var33 = 0; var33 <= var10; ++var33) { // L: 245 + if (var23 > class299.field3679[var0][var24 + var1][var33 + var2]) { // L: 246 + class299.field3679[var0][var24 + var1][var33 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 251 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } // L: 231 252 261 298 312 347 361 370 377 387 397 405 423 425 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "750977522" + ) + static int method2158(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1306 + var7 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1307 + DevicePcmPlayerProvider.addGameMessage(0, "", var7); // L: 1308 + return 1; // L: 1309 + } else if (var0 == ScriptOpcodes.ANIM) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1312 + Varps.performPlayerAnimation(PlayerType.localPlayer, Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize], Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 1313 + return 1; // L: 1314 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field1128) { // L: 1317 + Interpreter.field1130 = true; // L: 1318 + } + + return 1; // L: 1320 + } else { + int var15; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1323 + var15 = 0; // L: 1324 + if (class195.isNumber(var7)) { // L: 1325 + var15 = ObjectSound.parseInt(var7); + } + + PacketBufferNode var13 = class4.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); // L: 1327 + var13.packetBuffer.writeInt(var15); // L: 1328 + Client.packetWriter.addNode(var13); // L: 1329 + return 1; // L: 1330 + } else { + PacketBufferNode var11; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1333 + var11 = class4.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); // L: 1335 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1336 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1337 + Client.packetWriter.addNode(var11); // L: 1338 + return 1; // L: 1339 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1342 + var11 = class4.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); // L: 1344 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1345 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1346 + Client.packetWriter.addNode(var11); // L: 1347 + return 1; // L: 1348 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1351 + var4 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1352 + FontName.method5458(var10, var4); // L: 1353 + return 1; // L: 1354 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + MilliClock.Interpreter_intStackSize -= 3; // L: 1357 + var10 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1358 + var15 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1359 + int var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 1360 + Widget var14 = UserComparator4.getWidget(var9); // L: 1361 + class228.clickWidget(var14, var10, var15); // L: 1362 + return 1; // L: 1363 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1366 + var10 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1367 + var15 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1368 + Widget var12 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 1369 + class228.clickWidget(var12, var10, var15); // L: 1370 + return 1; // L: 1371 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + MusicPatchNode.mouseCam = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1374 + return 1; // L: 1375 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.clientPreferences.roofsHidden ? 1 : 0; // L: 1378 + return 1; // L: 1379 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + GrandExchangeOfferAgeComparator.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1382 + Tile.savePreferences(); // L: 1383 + return 1; // L: 1384 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1387 + boolean var8 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1388 + Skeleton.openURL(var7, var8, false); // L: 1389 + return 1; // L: 1390 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1393 + var11 = class4.getPacketBufferNode(ClientPacket.field2316, Client.packetWriter.isaacCipher); // L: 1395 + var11.packetBuffer.writeShort(var10); // L: 1396 + Client.packetWriter.addNode(var11); // L: 1397 + return 1; // L: 1398 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1401 + UrlRequester.Interpreter_stringStackSize -= 2; // L: 1402 + var4 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize]; // L: 1403 + String var5 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize + 1]; // L: 1404 + if (var4.length() > 500) { // L: 1405 + return 1; + } else if (var5.length() > 500) { // L: 1406 + return 1; + } else { + PacketBufferNode var6 = class4.getPacketBufferNode(ClientPacket.field2310, Client.packetWriter.isaacCipher); // L: 1407 + var6.packetBuffer.writeShort(1 + SpriteMask.stringCp1252NullTerminatedByteSize(var4) + SpriteMask.stringCp1252NullTerminatedByteSize(var5)); // L: 1408 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1409 + var6.packetBuffer.writeByte(var10); // L: 1410 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1411 + Client.packetWriter.addNode(var6); // L: 1412 + return 1; // L: 1413 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1416 + return 1; // L: 1417 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1420 + return 1; // L: 1421 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1424 + return 1; // L: 1425 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1) { // L: 1428 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1429 + } + + return 1; // L: 1430 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1) { // L: 1433 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1434 + } + + return 1; // L: 1435 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1) { // L: 1438 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1439 + } + + return 1; // L: 1440 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1) { // L: 1443 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1444 + } + + return 1; // L: 1445 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1448 + return 1; // L: 1449 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1452 + return 1; // L: 1453 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1456 + return 1; // L: 1457 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + Huffman.setTapToDrop(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1); // L: 1460 + return 1; // L: 1461 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ModeWhere.getTapToDrop() ? 1 : 0; // L: 1464 + return 1; // L: 1465 + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1468 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1469 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1470 + return 1; // L: 1471 + } else if (var0 == 3130) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1474 + return 1; // L: 1475 + } else if (var0 == 3131) { + --MilliClock.Interpreter_intStackSize; // L: 1478 + return 1; // L: 1479 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ItemContainer.canvasWidth; // L: 1482 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = HealthBar.canvasHeight; // L: 1483 + return 1; // L: 1484 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --MilliClock.Interpreter_intStackSize; // L: 1487 + return 1; // L: 1488 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1491 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1494 + return 1; // L: 1495 + } else if (var0 == 3136) { + Client.field843 = 3; // L: 1498 + Client.field844 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1499 + return 1; // L: 1500 + } else if (var0 == 3137) { + Client.field843 = 2; // L: 1503 + Client.field844 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1504 + return 1; // L: 1505 + } else if (var0 == 3138) { + Client.field843 = 0; // L: 1508 + return 1; // L: 1509 + } else if (var0 == 3139) { + Client.field843 = 1; // L: 1512 + return 1; // L: 1513 + } else if (var0 == 3140) { + Client.field843 = 3; // L: 1516 + Client.field844 = var2 ? MouseRecorder.field621.id * -583486671 * -509491759 : Interpreter.field1122.id * -583486671 * -509491759; // L: 1517 + return 1; // L: 1518 + } else { + boolean var3; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1521 + GrandExchangeOfferAgeComparator.clientPreferences.hideUsername = var3; // L: 1522 + Tile.savePreferences(); // L: 1523 + return 1; // L: 1524 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.clientPreferences.hideUsername ? 1 : 0; // L: 1527 + return 1; // L: 1528 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1531 + Client.Login_isUsernameRemembered = var3; // L: 1532 + if (!var3) { // L: 1533 + GrandExchangeOfferAgeComparator.clientPreferences.rememberedUsername = ""; // L: 1534 + Tile.savePreferences(); // L: 1535 + } + + return 1; // L: 1537 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1540 + return 1; // L: 1541 + } else if (var0 == 3145) { + return 1; // L: 1544 + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 1547 + if (var3 == GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled) { // L: 1548 + GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled = !var3; // L: 1549 + Tile.savePreferences(); // L: 1550 + } + + return 1; // L: 1552 + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1555 + return 1; // L: 1556 + } else if (var0 == 3148) { + return 1; // L: 1559 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1562 + return 1; // L: 1563 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1566 + return 1; // L: 1567 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1570 + return 1; // L: 1571 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1574 + return 1; // L: 1575 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1578 + return 1; // L: 1579 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = GraphicsObject.method2122(); // L: 1582 + return 1; // L: 1583 + } else if (var0 == 3155) { + --UrlRequester.Interpreter_stringStackSize; // L: 1586 + return 1; // L: 1587 + } else if (var0 == 3156) { + return 1; // L: 1590 + } else if (var0 == 3157) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1593 + return 1; // L: 1594 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1597 + return 1; // L: 1598 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1601 + return 1; // L: 1602 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1605 + return 1; // L: 1606 + } else if (var0 == 3161) { + --MilliClock.Interpreter_intStackSize; // L: 1609 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1610 + return 1; // L: 1611 + } else if (var0 == 3162) { + --MilliClock.Interpreter_intStackSize; // L: 1614 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1615 + return 1; // L: 1616 + } else if (var0 == 3163) { + --UrlRequester.Interpreter_stringStackSize; // L: 1619 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1620 + return 1; // L: 1621 + } else if (var0 == 3164) { + --MilliClock.Interpreter_intStackSize; // L: 1624 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1625 + return 1; // L: 1626 + } else if (var0 == 3165) { + --MilliClock.Interpreter_intStackSize; // L: 1629 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1630 + return 1; // L: 1631 + } else if (var0 == 3166) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1634 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1635 + return 1; // L: 1636 + } else if (var0 == 3167) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1639 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1640 + return 1; // L: 1641 + } else if (var0 == 3168) { + MilliClock.Interpreter_intStackSize -= 2; // L: 1644 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1645 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1646 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1647 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1648 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1649 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1650 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1651 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1652 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1653 + return 1; // L: 1654 + } else if (var0 == 3169) { + return 1; // L: 1657 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1660 + return 1; // L: 1661 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1664 + return 1; // L: 1665 + } else if (var0 == 3172) { + --MilliClock.Interpreter_intStackSize; // L: 1668 + return 1; // L: 1669 + } else if (var0 == 3173) { + --MilliClock.Interpreter_intStackSize; // L: 1672 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1673 + return 1; // L: 1674 + } else if (var0 == 3174) { + --MilliClock.Interpreter_intStackSize; // L: 1677 + return 1; // L: 1678 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1681 + return 1; // L: 1682 + } else if (var0 == 3176) { + return 1; // L: 1685 + } else if (var0 == 3177) { + return 1; // L: 1688 + } else if (var0 == 3178) { + --UrlRequester.Interpreter_stringStackSize; // L: 1691 + return 1; // L: 1692 + } else if (var0 == 3179) { + return 1; // L: 1695 + } else if (var0 == 3180) { + --UrlRequester.Interpreter_stringStackSize; // L: 1698 + return 1; // L: 1699 + } else { + return 2; // L: 1701 + } + } + } + } + } + } + + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "-1211610671" + ) + static String method2157(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 11544 + if (Client.gameBuild == 1) { // L: 11545 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 11546 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 11547 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 11548 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 11549 + var0 = "local"; + } + + String var3 = ""; // L: 11550 + if (WorldMapRegion.field281 != null) { // L: 11551 + var3 = "/p=" + WorldMapRegion.field281; + } + + String var4 = "runescape.com"; // L: 11552 + return var2 + var0 + "." + var4 + "/l=" + FontName.clientLanguage + "/a=" + TextureProvider.field1561 + var3 + "/"; // L: 11553 + } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 2479834da5..a1b04755ff 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -1,151 +1,190 @@ +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("jx") +@ObfuscatedName("jn") +@Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) - public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -851756363 - ) - public int id; - @ObfuscatedName("o") - public String name; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1762851059 - ) - public int size; - @ObfuscatedName("w") - int[] models; - @ObfuscatedName("g") - int[] field3492; + @Export("NpcDefinition_cached") + static EvictingDualNodeHashTable NpcDefinition_cached; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 594093455 + @ObfuscatedSignature( + descriptor = "Lev;" ) + @Export("NpcDefinition_cachedModels") + static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -241449157 + ) + @Export("id") + public int id; + @ObfuscatedName("q") + @Export("name") + public String name; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 2022516453 + ) + @Export("size") + public int size; + @ObfuscatedName("c") + @Export("models") + int[] models; + @ObfuscatedName("u") + int[] field3492; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 397566937 + ) + @Export("idleSequence") public int idleSequence; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1249905269 + ) + @Export("turnLeftSequence") + public int turnLeftSequence; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1539158423 + ) + @Export("turnRightSequence") + public int turnRightSequence; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1970335799 - ) - public int turnLeftSequence; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 136881499 - ) - public int turnRightSequence; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1497603669 + intValue = -1135124357 ) + @Export("walkSequence") public int walkSequence; - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1405079749 + intValue = -1656626847 ) + @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -950124131 - ) - public int walkLeftSequence; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1378189657 - ) - public int walkRightSequence; - @ObfuscatedName("f") - short[] recolorFrom; - @ObfuscatedName("y") - short[] recolorTo; - @ObfuscatedName("v") - short[] retextureFrom; - @ObfuscatedName("j") - short[] retextureTo; - @ObfuscatedName("r") - public String[] actions; - @ObfuscatedName("u") - public boolean drawMapDot; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -442899961 + intValue = 2010823165 ) + @Export("walkLeftSequence") + public int walkLeftSequence; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1791628875 + ) + @Export("walkRightSequence") + public int walkRightSequence; + @ObfuscatedName("y") + @Export("recolorFrom") + short[] recolorFrom; + @ObfuscatedName("s") + @Export("recolorTo") + short[] recolorTo; + @ObfuscatedName("j") + @Export("retextureFrom") + short[] retextureFrom; + @ObfuscatedName("w") + @Export("retextureTo") + short[] retextureTo; + @ObfuscatedName("v") + @Export("actions") + public String[] actions; + @ObfuscatedName("d") + @Export("drawMapDot") + public boolean drawMapDot; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1396717947 + ) + @Export("combatLevel") public int combatLevel; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -337235261 + intValue = 9158797 ) + @Export("widthScale") int widthScale; - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -541213457 + intValue = -174548931 ) + @Export("heightScale") int heightScale; - @ObfuscatedName("e") + @ObfuscatedName("i") + @Export("isVisible") public boolean isVisible; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -888518163 + intValue = 917052789 ) + @Export("ambient") int ambient; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -405765695 + intValue = -787194049 ) + @Export("contrast") int contrast; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1421208063 + intValue = -1315228899 ) + @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 754705433 + intValue = -2018130609 ) + @Export("rotation") public int rotation; - @ObfuscatedName("an") + @ObfuscatedName("av") + @Export("transforms") public int[] transforms; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -1534025905 - ) - int transformVarbit; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = -1959008785 - ) - int transformVarp; - @ObfuscatedName("au") - public boolean isInteractable; - @ObfuscatedName("aa") - public boolean isClickable; @ObfuscatedName("ar") - public boolean isFollower; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Llq;" + @ObfuscatedGetter( + intValue = -1301084267 ) + @Export("transformVarbit") + int transformVarbit; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = 281561835 + ) + @Export("transformVarp") + int transformVarp; + @ObfuscatedName("ah") + @Export("isInteractable") + public boolean isInteractable; + @ObfuscatedName("az") + @Export("isClickable") + public boolean isClickable; + @ObfuscatedName("ak") + @Export("isFollower") + public boolean isFollower; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lll;" + ) + @Export("params") IterableNodeHashTable params; static { @@ -180,19 +219,21 @@ public class NPCDefinition extends DualNode { this.isFollower = false; // L: 51 } // L: 54 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1451445441" + garbageValue = "60755671" ) + @Export("postDecode") void postDecode() { } // L: 68 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "289970781" + descriptor = "(Lkb;B)V", + garbageValue = "1" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 72 @@ -204,11 +245,12 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-1568291099" + descriptor = "(Lkb;II)V", + garbageValue = "-1883780506" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; @@ -292,7 +334,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { // L: 152 this.isFollower = true; } else if (var2 == 249) { // L: 153 - this.params = PacketWriter.readStringIntParameters(var1, this.params); + this.params = InvDefinition.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 133 @@ -328,11 +370,12 @@ public class NPCDefinition extends DualNode { } // L: 155 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljm;ILjm;IB)Ler;", - garbageValue = "112" + descriptor = "(Ljg;ILjg;II)Leh;", + garbageValue = "2096354381" ) + @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.transforms != null) { // L: 158 NPCDefinition var12 = this.transform(); // L: 159 @@ -401,11 +444,12 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)Lee;", - garbageValue = "1421247419" + descriptor = "(B)Len;", + garbageValue = "17" ) + @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { // L: 196 NPCDefinition var7 = this.transform(); // L: 197 @@ -455,15 +499,16 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Ljx;", - garbageValue = "795812200" + descriptor = "(I)Ljn;", + garbageValue = "275766044" ) + @Export("transform") public final NPCDefinition transform() { int var1 = -1; // L: 224 if (this.transformVarbit != -1) { // L: 225 - var1 = WorldMapSection1.getVarbit(this.transformVarbit); + var1 = ApproximateRouteStrategy.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 226 var1 = Varps.Varps_main[this.transformVarp]; } @@ -475,21 +520,22 @@ public class NPCDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Skeleton.getNpcDefinition(var2) : null; // L: 230 231 + return var2 != -1 ? Clock.getNpcDefinition(var2) : null; // L: 230 231 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "140148621" + garbageValue = "2069847739" ) + @Export("transformIsVisible") public boolean transformIsVisible() { if (this.transforms == null) { // L: 235 return true; } else { int var1 = -1; // L: 236 if (this.transformVarbit != -1) { // L: 237 - var1 = WorldMapSection1.getVarbit(this.transformVarbit); + var1 = ApproximateRouteStrategy.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 238 var1 = Varps.Varps_main[this.transformVarp]; } @@ -502,34 +548,36 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1359705510" + descriptor = "(IIB)I", + garbageValue = "54" ) + @Export("getIntParam") public int getIntParam(int var1, int var2) { - return Username.method5309(this.params, var1, var2); // L: 244 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "77" - ) - public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 249 - String var3; - if (var4 == null) { // L: 251 - var3 = var2; // L: 252 + IterableNodeHashTable var4 = this.params; // L: 245 + int var3; + if (var4 == null) { // L: 247 + var3 = var2; // L: 248 } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 255 - if (var5 == null) { // L: 256 - var3 = var2; // L: 257 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 251 + if (var5 == null) { // L: 252 + var3 = var2; // L: 253 } else { - var3 = (String)var5.obj; // L: 260 + var3 = var5.integer; // L: 256 } } - return var3; // L: 262 + return var3; // L: 258 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1966664867" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return WorldMapSection0.method307(this.params, var1, var2); // L: 262 } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index a7c079d17c..1af9961f66 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -1,33 +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("fy") +@ObfuscatedName("fx") +@Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -6496299108672843091L + longValue = 531777541003154129L ) + @Export("lastTimeNano") long lastTimeNano; NanoClock() { this.lastTimeNano = System.nanoTime(); // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "208275261" + garbageValue = "345512591" ) + @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-16016139" + garbageValue = "-837141414" ) + @Export("wait") public int wait(int var1, int var2) { long var3 = 1000000L * (long)var2; // L: 18 long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 @@ -35,7 +41,7 @@ public class NanoClock extends Clock { var5 = var3; } - class227.sleepExact(var5 / 1000000L); // L: 21 + WorldMapSection3.sleepExact(var5 / 1000000L); // L: 21 long var7 = System.nanoTime(); // L: 22 int var9; diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index ffe888ac35..7039dbac40 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -1,98 +1,128 @@ +import java.util.Date; import java.util.zip.CRC32; +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("ii") +@ObfuscatedName("ib") +@Implements("NetCache") public class NetCache { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - public static AbstractSocket NetCache_socket; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 570306795 - ) - static int NetCache_loadTime; - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = -7527120128916335365L - ) - static long field3195; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1894418175 - ) - public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 994594523 - ) - public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Ljl;" - ) - static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1420450011 - ) - public static int NetCache_pendingWritesCount; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1710151389 - ) - public static int NetCache_pendingResponsesCount; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lkf;" - ) - static Buffer NetCache_responseHeaderBuffer; @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -657334189 - ) - static int field3205; - @ObfuscatedName("v") - static CRC32 NetCache_crc; - @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Liw;" + descriptor = "Llv;" ) - static Archive[] NetCache_archives; - @ObfuscatedName("u") - static byte field3208; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 888421105 - ) - public static int NetCache_crcMismatches; + @Export("NetCache_socket") + public static AbstractSocket NetCache_socket; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1735021825 + intValue = -1001154339 ) + @Export("NetCache_loadTime") + public static int NetCache_loadTime; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("NetCache_pendingPriorityWrites") + public static NodeHashTable NetCache_pendingPriorityWrites; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2117538937 + ) + @Export("NetCache_pendingPriorityWritesCount") + public static int NetCache_pendingPriorityWritesCount; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("NetCache_pendingPriorityResponses") + public static NodeHashTable NetCache_pendingPriorityResponses; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1463205401 + ) + @Export("NetCache_pendingPriorityResponsesCount") + public static int NetCache_pendingPriorityResponsesCount; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Ljv;" + ) + @Export("NetCache_pendingWritesQueue") + public static DualNodeDeque NetCache_pendingWritesQueue; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("NetCache_pendingWrites") + public static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -479037579 + ) + @Export("NetCache_pendingWritesCount") + public static int NetCache_pendingWritesCount; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("NetCache_pendingResponses") + public static NodeHashTable NetCache_pendingResponses; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1632634127 + ) + @Export("NetCache_pendingResponsesCount") + public static int NetCache_pendingResponsesCount; + @ObfuscatedName("n") + static boolean field3200; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Liz;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + @Export("NetCache_responseHeaderBuffer") + public static Buffer NetCache_responseHeaderBuffer; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -795437201 + ) + public static int field3190; + @ObfuscatedName("j") + @Export("NetCache_crc") + static CRC32 NetCache_crc; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "[Lid;" + ) + @Export("NetCache_archives") + static Archive[] NetCache_archives; + @ObfuscatedName("d") + public static byte field3207; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 473266479 + ) + @Export("NetCache_crcMismatches") + public static int NetCache_crcMismatches; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1034207799 + ) + @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; static { @@ -107,11 +137,190 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 NetCache_pendingResponsesCount = 0; // L: 23 NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3205 = 0; // L: 28 + field3190 = 0; // L: 28 NetCache_crc = new CRC32(); // L: 30 NetCache_archives = new Archive[256]; // L: 32 - field3208 = 0; // L: 33 + field3207 = 0; // L: 33 NetCache_crcMismatches = 0; // L: 34 NetCache_ioExceptions = 0; // L: 35 } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-979858945" + ) + static int method4461(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2575 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2576 + var9 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2577 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2578 + return 1; // L: 2579 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 2581 + UrlRequester.Interpreter_stringStackSize -= 2; // L: 2582 + var3 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize]; // L: 2583 + var4 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize + 1]; // L: 2584 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2585 + return 1; // L: 2586 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2588 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2589 + var9 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2590 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3 + class197.intToString(var9, true); // L: 2591 + return 1; // L: 2592 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2594 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2595 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2596 + return 1; // L: 2597 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 2599 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2600 + long var13 = ((long)var10 + 11745L) * 86400000L; // L: 2601 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2602 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 2603 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2604 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2605 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2606 + return 1; // L: 2607 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2609 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 2617 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2618 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 2619 + return 1; // L: 2620 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 2622 + UrlRequester.Interpreter_stringStackSize -= 2; // L: 2623 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = EnumDefinition.method4714(DevicePcmPlayerProvider.compareStrings(Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize + 1], FontName.clientLanguage)); // L: 2624 + return 1; // L: 2625 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 2627 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2628 + MilliClock.Interpreter_intStackSize -= 2; // L: 2629 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2630 + var5 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2631 + var11 = class8.archive13.takeFile(var5, 0); // L: 2632 + var12 = new Font(var11); // L: 2633 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 2634 + return 1; // L: 2635 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 2637 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2638 + MilliClock.Interpreter_intStackSize -= 2; // L: 2639 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2640 + var5 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2641 + var11 = class8.archive13.takeFile(var5, 0); // L: 2642 + var12 = new Font(var11); // L: 2643 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 2644 + return 1; // L: 2645 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 2647 + UrlRequester.Interpreter_stringStackSize -= 2; // L: 2648 + var3 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize]; // L: 2649 + var4 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize + 1]; // L: 2650 + if (Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1) { // L: 2651 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var4; // L: 2652 + } + + return 1; // L: 2653 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 2655 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2656 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 2657 + return 1; // L: 2658 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 2660 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2661 + var9 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2662 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 2663 + return 1; // L: 2664 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 2666 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2667 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = PcmPlayer.isCharPrintable((char)var10) ? 1 : 0; // L: 2668 + return 1; // L: 2669 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 2671 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2672 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = class3.isAlphaNumeric((char)var10) ? 1 : 0; // L: 2673 + return 1; // L: 2674 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 2676 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2677 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = AbstractWorldMapData.isCharAlphabetic((char)var10) ? 1 : 0; // L: 2678 + return 1; // L: 2679 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 2681 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2682 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = class1.isDigit((char)var10) ? 1 : 0; // L: 2683 + return 1; // L: 2684 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 2686 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2687 + if (var3 != null) { // L: 2688 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2689 + } + + return 1; // L: 2690 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 2692 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2693 + MilliClock.Interpreter_intStackSize -= 2; // L: 2694 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2695 + var5 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2696 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 2697 + return 1; // L: 2698 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 2700 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2701 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 2702 + boolean var16 = false; // L: 2703 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 2704 + char var7 = var3.charAt(var6); // L: 2705 + if (var7 == '<') { // L: 2706 + var16 = true; + } else if (var7 == '>') { // L: 2707 + var16 = false; + } else if (!var16) { // L: 2708 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var15.toString(); // L: 2710 + return 1; // L: 2711 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 2713 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2714 + var9 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2715 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 2716 + return 1; // L: 2717 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 2719 + UrlRequester.Interpreter_stringStackSize -= 2; // L: 2720 + var3 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize]; // L: 2721 + var4 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize + 1]; // L: 2722 + var5 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2723 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 2724 + return 1; // L: 2725 + } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 2727 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2728 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 2729 + return 1; // L: 2730 + } else { + return 2; // L: 2732 + } + } + } else { + UrlRequester.Interpreter_stringStackSize -= 2; // L: 2610 + var3 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize]; // L: 2611 + var4 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize + 1]; // L: 2612 + if (PlayerType.localPlayer.appearance != null && PlayerType.localPlayer.appearance.isFemale) { // L: 2613 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3; // L: 2614 + } + + return 1; // L: 2615 + } + } + } + } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 9328681589..d0ae3b0bd4 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -1,27 +1,88 @@ +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("io") +@ObfuscatedName("iz") +@Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive2; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - Archive archive; - @ObfuscatedName("k") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1779411329 + intValue = 1462127955 ) + @Export("clientType") + public static int clientType; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive") + Archive archive; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -350124813 + ) + @Export("crc") int crc; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("padding") byte padding; NetFileRequest() { } // L: 10 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)[B", + garbageValue = "1806020760" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1930792528" + ) + static final void method4293(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { // L: 97 + for (int var4 = 0; var4 < 8; ++var4) { // L: 98 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { // L: 100 + for (var3 = 1; var3 < 8; ++var3) { // L: 101 + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { // L: 103 + for (var3 = 1; var3 < 8; ++var3) { // L: 104 + 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) { // L: 106 + 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) { // L: 107 + 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) { // L: 108 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } // L: 109 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1725199015" + ) + public static void method4292() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 94 + } // L: 95 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 998e3d3bf3..c1cfabe613 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -3,85 +3,102 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fa") +@Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("er") + @ObfuscatedName("rx") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Ldw;" ) - static GraphicsDefaults spriteIds; - @ObfuscatedName("z") + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("f") + @Export("inputStream") InputStream inputStream; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("socket") Socket socket; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("isClosed") boolean isClosed; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lfo;" - ) - TaskHandler taskHandler; - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lfl;" ) + @Export("taskHandler") + TaskHandler taskHandler; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lfu;" + ) + @Export("task") Task task; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -43739121 + intValue = -67963133 ) + @Export("outLength") int outLength; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1877498573 + intValue = -599652531 ) + @Export("outOffset") int outOffset; - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1318092279 + intValue = 1080404053 ) + @Export("bufferLength") final int bufferLength; - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 202627819 + intValue = -273885437 ) + @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Lfo;I)V" + descriptor = "(Ljava/net/Socket;Lfl;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; // L: 16 this.outLength = 0; // L: 20 this.outOffset = 0; // L: 21 this.exceptionWriting = false; // L: 22 - this.taskHandler = var2; - this.socket = var1; - this.bufferLength = var3; - this.maxPacketLength = var3 - 100; - this.socket.setSoTimeout(30000); - this.socket.setTcpNoDelay(true); + this.taskHandler = var2; // L: 28 + this.socket = var1; // L: 29 + this.bufferLength = var3; // L: 30 + this.maxPacketLength = var3 - 100; // L: 31 + this.socket.setSoTimeout(30000); // L: 32 + this.socket.setTcpNoDelay(true); // L: 33 this.socket.setReceiveBufferSize(65536); // L: 34 - this.socket.setSendBufferSize(65536); + this.socket.setSendBufferSize(65536); // L: 35 this.inputStream = this.socket.getInputStream(); // L: 36 this.outputStream = this.socket.getOutputStream(); // L: 37 } // L: 38 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-147773206" + garbageValue = "1983450651" ) + @Export("close") public void close() { if (!this.isClosed) { // L: 41 synchronized(this) { // L: 42 @@ -89,9 +106,9 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.notifyAll(); // L: 44 } // L: 45 - if (this.task != null) { - while (this.task.status == 0) { - class227.sleepExact(1L); // L: 48 + if (this.task != null) { // L: 46 + while (this.task.status == 0) { // L: 47 + WorldMapSection3.sleepExact(1L); // L: 48 } if (this.task.status == 1) { // L: 50 @@ -106,29 +123,32 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 58 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-99" + garbageValue = "1" ) + @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "12" + descriptor = "(I)I", + garbageValue = "933186835" ) + @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-78" + descriptor = "(II)Z", + garbageValue = "-916126565" ) + @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { if (this.isClosed) { // L: 75 return false; @@ -137,11 +157,12 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1533815985" + garbageValue = "1049423117" ) + @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { if (this.isClosed) { // L: 80 return 0; @@ -161,11 +182,12 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-588582807" + descriptor = "([BIIB)V", + garbageValue = "79" ) + @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { if (!this.isClosed) { // L: 92 if (this.exceptionWriting) { // L: 93 @@ -180,7 +202,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { for (int var5 = 0; var5 < var3; ++var5) { // L: 99 this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100 this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101 - if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 102 + if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { // L: 102 throw new IOException(); // L: 103 } } @@ -195,19 +217,16 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 111 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "52" + descriptor = "([BIII)V", + garbageValue = "1456512196" ) + @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.write0(var1, var2, var3); // L: 160 } // L: 161 - protected void finalize() { - this.close(); // L: 61 - } // L: 62 - public void run() { try { while (true) { @@ -275,97 +294,12 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { // L: 154 - Decimator.RunException_sendStackTrace((String)null, var12); // L: 155 + PacketWriter.RunException_sendStackTrace((String)null, var12); // L: 155 } } // L: 157 - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Ljj;", - garbageValue = "2080665133" - ) - public static StructDefinition StructDefinition_getStructDefinition(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); // L: 25 - var1 = new StructDefinition(); // L: 26 - if (var2 != null) { // L: 27 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructDefinition.StructDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2086304619" - ) - static int method3628(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 - if (var2 == null) { // L: 29 - return 0; - } else if (var1 == -1) { // L: 30 - return 0; - } else { - int var3 = 0; // L: 31 - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; // L: 33 - } - } - - return var3; // L: 35 - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1873415823" - ) - public static void method3626() { - VarbitDefinition.VarbitDefinition_cached.clear(); // L: 46 - } // L: 47 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lhq;I[B[BI)V", - garbageValue = "-421721574" - ) - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2626 == null) { // L: 902 - if (var2 == null) { // L: 903 - return; // L: 909 - } - - var0.field2626 = new byte[11][]; // L: 904 - var0.field2719 = new byte[11][]; // L: 905 - var0.field2682 = new int[11]; // L: 906 - var0.field2683 = new int[11]; // L: 907 - } - - var0.field2626[var1] = var2; // L: 911 - if (var2 != null) { - var0.field2676 = true; // L: 912 - } else { - var0.field2676 = false; // L: 914 - - for (int var4 = 0; var4 < var0.field2626.length; ++var4) { // L: 915 - if (var0.field2626[var4] != null) { // L: 916 - var0.field2676 = true; // L: 917 - break; - } - } - } - - var0.field2719[var1] = var3; // L: 922 - } // L: 923 + protected void finalize() { + this.close(); // L: 61 + } // L: 62 } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 0704862455..88b486f10a 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -1,22 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gn") +@Implements("Node") public class Node { - @ObfuscatedName("cp") + @ObfuscatedName("cm") + @Export("key") public long key; - @ObfuscatedName("ch") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("previous") public Node previous; - @ObfuscatedName("cs") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("next") public Node next; - @ObfuscatedName("fa") + @ObfuscatedName("fm") + @Export("remove") public void remove() { if (this.next != null) { // L: 9 this.next.previous = this.previous; // L: 10 @@ -26,7 +33,8 @@ public class Node { } } // L: 14 - @ObfuscatedName("fh") + @ObfuscatedName("fg") + @Export("hasNext") public boolean hasNext() { return this.next != null; // L: 17 } diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index a2be8294b8..8efa45c4fb 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -1,17 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("ja") +@Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("sentinel") public Node sentinel; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("current") Node current; public NodeDeque() { @@ -20,7 +25,8 @@ public class NodeDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("clear") public void clear() { while (true) { Node var1 = this.sentinel.previous; // L: 16 @@ -33,10 +39,11 @@ public class NodeDeque { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgw;)V" + descriptor = "(Lgn;)V" ) + @Export("addFirst") public void addFirst(Node var1) { if (var1.next != null) { // L: 24 var1.remove(); @@ -48,10 +55,11 @@ public class NodeDeque { var1.previous.next = var1; // L: 28 } // L: 29 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgw;)V" + descriptor = "(Lgn;)V" ) + @Export("addLast") public void addLast(Node var1) { if (var1.next != null) { // L: 32 var1.remove(); @@ -63,10 +71,11 @@ public class NodeDeque { var1.previous.next = var1; // L: 36 } // L: 37 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("removeLast") public Node removeLast() { Node var1 = this.sentinel.previous; // L: 48 if (var1 == this.sentinel) { @@ -77,10 +86,11 @@ public class NodeDeque { } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("removeFirst") public Node removeFirst() { Node var1 = this.sentinel.next; // L: 55 if (var1 == this.sentinel) { @@ -91,10 +101,11 @@ public class NodeDeque { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("last") public Node last() { Node var1 = this.sentinel.previous; // L: 62 if (var1 == this.sentinel) { // L: 63 @@ -106,10 +117,11 @@ public class NodeDeque { } } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("first") public Node first() { Node var1 = this.sentinel.next; // L: 72 if (var1 == this.sentinel) { // L: 73 @@ -121,10 +133,11 @@ public class NodeDeque { } } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("previous") public Node previous() { Node var1 = this.current; // L: 82 if (var1 == this.sentinel) { // L: 83 @@ -136,10 +149,11 @@ public class NodeDeque { } } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("next") public Node next() { Node var1 = this.current; // L: 92 if (var1 == this.sentinel) { // L: 93 @@ -151,10 +165,11 @@ public class NodeDeque { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lgw;Lgw;)V" + descriptor = "(Lgn;Lgn;)V" ) + @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { if (var0.next != null) { // L: 40 var0.remove(); diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 3f9b0d8ffe..2dc2b7c0c0 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -1,26 +1,34 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lp") +@Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("size") int size; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lgw;" + descriptor = "[Lgn;" ) + @Export("buckets") Node[] buckets; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("currentGet") Node currentGet; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Lgn;" ) + @Export("current") Node current; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("index") int index; public NodeHashTable(int var1) { @@ -36,10 +44,11 @@ public final class NodeHashTable { } // L: 20 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(J)Lgw;" + descriptor = "(J)Lgn;" ) + @Export("get") public Node get(long var1) { Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 23 @@ -55,10 +64,11 @@ public final class NodeHashTable { return null; // L: 34 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgw;J)V" + descriptor = "(Lgn;J)V" ) + @Export("put") public void put(Node var1, long var2) { if (var1.next != null) { // L: 38 var1.remove(); @@ -72,19 +82,21 @@ public final class NodeHashTable { var1.key = var2; // L: 44 } // L: 45 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("first") public Node first() { this.index = 0; // L: 48 return this.next(); // L: 49 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Lgw;" + descriptor = "()Lgn;" ) + @Export("next") public Node next() { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 53 diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 46fa3bbd30..a675fd64a9 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -1,209 +1,256 @@ +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("jg") +@ObfuscatedName("je") +@Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("ObjectDefinition_archive") + public static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("ObjectDefinition_cached") + public static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("ObjectDefinition_cachedModelData") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("ObjectDefinition_cachedEntities") + public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lev;" ) - public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -316763003 - ) - public static int RunException_revision; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "[Lee;" - ) - static ModelData[] field3377; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1213282055 - ) - public int id; - @ObfuscatedName("m") - int[] modelIds; - @ObfuscatedName("n") - int[] models; - @ObfuscatedName("d") - public String name; - @ObfuscatedName("h") - short[] recolorFrom; - @ObfuscatedName("a") - short[] recolorTo; - @ObfuscatedName("q") - short[] retextureFrom; + @Export("ObjectDefinition_cachedModels") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; @ObfuscatedName("c") - short[] retextureTo; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1077626397 + @ObfuscatedSignature( + descriptor = "[Len;" ) - public int sizeX; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -2025374519 - ) - public int sizeY; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 890541759 - ) - public int interactType; - @ObfuscatedName("j") - public boolean boolean1; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -372778753 - ) - public int int1; + static ModelData[] field3379; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1406792895 + intValue = 1144020119 ) - int clipType; - @ObfuscatedName("p") - boolean nonFlatShading; - @ObfuscatedName("b") - public boolean modelClipped; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -1020675379 - ) - public int animationId; + @Export("id") + public int id; + @ObfuscatedName("t") + @Export("modelIds") + int[] modelIds; @ObfuscatedName("e") + @Export("models") + int[] models; + @ObfuscatedName("o") + @Export("name") + public String name; + @ObfuscatedName("n") + @Export("recolorFrom") + short[] recolorFrom; + @ObfuscatedName("x") + @Export("recolorTo") + short[] recolorTo; + @ObfuscatedName("p") + @Export("retextureFrom") + short[] retextureFrom; + @ObfuscatedName("r") + @Export("retextureTo") + short[] retextureTo; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 926776109 + intValue = 665688687 ) + @Export("sizeX") + public int sizeX; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1504043589 + ) + @Export("sizeY") + public int sizeY; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1832733497 + ) + @Export("interactType") + public int interactType; + @ObfuscatedName("w") + @Export("boolean1") + public boolean boolean1; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -435501345 + ) + @Export("int1") + public int int1; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -281320601 + ) + @Export("clipType") + int clipType; + @ObfuscatedName("a") + @Export("nonFlatShading") + boolean nonFlatShading; + @ObfuscatedName("g") + @Export("modelClipped") + public boolean modelClipped; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1258044391 + ) + @Export("animationId") + public int animationId; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1153154317 + ) + @Export("int2") public int int2; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1365611553 + intValue = -1023450155 ) + @Export("ambient") int ambient; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1927272841 + intValue = 1349857007 ) + @Export("contrast") int contrast; @ObfuscatedName("ao") + @Export("actions") public String[] actions; - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 668674641 + intValue = 331561987 ) + @Export("mapIconId") public int mapIconId; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = -889777445 - ) - public int mapSceneId; - @ObfuscatedName("am") - boolean isRotated; - @ObfuscatedName("ap") - public boolean clipped; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = -772733315 - ) - int modelSizeX; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 616774407 - ) - int modelHeight; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 967285395 - ) - int modelSizeY; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 574968885 - ) - int offsetX; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 1686483135 - ) - int offsetHeight; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = 1033480045 - ) - int offsetY; - @ObfuscatedName("ah") - public boolean boolean2; @ObfuscatedName("av") - boolean isSolid; - @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1249127107 + intValue = -752210695 ) - public int int3; - @ObfuscatedName("as") - public int[] transforms; + @Export("mapSceneId") + public int mapSceneId; + @ObfuscatedName("ar") + @Export("isRotated") + boolean isRotated; + @ObfuscatedName("ay") + @Export("clipped") + public boolean clipped; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -955663473 + ) + @Export("modelSizeX") + int modelSizeX; @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -654003283 + intValue = 1573303881 ) - int transformVarbit; - @ObfuscatedName("ad") + @Export("modelHeight") + int modelHeight; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 528036607 + intValue = -1744645415 ) - int transformVarp; + @Export("modelSizeY") + int modelSizeY; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -496099153 + ) + @Export("offsetX") + int offsetX; @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -241145981 + intValue = -1451477221 ) - public int ambientSoundId; - @ObfuscatedName("ay") + @Export("offsetHeight") + int offsetHeight; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 719354007 + intValue = 478900139 ) + @Export("offsetY") + int offsetY; + @ObfuscatedName("ag") + @Export("boolean2") + public boolean boolean2; + @ObfuscatedName("aq") + @Export("isSolid") + boolean isSolid; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 442915601 + ) + @Export("int3") + public int int3; + @ObfuscatedName("an") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = 1763689999 + ) + @Export("transformVarbit") + int transformVarbit; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = -945520639 + ) + @Export("transformVarp") + int transformVarp; + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = 180816565 + ) + @Export("ambientSoundId") + public int ambientSoundId; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = 234374357 + ) + @Export("int4") public int int4; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -402900319 + intValue = 1129170229 ) + @Export("int5") public int int5; - @ObfuscatedName("aw") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1265456877 + intValue = -434593727 ) + @Export("int6") public int int6; - @ObfuscatedName("af") + @ObfuscatedName("al") + @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ak") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) + @Export("params") IterableNodeHashTable params; static { @@ -212,7 +259,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21 ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22 ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23 - field3377 = new ModelData[4]; // L: 24 + field3379 = new ModelData[4]; // L: 24 } ObjectDefinition() { @@ -251,11 +298,12 @@ public class ObjectDefinition extends DualNode { this.int6 = 0; // L: 65 } // L: 69 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1906131064" + descriptor = "(S)V", + garbageValue = "3611" ) + @Export("postDecode") void postDecode() { if (this.int1 == -1) { // L: 88 this.int1 = 0; // L: 89 @@ -276,139 +324,141 @@ public class ObjectDefinition extends DualNode { } // L: 94 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "81" + descriptor = "(Lkb;I)V", + garbageValue = "330449784" ) + @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 98 + if (var2 == 0) { // L: 99 + return; // L: 102 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 100 } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "1904388143" + descriptor = "(Lkb;II)V", + garbageValue = "-1557493109" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { - var3 = var1.readUnsignedByte(); - if (var3 > 0) { - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 3; + if (var2 == 1) { // L: 105 + var3 = var1.readUnsignedByte(); // L: 106 + if (var3 > 0) { // L: 107 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 108 + var1.offset += 3 * var3; // L: 116 } else { - this.models = new int[var3]; - this.modelIds = new int[var3]; + this.models = new int[var3]; // L: 109 + this.modelIds = new int[var3]; // L: 110 for (var4 = 0; var4 < var3; ++var4) { // L: 111 this.modelIds[var4] = var1.readUnsignedShort(); // L: 112 - this.models[var4] = var1.readUnsignedByte(); + this.models[var4] = var1.readUnsignedByte(); // L: 113 } } } - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 119 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 5) { - var3 = var1.readUnsignedByte(); - if (var3 > 0) { - if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += 2 * var3; + } else if (var2 == 5) { // L: 120 + var3 = var1.readUnsignedByte(); // L: 121 + if (var3 > 0) { // L: 122 + if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 123 + var1.offset += var3 * 2; // L: 128 } else { - this.models = null; + this.models = null; // L: 124 this.modelIds = new int[var3]; // L: 125 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 126 this.modelIds[var4] = var1.readUnsignedShort(); } } } - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 131 this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { + } else if (var2 == 15) { // L: 132 this.sizeY = var1.readUnsignedByte(); } else if (var2 == 17) { // L: 133 - this.interactType = 0; + this.interactType = 0; // L: 134 + this.boolean1 = false; // L: 135 + } else if (var2 == 18) { // L: 137 this.boolean1 = false; - } else if (var2 == 18) { - this.boolean1 = false; - } else if (var2 == 19) { + } else if (var2 == 19) { // L: 138 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { + } else if (var2 == 21) { // L: 139 this.clipType = 0; } else if (var2 == 22) { // L: 140 this.nonFlatShading = true; - } else if (var2 == 23) { + } else if (var2 == 23) { // L: 141 this.modelClipped = true; - } else if (var2 == 24) { - this.animationId = var1.readUnsignedShort(); - if (this.animationId == 65535) { + } else if (var2 == 24) { // L: 142 + this.animationId = var1.readUnsignedShort(); // L: 143 + if (this.animationId == 65535) { // L: 144 this.animationId = -1; } - } else if (var2 == 27) { + } else if (var2 == 27) { // L: 146 this.interactType = 1; } else if (var2 == 28) { // L: 147 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { + } else if (var2 == 29) { // L: 148 this.ambient = var1.readByte(); - } else if (var2 == 39) { + } else if (var2 == 39) { // L: 149 this.contrast = var1.readByte() * 25; - } else if (var2 >= 30 && var2 < 35) { - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { + } else if (var2 >= 30 && var2 < 35) { // L: 150 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 151 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 152 this.actions[var2 - 30] = null; } } else if (var2 == 40) { // L: 154 - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + var3 = var1.readUnsignedByte(); // L: 155 + this.recolorFrom = new short[var3]; // L: 156 + this.recolorTo = new short[var3]; // L: 157 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 158 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 159 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 160 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 163 + var3 = var1.readUnsignedByte(); // L: 164 + this.retextureFrom = new short[var3]; // L: 165 + this.retextureTo = new short[var3]; // L: 166 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 167 this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 168 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 169 } - } else if (var2 == 62) { + } else if (var2 == 62) { // L: 172 this.isRotated = true; - } else if (var2 == 64) { + } else if (var2 == 64) { // L: 173 this.clipped = false; - } else if (var2 == 65) { + } else if (var2 == 65) { // L: 174 this.modelSizeX = var1.readUnsignedShort(); } else if (var2 == 66) { // L: 175 this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { + } else if (var2 == 67) { // L: 176 this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { + } else if (var2 == 68) { // L: 177 this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { - var1.readUnsignedByte(); - } else if (var2 == 70) { + } else if (var2 == 69) { // L: 178 + var1.readUnsignedByte(); // L: 179 + } else if (var2 == 70) { // L: 181 this.offsetX = var1.readShort(); } else if (var2 == 71) { // L: 182 this.offsetHeight = var1.readShort(); } else if (var2 == 72) { // L: 183 this.offsetY = var1.readShort(); - } else if (var2 == 73) { + } else if (var2 == 73) { // L: 184 this.boolean2 = true; - } else if (var2 == 74) { + } else if (var2 == 74) { // L: 185 this.isSolid = true; - } else if (var2 == 75) { + } else if (var2 == 75) { // L: 186 this.int3 = var1.readUnsignedByte(); } else if (var2 != 77 && var2 != 92) { // L: 187 if (var2 == 78) { // L: 205 @@ -429,7 +479,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 82) { // L: 218 this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { // L: 219 - this.params = PacketWriter.readStringIntParameters(var1, this.params); + this.params = InvDefinition.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); // L: 188 @@ -465,16 +515,16 @@ public class ObjectDefinition extends DualNode { } // L: 221 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1733975131" + garbageValue = "-2129482612" ) - public final boolean method4703(int var1) { + public final boolean method4764(int var1) { if (this.models != null) { // L: 224 for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 234 if (this.models[var4] == var1) { // L: 235 - return DirectByteArrayCopier.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); + return GrandExchangeOfferAgeComparator.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } @@ -487,18 +537,19 @@ public class ObjectDefinition extends DualNode { boolean var2 = true; // L: 227 for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 228 - var2 &= DirectByteArrayCopier.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 229 + var2 &= GrandExchangeOfferAgeComparator.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 229 } return var2; // L: 231 } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1059534809" + garbageValue = "-1494902856" ) + @Export("needsModelFiles") public final boolean needsModelFiles() { if (this.modelIds == null) { // L: 242 return true; @@ -506,18 +557,19 @@ public class ObjectDefinition extends DualNode { boolean var1 = true; // L: 243 for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 244 - var1 &= DirectByteArrayCopier.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 245 + var1 &= GrandExchangeOfferAgeComparator.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 245 } return var1; // L: 247 } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Lez;", - garbageValue = "14" + descriptor = "(II[[IIIII)Lej;", + garbageValue = "184382969" ) + @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; if (this.models == null) { // L: 252 @@ -546,25 +598,26 @@ public class ObjectDefinition extends DualNode { } if (this.nonFlatShading) { // L: 267 - var9 = ((ModelData)var9).method2945(); // L: 268 + var9 = ((ModelData)var9).method2932(); // L: 268 } if (this.clipType >= 0) { // L: 270 if (var9 instanceof Model) { // L: 271 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2883(var3, var4, var5, var6, true, this.clipType); // L: 272 + var9 = ((ModelData)var9).method2915(var3, var4, var5, var6, true, this.clipType); // L: 272 } } return (Entity)var9; // L: 274 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II[[IIIIB)Ler;", - garbageValue = "-34" + descriptor = "(II[[IIIII)Leh;", + garbageValue = "1500455873" ) + @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; if (this.models == null) { // L: 279 @@ -591,11 +644,12 @@ public class ObjectDefinition extends DualNode { return var9; // L: 289 } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II[[IIIILjm;II)Ler;", - garbageValue = "929962963" + descriptor = "(II[[IIIILjg;II)Leh;", + garbageValue = "-1950985762" ) + @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { long var9; if (this.models == null) { // L: 294 @@ -632,11 +686,12 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(III)Lee;", - garbageValue = "1848667865" + descriptor = "(III)Len;", + garbageValue = "20375829" ) + @Export("getModelData") final ModelData getModelData(int var1, int var2) { ModelData var3 = null; // L: 311 boolean var4; @@ -666,25 +721,25 @@ public class ObjectDefinition extends DualNode { var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 321 if (var3 == null) { // L: 322 - var3 = ModelData.ModelData_get(DirectByteArrayCopier.ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 323 + var3 = ModelData.ModelData_get(GrandExchangeOfferAgeComparator.ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 323 if (var3 == null) { // L: 324 return null; } if (var4) { // L: 325 - var3.method2892(); + var3.method2927(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 326 } if (var5 > 1) { // L: 328 - field3377[var6] = var3; + field3379[var6] = var3; } } if (var5 > 1) { // L: 330 - var3 = new ModelData(field3377, var5); + var3 = new ModelData(field3379, var5); } } else { int var9 = -1; // L: 333 @@ -708,13 +763,13 @@ public class ObjectDefinition extends DualNode { var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 344 if (var3 == null) { // L: 345 - var3 = ModelData.ModelData_get(DirectByteArrayCopier.ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 346 + var3 = ModelData.ModelData_get(GrandExchangeOfferAgeComparator.ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 346 if (var3 == null) { // L: 347 return null; } if (var10) { // L: 348 - var3.method2892(); + var3.method2927(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 349 @@ -736,17 +791,17 @@ public class ObjectDefinition extends DualNode { ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); // L: 358 if (var1 == 4 && var2 > 3) { // L: 359 - var8.method2888(256); // L: 360 + var8.method2937(256); // L: 360 var8.changeOffset(45, 0, -45); // L: 361 } var2 &= 3; // L: 363 if (var2 == 1) { // L: 364 - var8.method2885(); + var8.method2940(); } else if (var2 == 2) { // L: 365 - var8.method2886(); - } else if (var2 == 3) { // L: 366 - var8.method2881(); + var8.method2921(); + } else if (var2 == 3) { + var8.method2922(); // L: 366 } if (this.recolorFrom != null) { // L: 367 @@ -772,15 +827,16 @@ public class ObjectDefinition extends DualNode { return var8; // L: 379 } - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Ljg;", - garbageValue = "1360246605" + descriptor = "(B)Lje;", + garbageValue = "88" ) + @Export("transform") public final ObjectDefinition transform() { int var1 = -1; // L: 383 if (this.transformVarbit != -1) { // L: 384 - var1 = WorldMapSection1.getVarbit(this.transformVarbit); + var1 = ApproximateRouteStrategy.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 385 var1 = Varps.Varps_main[this.transformVarp]; } @@ -792,393 +848,62 @@ public class ObjectDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? MidiPcmStream.getObjectDefinition(var2) : null; // L: 389 390 + return var2 != -1 ? ScriptEvent.getObjectDefinition(var2) : null; // L: 389 390 } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "1" + descriptor = "(III)I", + garbageValue = "454435450" ) + @Export("getIntParam") public int getIntParam(int var1, int var2) { - return Username.method5309(this.params, var1, var2); // L: 394 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1714990387" - ) - public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 399 - String var3; - if (var4 == null) { // L: 401 - var3 = var2; // L: 402 + IterableNodeHashTable var4 = this.params; // L: 395 + int var3; + if (var4 == null) { // L: 397 + var3 = var2; // L: 398 } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 405 - if (var5 == null) { // L: 406 - var3 = var2; // L: 407 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 401 + if (var5 == null) { // L: 402 + var3 = var2; // L: 403 } else { - var3 = (String)var5.obj; // L: 410 + var3 = var5.integer; // L: 406 } } - return var3; // L: 412 + return var3; // L: 408 } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-95" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1210418513" ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return WorldMapSection0.method307(this.params, var1, var2); // L: 412 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "926091252" + ) + @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { // L: 423 + if (this.transforms == null) { // L: 416 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 424 - if (this.transforms[var1] != -1) { // L: 425 - ObjectDefinition var2 = MidiPcmStream.getObjectDefinition(this.transforms[var1]); // L: 426 - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 427 + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 417 + if (this.transforms[var1] != -1) { // L: 418 + ObjectDefinition var2 = ScriptEvent.getObjectDefinition(this.transforms[var1]); // L: 419 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 420 return true; } } } - return false; // L: 430 + return false; // L: 423 } } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IILgk;Lft;I)Z", - garbageValue = "-47009249" - ) - static final boolean method4747(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; // L: 98 - int var5 = var1; // L: 99 - byte var6 = 64; // L: 100 - byte var7 = 64; // L: 101 - int var8 = var0 - var6; // L: 102 - int var9 = var1 - var7; // L: 103 - class182.directions[var6][var7] = 99; // L: 104 - class182.distances[var6][var7] = 0; // L: 105 - byte var10 = 0; // L: 106 - int var11 = 0; // L: 107 - class182.bufferX[var10] = var0; // L: 108 - byte var10001 = var10; - int var18 = var10 + 1; - class182.bufferY[var10001] = var1; // L: 109 - int[][] var12 = var3.flags; // L: 110 - - while (var18 != var11) { // L: 113 - var4 = class182.bufferX[var11]; // L: 114 - var5 = class182.bufferY[var11]; // L: 115 - var11 = var11 + 1 & 4095; // L: 116 - int var16 = var4 - var8; // L: 117 - int var17 = var5 - var9; // L: 118 - int var13 = var4 - var3.xInset; // L: 119 - int var14 = var5 - var3.yInset; // L: 120 - if (var2.hasArrived(1, var4, var5, var3)) { // L: 121 - class182.field2135 = var4; // L: 122 - class182.field2136 = var5; // L: 123 - return true; // L: 124 - } - - int var15 = class182.distances[var16][var17] + 1; // L: 126 - if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 127 - class182.bufferX[var18] = var4 - 1; // L: 128 - class182.bufferY[var18] = var5; // L: 129 - var18 = var18 + 1 & 4095; // L: 130 - class182.directions[var16 - 1][var17] = 2; // L: 131 - class182.distances[var16 - 1][var17] = var15; // L: 132 - } - - if (var16 < 127 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 134 - class182.bufferX[var18] = var4 + 1; // L: 135 - class182.bufferY[var18] = var5; // L: 136 - var18 = var18 + 1 & 4095; // L: 137 - class182.directions[var16 + 1][var17] = 8; // L: 138 - class182.distances[var16 + 1][var17] = var15; // L: 139 - } - - if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 141 - class182.bufferX[var18] = var4; // L: 142 - class182.bufferY[var18] = var5 - 1; // L: 143 - var18 = var18 + 1 & 4095; // L: 144 - class182.directions[var16][var17 - 1] = 1; // L: 145 - class182.distances[var16][var17 - 1] = var15; // L: 146 - } - - if (var17 < 127 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 148 - class182.bufferX[var18] = var4; // L: 149 - class182.bufferY[var18] = var5 + 1; // L: 150 - var18 = var18 + 1 & 4095; // L: 151 - class182.directions[var16][var17 + 1] = 4; // L: 152 - class182.distances[var16][var17 + 1] = var15; // L: 153 - } - - if (var16 > 0 && var17 > 0 && class182.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) { // L: 155 - class182.bufferX[var18] = var4 - 1; // L: 156 - class182.bufferY[var18] = var5 - 1; // L: 157 - var18 = var18 + 1 & 4095; // L: 158 - class182.directions[var16 - 1][var17 - 1] = 3; // L: 159 - class182.distances[var16 - 1][var17 - 1] = var15; // L: 160 - } - - if (var16 < 127 && var17 > 0 && class182.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) { // L: 162 - class182.bufferX[var18] = var4 + 1; // L: 163 - class182.bufferY[var18] = var5 - 1; // L: 164 - var18 = var18 + 1 & 4095; // L: 165 - class182.directions[var16 + 1][var17 - 1] = 9; // L: 166 - class182.distances[var16 + 1][var17 - 1] = var15; // L: 167 - } - - if (var16 > 0 && var17 < 127 && class182.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) { // L: 169 - class182.bufferX[var18] = var4 - 1; // L: 170 - class182.bufferY[var18] = var5 + 1; // L: 171 - var18 = var18 + 1 & 4095; // L: 172 - class182.directions[var16 - 1][var17 + 1] = 6; // L: 173 - class182.distances[var16 - 1][var17 + 1] = var15; // L: 174 - } - - if (var16 < 127 && var17 < 127 && class182.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) { // L: 176 - class182.bufferX[var18] = var4 + 1; // L: 177 - class182.bufferY[var18] = var5 + 1; // L: 178 - var18 = var18 + 1 & 4095; // L: 179 - class182.directions[var16 + 1][var17 + 1] = 12; // L: 180 - class182.distances[var16 + 1][var17 + 1] = var15; // L: 181 - } - } - - class182.field2135 = var4; // L: 184 - class182.field2136 = var5; // L: 185 - return false; // L: 186 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIIIIIILec;Lft;B)V", - garbageValue = "-53" - ) - static final void method4699(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { - ObjectDefinition var9 = MidiPcmStream.getObjectDefinition(var4); // L: 893 - int var10; - int var11; - if (var5 != 1 && var5 != 3) { // L: 896 - var10 = var9.sizeX; // L: 901 - var11 = var9.sizeY; // L: 902 - } else { - var10 = var9.sizeY; // L: 897 - var11 = var9.sizeX; // L: 898 - } - - int var12; - int var13; - if (var10 + var2 <= 104) { // L: 908 - var12 = (var10 >> 1) + var2; // L: 909 - var13 = var2 + (var10 + 1 >> 1); // L: 910 - } else { - var12 = var2; // L: 913 - var13 = var2 + 1; // L: 914 - } - - int var14; - int var15; - if (var3 + var11 <= 104) { // L: 916 - var14 = var3 + (var11 >> 1); // L: 917 - var15 = var3 + (var11 + 1 >> 1); // L: 918 - } else { - var14 = var3; // L: 921 - var15 = var3 + 1; // L: 922 - } - - int[][] var16 = Tiles.Tiles_heights[var1]; // L: 924 - int var17 = var16[var13][var15] + var16[var12][var15] + var16[var12][var14] + var16[var13][var14] >> 2; // L: 925 - int var18 = (var2 << 7) + (var10 << 6); // L: 926 - int var19 = (var3 << 7) + (var11 << 6); // L: 927 - long var20 = class227.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 928 - int var22 = (var5 << 6) + var6; // L: 929 - if (var9.int3 == 1) { // L: 930 - var22 += 256; - } - - Object var30; - if (var6 == 22) { // L: 931 - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(22, var5, var16, var18, var17, var19); // L: 933 - } else { - var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 934 - } - - var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var30, var20, var22); // L: 935 - if (var9.interactType == 1) { // L: 936 - var8.setBlockedByFloorDec(var2, var3); - } - - } else if (var6 != 10 && var6 != 11) { // L: 939 - if (var6 >= 12) { // L: 947 - if (var9.animationId == -1 && var9.transforms == null) { // L: 949 - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 950 - } - - var7.method3263(var0, var2, var3, var17, 1, 1, (Entity)var30, 0, var20, var22); // L: 951 - if (var9.interactType != 0) { // L: 952 - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 0) { // L: 955 - if (var9.animationId == -1 && var9.transforms == null) { // L: 957 - var30 = var9.getModel(0, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 958 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field524[var5], 0, var20, var22); // L: 959 - if (var9.interactType != 0) { // L: 960 - var8.method3630(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 1) { // L: 963 - if (var9.animationId == -1 && var9.transforms == null) { // L: 965 - var30 = var9.getModel(1, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 966 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field525[var5], 0, var20, var22); // L: 967 - if (var9.interactType != 0) { // L: 968 - var8.method3630(var2, var3, var6, var5, var9.boolean1); - } - - } else { - int var23; - if (var6 == 2) { // L: 971 - var23 = var5 + 1 & 3; // L: 972 - Object var25; - Object var31; - if (var9.animationId == -1 && var9.transforms == null) { // L: 975 - var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 976 - var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 977 - } else { - var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 980 - var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 981 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var31, (Entity)var25, Tiles.field524[var5], Tiles.field524[var23], var20, var22); // L: 983 - if (var9.interactType != 0) { // L: 984 - var8.method3630(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 3) { // L: 987 - if (var9.animationId == -1 && var9.transforms == null) { // L: 989 - var30 = var9.getModel(3, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 990 - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field525[var5], 0, var20, var22); // L: 991 - if (var9.interactType != 0) { // L: 992 - var8.method3630(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 9) { // L: 995 - if (var9.animationId == -1 && var9.transforms == null) { // L: 997 - var30 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 998 - } - - var7.method3263(var0, var2, var3, var17, 1, 1, (Entity)var30, 0, var20, var22); // L: 999 - if (var9.interactType != 0) { // L: 1000 - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } else if (var6 == 4) { // L: 1003 - if (var9.animationId == -1 && var9.transforms == null) { - var30 = var9.getModel(4, var5, var16, var18, var17, var19); // L: 1005 - } else { - var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1006 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field524[var5], 0, 0, 0, var20, var22); // L: 1007 - } else { - long var24; - Object var26; - if (var6 == 5) { // L: 1010 - var23 = 16; // L: 1011 - var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1012 - if (var24 != 0L) { // L: 1013 - var23 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var24)).int2; - } - - if (var9.animationId == -1 && var9.transforms == null) { // L: 1015 - var26 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1016 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field524[var5], 0, var23 * Tiles.field517[var5], var23 * Tiles.field527[var5], var20, var22); // L: 1017 - } else if (var6 == 6) { // L: 1020 - var23 = 8; // L: 1021 - var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1022 - if (var24 != 0L) { // L: 1023 - var23 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var24)).int2 / 2; - } - - if (var9.animationId == -1 && var9.transforms == null) { // L: 1025 - 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); // L: 1026 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var23 * Tiles.field534[var5], var23 * Tiles.field529[var5], var20, var22); // L: 1027 - } else if (var6 == 7) { // L: 1030 - int var29 = var5 + 2 & 3; // L: 1032 - if (var9.animationId == -1 && var9.transforms == null) { // L: 1033 - var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1034 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var30, (Entity)null, 256, var29, 0, 0, var20, var22); // L: 1035 - } else if (var6 == 8) { // L: 1038 - var23 = 8; // L: 1039 - var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1040 - if (var24 != 0L) { // L: 1041 - var23 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var24)).int2 / 2; - } - - int var28 = var5 + 2 & 3; // L: 1044 - Object var27; - if (var9.animationId == -1 && var9.transforms == null) { // L: 1045 - var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1046 - var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1047 - } else { - var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1050 - var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1051 - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var23 * Tiles.field534[var5], var23 * Tiles.field529[var5], var20, var22); // L: 1053 - } - } - } - } else { - if (var9.animationId == -1 && var9.transforms == null) { // L: 941 - var30 = var9.getModel(10, var5, var16, var18, var17, var19); - } else { - var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 942 - } - - if (var30 != null) { // L: 943 - var7.method3263(var0, var2, var3, var17, var10, var11, (Entity)var30, var6 == 11 ? 256 : 0, var20, var22); - } - - if (var9.interactType != 0) { // L: 944 - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } - - } - } // L: 937 945 953 961 969 985 993 1001 1008 1018 1028 1036 1054 1056 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 532227e6f4..077110f590 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -1,8 +1,12 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gj") +@ObfuscatedName("ge") +@Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("obj") public final Object obj; public ObjectNode(Object var1) { diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index aca4d31e95..1aa0a365bb 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,80 +1,92 @@ +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("cn") +@ObfuscatedName("cl") +@Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lja;" ) + @Export("objectSounds") static NodeDeque objectSounds; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1138191805 + ) + @Export("plane") + int plane; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1682034251 + ) + @Export("x") + int x; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 2073758619 + ) + @Export("y") + int y; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -709307059 + intValue = 1257501441 ) - int field1106; - @ObfuscatedName("s") + int field1103; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 397681607 + intValue = 1906931409 ) - int field1109; + int field1112; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -2106963407 + ) + int field1104; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 786656401 + ) + @Export("soundEffectId") + int soundEffectId; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ldx;" + ) + @Export("stream1") + RawPcmStream stream1; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2039655179 + intValue = -68558045 ) - int plane; - @ObfuscatedName("i") + int field1107; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1121925225 + intValue = 151310867 ) - int x; + int field1109; @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1814534079 - ) - int y; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1874123539 - ) - int field1117; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 159221067 - ) - int field1108; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -34287423 - ) - int soundEffectId; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldm;" - ) - RawPcmStream stream1; + @Export("soundEffectIds") + int[] soundEffectIds; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -793765363 + intValue = -828996147 ) - int field1115; - @ObfuscatedName("d") - int[] soundEffectIds; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1493720003 - ) - int field1118; - @ObfuscatedName("a") + int field1108; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Ldx;" ) + @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljg;" + descriptor = "Lje;" ) + @Export("obj") ObjectDefinition obj; static { @@ -82,210 +94,51 @@ public final class ObjectSound extends Node { } ObjectSound() { + } // L: 27 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2054247540" + ) + @Export("set") + void set() { + int var1 = this.soundEffectId; // L: 30 + ObjectDefinition var2 = this.obj.transform(); // L: 31 + if (var2 != null) { // L: 32 + this.soundEffectId = var2.ambientSoundId; // L: 33 + this.field1104 = var2.int4 * 128; // L: 34 + this.field1107 = var2.int5; // L: 35 + this.field1109 = var2.int6; // L: 36 + this.soundEffectIds = var2.soundEffectIds; // L: 37 + } else { + this.soundEffectId = -1; // L: 40 + this.field1104 = 0; // L: 41 + this.field1107 = 0; // L: 42 + this.field1109 = 0; // L: 43 + this.soundEffectIds = null; // L: 44 + } + + if (var1 != this.soundEffectId && this.stream1 != null) { // L: 46 + GrandExchangeEvents.pcmStreamMixer.removeSubStream(this.stream1); // L: 47 + this.stream1 = null; // L: 48 + } + + } // L: 50 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "2057231744" + ) + @Export("parseInt") + public static int parseInt(CharSequence var0) { + return SecureRandomCallable.parseIntCustomRadix(var0, 10, true); // L: 76 } @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "23141" - ) - void set() { - int var1 = this.soundEffectId; - ObjectDefinition var2 = this.obj.transform(); - if (var2 != null) { - this.soundEffectId = var2.ambientSoundId; - this.field1108 = var2.int4 * 128; - this.field1109 = var2.int5; - this.field1115 = var2.int6; - this.soundEffectIds = var2.soundEffectIds; - } else { - this.soundEffectId = -1; - this.field1108 = 0; - this.field1109 = 0; - this.field1115 = 0; - this.soundEffectIds = null; - } - - if (var1 != this.soundEffectId && this.stream1 != null) { // L: 60 - Players.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 - this.stream1 = null; // L: 62 - } - - } // L: 64 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIILgk;Lft;Z[I[II)I", - garbageValue = "585346810" - ) - public static int method1986(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) { // L: 19 - for (var9 = 0; var9 < 128; ++var9) { // L: 20 - class182.directions[var8][var9] = 0; // L: 21 - class182.distances[var8][var9] = 99999999; // L: 22 - } - } - - boolean var27; - if (var2 == 1) { // L: 26 - var27 = ObjectDefinition.method4747(var0, var1, var3, var4); - } else if (var2 == 2) { // L: 27 - var27 = class41.method619(var0, var1, var3, var4); - } else { - var27 = FriendSystem.method1976(var0, var1, var2, var3, var4); // L: 28 - } - - var9 = var0 - 64; // L: 29 - int var10 = var1 - 64; // L: 30 - int var11 = class182.field2135; // L: 31 - int var12 = class182.field2136; // L: 32 - int var13; - int var14; - int var16; - if (!var27) { // L: 33 - var13 = Integer.MAX_VALUE; // L: 35 - var14 = Integer.MAX_VALUE; // L: 36 - byte var15 = 10; // L: 37 - var16 = var3.approxDestinationX; // L: 38 - int var17 = var3.approxDestinationY; // L: 39 - int var18 = var3.approxDestinationSizeX; // L: 40 - int var19 = var3.approxDestinationSizeY; // L: 41 - - for (int var20 = var16 - var15; var20 <= var15 + var16; ++var20) { // L: 42 - for (int var21 = var17 - var15; var21 <= var17 + var15; ++var21) { // L: 43 - int var22 = var20 - var9; // L: 44 - int var23 = var21 - var10; // L: 45 - if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class182.distances[var22][var23] < 100) { // L: 46 47 - int var24 = 0; // L: 48 - if (var20 < var16) { - var24 = var16 - var20; // L: 49 - } else if (var20 > var16 + var18 - 1) { // L: 50 - var24 = var20 - (var18 + var16 - 1); - } - - int var25 = 0; // L: 51 - if (var21 < var17) { // L: 52 - var25 = var17 - var21; - } else if (var21 > var17 + var19 - 1) { // L: 53 - var25 = var21 - (var17 + var19 - 1); - } - - int var26 = var25 * var25 + var24 * var24; // L: 54 - if (var26 < var13 || var26 == var13 && class182.distances[var22][var23] < var14) { // L: 55 - var13 = var26; // L: 56 - var14 = class182.distances[var22][var23]; // L: 57 - var11 = var20; // L: 58 - var12 = var21; // L: 59 - } - } - } - } - - if (var13 == Integer.MAX_VALUE) { // L: 65 - return -1; - } - } - - if (var0 == var11 && var12 == var1) { // L: 69 - return 0; - } else { - byte var28 = 0; // L: 70 - class182.bufferX[var28] = var11; // L: 73 - var13 = var28 + 1; - class182.bufferY[var28] = var12; // L: 74 - - int var29; - for (var14 = var29 = class182.directions[var11 - var9][var12 - var10]; var0 != var11 || var12 != var1; var14 = class182.directions[var11 - var9][var12 - var10]) { // L: 75 76 86 - if (var14 != var29) { // L: 77 - var29 = var14; // L: 78 - class182.bufferX[var13] = var11; // L: 79 - class182.bufferY[var13++] = var12; // L: 80 - } - - if ((var14 & 2) != 0) { // L: 82 - ++var11; - } else if ((var14 & 8) != 0) { // L: 83 - --var11; - } - - if ((var14 & 1) != 0) { // L: 84 - ++var12; - } else if ((var14 & 4) != 0) { // L: 85 - --var12; - } - } - - var16 = 0; // L: 88 - - while (var13-- > 0) { // L: 89 - var6[var16] = class182.bufferX[var13]; // L: 90 - var7[var16++] = class182.bufferY[var13]; // L: 91 - if (var16 >= var6.length) { // L: 92 - break; - } - } - - return var16; // L: 94 - } + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 68 } - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "-62" - ) - static final void method1987(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 9130 - int var7 = var3 - var1; // L: 9131 - int var8 = var6 >= 0 ? var6 : -var6; // L: 9132 - int var9 = var7 >= 0 ? var7 : -var7; // L: 9133 - int var10 = var8; // L: 9134 - if (var8 < var9) { // L: 9135 - var10 = var9; - } - - if (var10 != 0) { // L: 9136 - int var11 = (var6 << 16) / var10; // L: 9137 - int var12 = (var7 << 16) / var10; // L: 9138 - if (var12 <= var11) { // L: 9139 - var11 = -var11; - } else { - var12 = -var12; // L: 9140 - } - - int var13 = var5 * var12 >> 17; // L: 9141 - int var14 = var5 * var12 + 1 >> 17; // L: 9142 - int var15 = var5 * var11 >> 17; // L: 9143 - int var16 = var5 * var11 + 1 >> 17; // L: 9144 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9145 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9146 - int var17 = var0 + var13; // L: 9147 - int var18 = var0 - var14; // L: 9148 - int var19 = var0 + var6 - var14; // L: 9149 - int var20 = var0 + var13 + var6; // L: 9150 - int var21 = var15 + var1; // L: 9151 - int var22 = var1 - var16; // L: 9152 - int var23 = var7 + var1 - var16; // L: 9153 - int var24 = var15 + var7 + var1; // L: 9154 - Rasterizer3D.method3120(var17, var18, var19); // L: 9155 - Rasterizer3D.method3172(var21, var22, var23, var17, var18, var19, var4); // L: 9156 - Rasterizer3D.method3120(var17, var19, var20); // L: 9157 - Rasterizer3D.method3172(var21, var23, var24, var17, var19, var20, var4); // L: 9158 - } - } // L: 9159 - - @ObfuscatedName("jx") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-457226799" - ) - static void method1983(int var0) { - TaskHandler.tempMenuAction = new MenuAction(); // L: 10245 - TaskHandler.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 10246 - TaskHandler.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 10247 - TaskHandler.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 10248 - TaskHandler.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 10249 - TaskHandler.tempMenuAction.action = Client.menuActions[var0]; // L: 10250 - } // L: 10251 } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 82a50d037c..3dad9f8558 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -1,181 +1,408 @@ +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("ew") +@ObfuscatedName("ed") +@Implements("Occluder") public final class Occluder { - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive10; - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget field1950; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 299619711 - ) - int minTileX; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1317670669 - ) - int maxTileX; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -322147255 - ) - int minTileY; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -2083623235 - ) - int maxTileY; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2131844695 - ) - int type; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -453208547 - ) - int minX; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -985593835 - ) - int maxX; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1472483077 - ) - int minZ; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 459569369 - ) - int maxZ; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -2090994579 - ) - int minY; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1349976535 - ) - int maxY; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 686332819 - ) - int field1941; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -2005053087 - ) - int field1946; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -909874575 - ) - int field1943; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -327653701 - ) - int field1944; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1910772051 - ) - int field1945; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1391395895 + intValue = -313882237 ) - int field1930; + @Export("minTileX") + int minTileX; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1872976045 + ) + @Export("maxTileX") + int maxTileX; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 698541949 + ) + @Export("minTileY") + int minTileY; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1917785735 + ) + @Export("maxTileY") + int maxTileY; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 937252763 + ) + @Export("type") + int type; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 307807739 + ) + @Export("minX") + int minX; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -706741873 + ) + @Export("maxX") + int maxX; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1147462173 + ) + @Export("minZ") + int minZ; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1046615135 + ) + @Export("maxZ") + int maxZ; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -132506543 + ) + @Export("minY") + int minY; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 92389715 + ) + @Export("maxY") + int maxY; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -276045913 + ) + int field1931; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 988545829 + ) + int field1925; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 927138423 + ) + int field1933; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1152663609 + ) + int field1920; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1721087493 + ) + int field1932; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 34718795 + intValue = -666576693 ) - int field1947; + int field1936; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1378850457 + ) + int field1937; Occluder() { } // L: 23 - @ObfuscatedName("d") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-61" + descriptor = "(B)Z", + garbageValue = "22" ) - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 229 - var1.offset = var0.length - 2; // L: 230 - class335.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 231 - Username.SpriteBuffer_xOffsets = new int[class335.SpriteBuffer_spriteCount]; // L: 232 - class335.SpriteBuffer_yOffsets = new int[class335.SpriteBuffer_spriteCount]; // L: 233 - class335.SpriteBuffer_spriteWidths = new int[class335.SpriteBuffer_spriteCount]; // L: 234 - class335.SpriteBuffer_spriteHeights = new int[class335.SpriteBuffer_spriteCount]; // L: 235 - class92.SpriteBuffer_pixels = new byte[class335.SpriteBuffer_spriteCount][]; // L: 236 - var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8; // L: 237 - class335.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 238 - class335.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 239 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 240 - - int var3; - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 241 - Username.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + public static boolean method3411() { + long var0 = User.currentTimeMillis(); // L: 42 + int var2 = (int)(var0 - JagexCache.field2081); // L: 43 + JagexCache.field2081 = var0; // L: 44 + if (var2 > 200) { // L: 45 + var2 = 200; } - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 242 - class335.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 243 - class335.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 244 - class335.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 245 - TaskHandler.SpriteBuffer_spritePalette = new int[var2]; // L: 246 - - for (var3 = 1; var3 < var2; ++var3) { // L: 247 - TaskHandler.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 248 - if (TaskHandler.SpriteBuffer_spritePalette[var3] == 0) { // L: 249 - TaskHandler.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; // L: 251 - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 252 - int var4 = class335.SpriteBuffer_spriteWidths[var3]; // L: 253 - int var5 = class335.SpriteBuffer_spriteHeights[var3]; // L: 254 - int var6 = var4 * var5; // L: 255 - byte[] var7 = new byte[var6]; // L: 256 - class92.SpriteBuffer_pixels[var3] = var7; // L: 257 - int var8 = var1.readUnsignedByte(); // L: 258 - int var9; - if (var8 == 0) { // L: 259 - for (var9 = 0; var9 < var6; ++var9) { // L: 260 - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { // L: 262 - for (var9 = 0; var9 < var4; ++var9) { // L: 263 - for (int var10 = 0; var10 < var5; ++var10) { // L: 264 - var7[var9 + var10 * var4] = var1.readByte(); // L: 265 + NetCache.NetCache_loadTime += var2; // L: 46 + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 + return true; + } else if (NetCache.NetCache_socket == null) { // L: 48 + return false; + } else { + try { + if (NetCache.NetCache_loadTime > 30000) { // L: 50 + throw new IOException(); + } else { + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 + var4 = new Buffer(4); // L: 53 + var4.writeByte(1); // L: 54 + var4.writeMedium((int)var3.key); // L: 55 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 + var4 = new Buffer(4); // L: 63 + var4.writeByte(0); // L: 64 + var4.writeMedium((int)var3.key); // L: 65 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 + 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.field3190 == 0) { + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { // L: 80 + 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.field3207 != 0) { + for (var7 = 0; var7 < var6; ++var7) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var7; + var10000[var10001] ^= NetCache.field3207; + } + } + + 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(); // L: 92 + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 + long var11 = (long)(var8 + (var7 << 16)); + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); + NetCache.field3200 = true; + if (var13 == null) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 + NetCache.field3200 = false; + } + + if (var13 == null) { // L: 102 + throw new IOException(); // L: 103 + } + + int var14 = var9 == 0 ? 5 : 9; // L: 105 + NetCache.NetCache_currentResponse = var13; // L: 106 + NetCache.NetCache_responseArchiveBuffer = new Buffer(var10 + var14 + NetCache.NetCache_currentResponse.padding); // L: 107 + NetCache.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 + NetCache.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 + NetCache.field3190 = 8; // L: 110 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 + } else if (NetCache.field3190 == 0) { // L: 114 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 + NetCache.field3190 = 1; // L: 116 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 + } else { + NetCache.NetCache_currentResponse = null; // L: 121 + } + } + } else { + var6 = NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; // L: 127 + var7 = 512 - NetCache.field3190; // L: 128 + if (var7 > var6 - NetCache.NetCache_responseArchiveBuffer.offset) { // L: 129 + var7 = var6 - NetCache.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { // L: 130 + var7 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var7); // L: 131 + if (NetCache.field3207 != 0) { // L: 132 + for (var8 = 0; var8 < var7; ++var8) { // L: 133 + var10000 = NetCache.NetCache_responseArchiveBuffer.array; + var10001 = var8 + NetCache.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3207; + } + } + + var22 = NetCache.NetCache_responseArchiveBuffer; // L: 135 + var22.offset += var7; + NetCache.field3190 += var7; // L: 136 + if (var6 == NetCache.NetCache_responseArchiveBuffer.offset) { // L: 137 + if (NetCache.NetCache_currentResponse.key == 16711935L) { // L: 138 + class90.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; // L: 139 + + for (var8 = 0; var8 < 256; ++var8) { // L: 140 + Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 + if (var17 != null) { // L: 142 + class90.NetCache_reference.offset = var8 * 8 + 5; // L: 143 + var10 = class90.NetCache_reference.readInt(); // L: 144 + int var18 = class90.NetCache_reference.readInt(); // L: 145 + var17.loadIndex(var10, var18); // L: 146 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 151 + NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 + var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 + if (var8 != NetCache.NetCache_currentResponse.crc) { // L: 154 + try { + NetCache.NetCache_socket.close(); // L: 156 + } catch (Exception var20) { // L: 158 + } + + ++NetCache.NetCache_crcMismatches; // L: 159 + NetCache.NetCache_socket = null; // L: 160 + NetCache.field3207 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 + return false; // L: 162 + } + + NetCache.NetCache_crcMismatches = 0; // L: 164 + NetCache.NetCache_ioExceptions = 0; // L: 165 + NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, NetCache.field3200); // L: 166 + } + + NetCache.NetCache_currentResponse.remove(); // L: 168 + if (NetCache.field3200) { // L: 169 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 170 + } + + NetCache.field3190 = 0; // L: 171 + NetCache.NetCache_currentResponse = null; // L: 172 + NetCache.NetCache_responseArchiveBuffer = null; // L: 173 + } else { + if (NetCache.field3190 != 512) { // L: 175 + break; + } + + NetCache.field3190 = 0; + } + } + } + + return true; // L: 179 } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); // L: 183 + } catch (Exception var19) { // L: 185 + } + + ++NetCache.NetCache_ioExceptions; // L: 186 + NetCache.NetCache_socket = null; // L: 187 + return false; // L: 188 } } + } - } // L: 270 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;S)Ljava/lang/String;", + garbageValue = "150" + ) + static String method3413(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { // L: 67 + RunException var2 = (RunException)var0; // L: 68 + var1 = var2.message + " | "; // L: 69 + var0 = var2.throwable; // L: 70 + } else { + var1 = ""; // L: 72 + } + + StringWriter var12 = new StringWriter(); // L: 73 + PrintWriter var3 = new PrintWriter(var12); // L: 74 + var0.printStackTrace(var3); // L: 75 + var3.close(); // L: 76 + String var4 = var12.toString(); // L: 77 + BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78 + String var6 = var5.readLine(); // L: 79 + + while (true) { + while (true) { + String var7 = var5.readLine(); // L: 81 + if (var7 == null) { // L: 82 + var1 = var1 + "| " + var6; // L: 100 + return var1; // L: 101 + } + + int var8 = var7.indexOf(40); // L: 83 + int var9 = var7.indexOf(41, var8 + 1); // L: 84 + if (var8 >= 0 && var9 >= 0) { // L: 85 + String var10 = var7.substring(var8 + 1, var9); // L: 86 + int var11 = var10.indexOf(".java:"); // L: 87 + if (var11 >= 0) { // L: 88 + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89 + var1 = var1 + var10 + ' '; // L: 90 + continue; // L: 91 + } + + var7 = var7.substring(0, var8); // L: 93 + } + + var7 = var7.trim(); // L: 95 + var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96 + var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97 + var1 = var1 + var7 + ' '; // L: 98 + } + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1048299537" + ) + static final int method3412(int var0, int var1) { + int var2 = DynamicObject.method2357(var0 + 45365, var1 + 91923, 4) - 128 + (DynamicObject.method2357(var0 + 10294, var1 + 37821, 2) - 128 >> 1) + (DynamicObject.method2357(var0, var1, 1) - 128 >> 2); // L: 428 + var2 = (int)(0.3D * (double)var2) + 35; // L: 429 + if (var2 < 10) { // L: 430 + var2 = 10; + } else if (var2 > 60) { // L: 431 + var2 = 60; + } + + return var2; // L: 432 + } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 027a356881..8c42f3b098 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -1,182 +1,160 @@ -import java.awt.Image; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("ks") +@Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("k") - static final int[] field3729; - @ObfuscatedName("aa") - static Image field3725; - @ObfuscatedName("hu") - @ObfuscatedGetter( - intValue = 1400093691 - ) - static int cameraPitch; - @ObfuscatedName("z") + @ObfuscatedName("b") + static final int[] field3736; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lmh;" ) + @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1373505985 + intValue = -195466063 ) + @Export("bitIndex") int bitIndex; static { - field3729 = 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}; // L: 7 + field3736 = 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}; // L: 7 } public PacketBuffer(int var1) { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "687379780" + garbageValue = "2133152603" ) + @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Llh;I)V", - garbageValue = "-1243349913" + descriptor = "(Lmh;I)V", + garbageValue = "-1550186830" ) + @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "28692652" + garbageValue = "-1377827513" ) + @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "3" + garbageValue = "-117" ) + @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-345140221" + descriptor = "(B)Z", + garbageValue = "-31" ) - public boolean method5564() { - int var1 = super.array[super.offset] - this.isaacCipher.method6394() & 255; // L: 31 + public boolean method5582() { + int var1 = super.array[super.offset] - this.isaacCipher.method6417() & 255; // L: 31 return var1 >= 128; // L: 32 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-121" + descriptor = "(I)I", + garbageValue = "534940999" ) + @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 37 return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-1310609105" + garbageValue = "-84170760" ) - public void method5566(byte[] var1, int var2, int var3) { + public void method5584(byte[] var1, int var2, int var3) { for (int var4 = 0; var4 < var3; ++var4) { // L: 43 var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } } // L: 44 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1646456009" + descriptor = "(B)V", + garbageValue = "46" ) + @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "606103556" + descriptor = "(IB)I", + garbageValue = "0" ) + @Export("readBits") public int readBits(int var1) { int var2 = this.bitIndex >> 3; // L: 51 int var3 = 8 - (this.bitIndex & 7); // L: 52 int var4 = 0; // L: 53 for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field3729[var3]) << var1 - var3; // L: 56 + var4 += (super.array[var2++] & field3736[var3]) << var1 - var3; // L: 56 var1 -= var3; // L: 57 } if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field3729[var3]; + var4 += super.array[var2] & field3736[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3729[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field3736[var1]; // L: 61 } return var4; // L: 62 } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2092208058" + garbageValue = "-1212001290" ) + @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-20679" + descriptor = "(II)I", + garbageValue = "760869568" ) + @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; // L: 70 } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "(Lbf;IIBI)V", - garbageValue = "-872449297" - ) - static final void method5598(Player var0, int var1, int var2, byte var3) { - int var4 = var0.pathX[0]; // L: 6982 - int var5 = var0.pathY[0]; // L: 6983 - int var6 = var0.transformedSize(); // L: 6984 - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 6985 - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 6986 - int var9 = var0.transformedSize(); // L: 6989 - Client.field950.approxDestinationX = var1; // L: 6992 - Client.field950.approxDestinationY = var2; // L: 6993 - Client.field950.approxDestinationSizeX = 1; // L: 6994 - Client.field950.approxDestinationSizeY = 1; // L: 6995 - ApproximateRouteStrategy var10 = Client.field950; // L: 6996 - int var11 = ObjectSound.method1986(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.field830, Client.field952); // L: 6998 - if (var11 >= 1) { // L: 6999 - for (int var12 = 0; var12 < var11 - 1; ++var12) { // L: 7000 - var0.method1288(Client.field830[var12], Client.field952[var12], var3); - } - - } - } - } - } // L: 7001 } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index f8651cc691..ff32554f46 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -1,38 +1,47 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gk") +@Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "[Lgb;" - ) - static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 110077839 - ) - static int PacketBufferNode_packetBufferNodeCount; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "[Lgk;" ) - ClientPacket clientPacket; - @ObfuscatedName("k") + @Export("PacketBufferNode_packetBufferNodes") + static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1747169149 + intValue = 606603159 ) - int clientPacketLength; - @ObfuscatedName("s") + @Export("PacketBufferNode_packetBufferNodeCount") + static int PacketBufferNode_packetBufferNodeCount; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lky;" + descriptor = "Lgz;" ) - public PacketBuffer packetBuffer; - @ObfuscatedName("t") + @Export("clientPacket") + ClientPacket clientPacket; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1051886947 + intValue = 532342923 ) + @Export("clientPacketLength") + int clientPacketLength; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + @Export("packetBuffer") + public PacketBuffer packetBuffer; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -690165039 + ) + @Export("index") public int index; static { @@ -43,43 +52,89 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } // L: 19 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1940555210" + garbageValue = "-1831799327" ) + @Export("release") public void release() { if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 50 PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 51 } } // L: 52 - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "416660759" + garbageValue = "-1081926235" ) - static void method3726() { - Login.worldSelectOpen = false; // L: 1738 - UserComparator2.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1739 - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1740 - AbstractByteArrayCopier.logoSprite.drawAt(Login.xPadding + 382 - AbstractByteArrayCopier.logoSprite.subWidth / 2, 18); // L: 1741 - } // L: 1742 + static void method3768() { + class248.field3216 = new int[2000]; // L: 25 + int var0 = 0; // L: 26 + int var1 = 240; // L: 27 - @ObfuscatedName("aa") + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { // L: 28 + var3 = Player.method1325((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var0 / 16.0F + 0.075F)); // L: 30 + class248.field3216[var0] = var3; // L: 31 + ++var0; // L: 29 + } + + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < class248.field3216.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = Player.method1325((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class248.field3216.length; ++var0) { // L: 37 38 + class248.field3216[var0] = var4; // L: 39 + } + } + + } // L: 43 + + @ObfuscatedName("ij") @ObfuscatedSignature( - descriptor = "(Ldc;B)V", - garbageValue = "1" + descriptor = "(Lht;IIIIIIB)V", + garbageValue = "19" ) - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; // L: 266 - if (var0.sound != null) { // L: 267 - var0.sound.position = 0; + static final void method3759(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field690) { // L: 9940 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 9941 } - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { // L: 268 - PcmStream_disable(var1); + Client.field690 = false; // L: 9942 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !MusicPatchNode.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 9943 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 9944 + var0.scrollY -= 4; // L: 9945 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var0); // L: 9946 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 9948 + var0.scrollY += 4; // L: 9949 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var0); // L: 9950 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 9952 + var7 = var3 * (var3 - 32) / var4; // L: 9953 + if (var7 < 8) { // L: 9954 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 9955 + int var9 = var3 - 32 - var7; // L: 9956 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 9957 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var0); // L: 9958 + Client.field690 = true; // L: 9959 + } } - } // L: 269 + if (Client.mouseWheelRotation != 0) { // L: 9962 + var7 = var0.width; // L: 9963 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 9964 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 9965 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var0); // L: 9966 + } + } + + } // L: 9969 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 18ab55ac5a..af831ff747 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -1,155 +1,172 @@ +import java.io.DataInputStream; import java.io.IOException; +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("dx") +@ObfuscatedName("dg") +@Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("cw") - public static char field1350; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llv;" + ) + @Export("socket") + AbstractSocket socket; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Ljs;" + ) + @Export("packetBufferNodes") + IterableNodeDeque packetBufferNodes; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 921396255 + ) + @Export("bufferSize") + int bufferSize; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + @Export("buffer") + Buffer buffer; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lln;" + descriptor = "Lmh;" ) - AbstractSocket socket; + @Export("isaacCipher") + public IsaacCipher isaacCipher; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lks;" + ) + @Export("packetBuffer") + PacketBuffer packetBuffer; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Lgw;" ) - IterableNodeDeque packetBufferNodes; - @ObfuscatedName("s") + @Export("serverPacket") + ServerPacket serverPacket; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1900413985 + intValue = 67173535 ) - int bufferSize; + @Export("serverPacketLength") + int serverPacketLength; + @ObfuscatedName("u") + boolean field1340; @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lkf;" + @ObfuscatedGetter( + intValue = -330616605 ) - Buffer buffer; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Llh;" + int field1337; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -708203583 ) - public IsaacCipher isaacCipher; + @Export("pendingWrites") + int pendingWrites; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lky;" - ) - PacketBuffer packetBuffer; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - ServerPacket serverPacket; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1678952517 - ) - int serverPacketLength; - @ObfuscatedName("g") - boolean field1344; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 2044305253 - ) - int field1345; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 2009057559 - ) - int pendingWrites; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - ServerPacket field1336; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) ServerPacket field1348; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - ServerPacket field1346; + ServerPacket field1339; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + ServerPacket field1350; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); - this.bufferSize = 0; - this.buffer = new Buffer(5000); - this.packetBuffer = new PacketBuffer(40000); + this.bufferSize = 0; // L: 16 + this.buffer = new Buffer(5000); // L: 17 + this.packetBuffer = new PacketBuffer(40000); // L: 19 this.serverPacket = null; // L: 20 - this.serverPacketLength = 0; - this.field1344 = true; - this.field1345 = 0; + this.serverPacketLength = 0; // L: 21 + this.field1340 = true; // L: 22 + this.field1337 = 0; // L: 23 this.pendingWrites = 0; // L: 24 - } + } // L: 29 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-256200238" + garbageValue = "702095612" ) + @Export("clearBuffer") final void clearBuffer() { this.packetBufferNodes.rsClear(); // L: 32 - this.bufferSize = 0; // L: 33 - } // L: 34 + this.bufferSize = 0; + } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1276124374" + descriptor = "(B)V", + garbageValue = "73" ) + @Export("flush") final void flush() throws IOException { - if (this.socket != null && this.bufferSize > 0) { // L: 37 + if (this.socket != null && this.bufferSize > 0) { this.buffer.offset = 0; // L: 38 while (true) { - PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); // L: 40 - if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { // L: 41 42 + PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); + if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { this.socket.write(this.buffer.array, 0, this.buffer.offset); // L: 49 this.pendingWrites = 0; break; } - this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); // L: 43 - this.bufferSize -= var1.index; // L: 44 - var1.remove(); // L: 45 - var1.packetBuffer.releaseArray(); // L: 46 - var1.release(); // L: 47 + this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); + this.bufferSize -= var1.index; + var1.remove(); + var1.packetBuffer.releaseArray(); + var1.release(); } } - } + } // L: 52 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgb;I)V", - garbageValue = "1906163027" + descriptor = "(Lgk;B)V", + garbageValue = "29" ) + @Export("addNode") public final void addNode(PacketBufferNode var1) { - this.packetBufferNodes.addFirst(var1); + this.packetBufferNodes.addFirst(var1); // L: 55 var1.index = var1.packetBuffer.offset; // L: 56 var1.packetBuffer.offset = 0; // L: 57 this.bufferSize += var1.index; // L: 58 } // L: 59 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lln;I)V", - garbageValue = "-666263315" + descriptor = "(Llv;I)V", + garbageValue = "-640227269" ) + @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; // L: 62 } // L: 63 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2058968107" + garbageValue = "-1950086546" ) + @Export("close") void close() { if (this.socket != null) { // L: 66 this.socket.close(); // L: 67 @@ -158,112 +175,203 @@ public class PacketWriter { } // L: 70 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-102" + descriptor = "(I)V", + garbageValue = "-1804593474" ) + @Export("removeSocket") void removeSocket() { this.socket = null; // L: 73 } // L: 74 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Lln;", - garbageValue = "43" + descriptor = "(S)Llv;", + garbageValue = "310" ) + @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "-123" + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", + garbageValue = "60" ) - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class306.field3723) { // L: 15 - class217.field2536 += class306.field3723 - var0; - } + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; // L: 33 + if (var1 != null) { // L: 34 + var2 = Occluder.method3413(var1); + } - class306.field3723 = var0; - return class217.field2536 + var0; - } + if (var0 != null) { // L: 35 + if (var1 != null) { // L: 36 + var2 = var2 + " | "; + } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lkf;Llq;I)Llq;", - garbageValue = "309027289" - ) - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 - int var3; - if (var1 == null) { // L: 17 - var3 = class297.method5378(var2); // L: 18 - var1 = new IterableNodeHashTable(var3); // L: 19 - } + var2 = var2 + var0; // L: 37 + } - for (var3 = 0; var3 < var2; ++var3) { // L: 21 - boolean var4 = var0.readUnsignedByte() == 1; // L: 22 - int var5 = var0.readMedium(); // L: 23 - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25 - } else { - var6 = new IntegerNode(var0.readInt()); // L: 26 + System.out.println("Error: " + var2); // L: 39 + var2 = var2.replace(':', '.'); // L: 40 + var2 = var2.replace('@', '_'); // L: 41 + var2 = var2.replace('&', '_'); // L: 42 + var2 = var2.replace('#', '_'); // L: 43 + if (RunException.RunException_applet == null) { // L: 44 + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + class217.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + NetFileRequest.clientType + "&e=" + var2); // L: 45 + DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46 + var4.read(); // L: 47 + var4.close(); // L: 48 + } catch (Exception var5) { // L: 50 } - var1.put((Node)var6, (long)var5); // L: 27 } + } // L: 51 - return var1; // L: 29 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Llu;", + garbageValue = "987618759" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.SOLID, FillMode.GRADIENT_ALPHA, FillMode.GRADIENT}; // L: 15 } - @ObfuscatedName("s") + @ObfuscatedName("go") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-371855810" + descriptor = "(ZLks;I)V", + garbageValue = "-232306457" ) - public static void method2357() { - if (MouseHandler.MouseHandler_instance != null) { // L: 50 - synchronized(MouseHandler.MouseHandler_instance) { // L: 51 - MouseHandler.MouseHandler_instance = null; // L: 52 - } // L: 53 - } + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 5480 + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 5481 + var2 = var1.method5797(); // L: 5482 + var3 = var1.method5797(); // L: 5483 + int var4 = var1.readUnsignedShort(); // L: 5484 + WorldMapEvent.xteaKeys = new int[var4][4]; // L: 5485 - } // L: 55 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-27993" - ) - public static int method2360(int var0) { - if (var0 > 0) { // L: 190 - return 1; - } else { - return var0 < 0 ? -1 : 0; // L: 191 192 - } - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "82642187" - ) - static final void Widget_resetModelFrames(int var0) { - if (WorldMapSprite.loadInterface(var0)) { // L: 10286 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 10287 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 10288 - Widget var3 = var1[var2]; // L: 10289 - if (var3 != null) { // L: 10290 - var3.modelFrame = 0; // L: 10291 - var3.modelFrameCycle = 0; // L: 10292 + for (var5 = 0; var5 < var4; ++var5) { // L: 5486 + for (var6 = 0; var6 < 4; ++var6) { // L: 5487 + WorldMapEvent.xteaKeys[var5][var6] = var1.readInt(); // L: 5488 } } + class52.regions = new int[var4]; // L: 5491 + class22.regionMapArchiveIds = new int[var4]; // L: 5492 + WallDecoration.regionLandArchiveIds = new int[var4]; // L: 5493 + GrandExchangeOffer.regionLandArchives = new byte[var4][]; // L: 5494 + GameShell.regionMapArchives = new byte[var4][]; // L: 5495 + boolean var16 = false; // L: 5496 + if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5497 + var16 = true; + } + + if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5498 + var16 = true; + } + + var4 = 0; // L: 5499 + + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5500 + for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5501 + var8 = var7 + (var6 << 8); // L: 5502 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5503 + class52.regions[var4] = var8; // L: 5504 + class22.regionMapArchiveIds[var4] = Varcs.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5505 + WallDecoration.regionLandArchiveIds[var4] = Varcs.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5506 + ++var4; // L: 5507 + } + } + } + + Projectile.method2223(var2, var3, true); // L: 5510 + } else { + var2 = var1.method5659(); // L: 5513 + var3 = var1.method5659(); // L: 5514 + boolean var15 = var1.method5668() == 1; // L: 5515 + var5 = var1.readUnsignedShort(); // L: 5516 + var1.importIndex(); // L: 5517 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5518 + for (var7 = 0; var7 < 13; ++var7) { // L: 5519 + for (var8 = 0; var8 < 13; ++var8) { // L: 5520 + var9 = var1.readBits(1); // L: 5521 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5522 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5523 + } + } + } + } + + var1.exportIndex(); // L: 5527 + WorldMapEvent.xteaKeys = new int[var5][4]; // L: 5528 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5529 + for (var7 = 0; var7 < 4; ++var7) { // L: 5530 + WorldMapEvent.xteaKeys[var6][var7] = var1.readInt(); // L: 5531 + } + } + + class52.regions = new int[var5]; // L: 5534 + class22.regionMapArchiveIds = new int[var5]; // L: 5535 + WallDecoration.regionLandArchiveIds = new int[var5]; // L: 5536 + GrandExchangeOffer.regionLandArchives = new byte[var5][]; // L: 5537 + GameShell.regionMapArchives = new byte[var5][]; // L: 5538 + var5 = 0; // L: 5539 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5540 + for (var7 = 0; var7 < 13; ++var7) { // L: 5541 + for (var8 = 0; var8 < 13; ++var8) { // L: 5542 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5543 + if (var9 != -1) { // L: 5544 + int var10 = var9 >> 14 & 1023; // L: 5545 + int var11 = var9 >> 3 & 2047; // L: 5546 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5547 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5548 + if (class52.regions[var13] == var12) { + var12 = -1; // L: 5549 + break; // L: 5550 + } + } + + if (var12 != -1) { // L: 5552 + class52.regions[var5] = var12; // L: 5553 + var13 = var12 >> 8 & 255; // L: 5554 + int var14 = var12 & 255; // L: 5555 + class22.regionMapArchiveIds[var5] = Varcs.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5556 + WallDecoration.regionLandArchiveIds[var5] = Varcs.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5557 + ++var5; // L: 5558 + } + } + } + } + } + + Projectile.method2223(var3, var2, !var15); // L: 5564 } - } // L: 10294 + + } // L: 5566 } diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 1b289c32e5..be0bdd856a 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -1,29 +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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("il") +@ObfuscatedName("ju") +@Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("ParamDefinition_archive") public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) - static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("s") + @Export("ParamDefinition_cached") + public static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("l") + @Export("type") char type; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2056477959 + intValue = 432424679 ) + @Export("defaultInt") public int defaultInt; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("defaultStr") public String defaultStr; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("autoDisable") boolean autoDisable; static { @@ -34,19 +44,21 @@ public class ParamDefinition extends DualNode { this.autoDisable = true; // L: 16 } // L: 18 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "964888854" + garbageValue = "1987481332" ) + @Export("postDecode") void postDecode() { } // L: 31 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "2" + descriptor = "(Lkb;I)V", + garbageValue = "-425218539" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 35 @@ -58,11 +70,12 @@ public class ParamDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-659243660" + descriptor = "(Lkb;II)V", + garbageValue = "1961390575" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 42 byte var4 = var1.readByte(); // L: 44 @@ -72,7 +85,7 @@ public class ParamDefinition extends DualNode { } if (var5 >= 128 && var5 < 160) { // L: 48 - char var6 = class297.cp1252AsciiExtension[var5 - 128]; // L: 49 + char var6 = class298.cp1252AsciiExtension[var5 - 128]; // L: 49 if (var6 == 0) { // L: 50 var6 = '?'; } @@ -92,12 +105,81 @@ public class ParamDefinition extends DualNode { } // L: 61 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "937250031" + descriptor = "(B)Z", + garbageValue = "-12" ) + @Export("isString") public boolean isString() { return this.type == 's'; // L: 64 } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Liw;Ljava/lang/String;Ljava/lang/String;I)[Llc;", + garbageValue = "-1513719503" + ) + public static Sprite[] method4677(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 160 + int var4 = var0.getFileId(var3, var2); // L: 161 + return HorizontalAlignment.method4882(var0, var3, var4); // L: 162 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ILco;ZB)I", + garbageValue = "6" + ) + static int method4671(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 1039 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1040 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1041 + return 1; // L: 1042 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1044 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1045 + return 1; // L: 1046 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1048 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.text; // L: 1049 + return 1; // L: 1050 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1052 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1053 + return 1; // L: 1054 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1056 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1057 + return 1; // L: 1058 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1060 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1061 + return 1; // L: 1062 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1064 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1065 + return 1; // L: 1066 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1068 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1069 + return 1; // L: 1070 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1072 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1073 + return 1; // L: 1074 + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1076 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1077 + return 1; // L: 1078 + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1080 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1081 + return 1; // L: 1082 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1084 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.color; // L: 1085 + return 1; // L: 1086 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1088 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.color2; // L: 1089 + return 1; // L: 1090 + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1092 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1093 + return 1; // L: 1094 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1096 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1097 + return 1; // L: 1098 + } else { + return 2; // L: 1100 + } + } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index eeb09e09ee..93a8e07428 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,460 +1,519 @@ -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("dr") +@ObfuscatedName("dh") +@Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("i") + @ObfuscatedName("rb") @ObfuscatedGetter( - intValue = 1149689047 + intValue = 410930349 ) - public static int field1447; - @ObfuscatedName("o") - protected static boolean PcmPlayer_stereo; - @ObfuscatedName("w") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("fb") + static int field1449; + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 2634650448797948467L + intValue = 445943663 ) - static long field1430; - @ObfuscatedName("a") - protected int[] samples; + public static int field1442; @ObfuscatedName("q") + @Export("PcmPlayer_stereo") + public static boolean PcmPlayer_stereo; + @ObfuscatedName("be") + @Export("worldListURL") + static String worldListURL; + @ObfuscatedName("x") + @Export("samples") + protected int[] samples; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lde;" ) + @Export("stream") PcmStream stream; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1444527341 - ) - int field1435; - @ObfuscatedName("f") - @ObfuscatedGetter( - longValue = -2930435928401446917L - ) - long timeMs; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -149687327 - ) - int capacity; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1461747439 - ) - int field1438; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 813792905 - ) - int field1451; @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -2022966020506386053L + intValue = -420218683 ) - long field1440; - @ObfuscatedName("u") + int field1438; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1855020445 + longValue = -2584674083897744543L ) - int field1446; - @ObfuscatedName("p") + @Export("timeMs") + long timeMs; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1127622439 + intValue = -2101974297 ) - int field1442; - @ObfuscatedName("b") + @Export("capacity") + int capacity; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1705628685 - ) - int field1443; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = 4977190421454866475L - ) - long field1444; - @ObfuscatedName("e") - boolean field1445; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -83389805 + intValue = 1733688779 ) int field1441; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "[Ldc;" + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1246439087 ) - PcmStream[] field1448; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "[Ldc;" + int field1454; + @ObfuscatedName("v") + @ObfuscatedGetter( + longValue = -2737488179381108627L ) - PcmStream[] field1449; + long field1432; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 704933067 + ) + int field1444; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1488004649 + ) + int field1445; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 2114790969 + ) + int field1435; + @ObfuscatedName("h") + @ObfuscatedGetter( + longValue = -7835668176490123993L + ) + long field1456; + @ObfuscatedName("i") + boolean field1448; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = -1431776873 + ) + int field1450; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "[Lde;" + ) + PcmStream[] field1451; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "[Lde;" + ) + PcmStream[] field1452; protected PcmPlayer() { - this.field1435 = 32; // L: 22 - this.timeMs = PacketWriter.currentTimeMillis(); // L: 23 - this.field1440 = 0L; // L: 27 - this.field1446 = 0; // L: 28 - this.field1442 = 0; // L: 29 - this.field1443 = 0; // L: 30 - this.field1444 = 0L; // L: 31 - this.field1445 = true; // L: 32 - this.field1441 = 0; // L: 38 - this.field1448 = new PcmStream[8]; // L: 39 - this.field1449 = new PcmStream[8]; // L: 40 + this.field1438 = 32; // L: 22 + this.timeMs = User.currentTimeMillis(); // L: 23 + this.field1432 = 0L; // L: 27 + this.field1444 = 0; // L: 28 + this.field1445 = 0; // L: 29 + this.field1435 = 0; // L: 30 + this.field1456 = 0L; // L: 31 + this.field1448 = true; // L: 32 + this.field1450 = 0; // L: 38 + this.field1451 = new PcmStream[8]; // L: 39 + this.field1452 = new PcmStream[8]; // L: 40 } // L: 42 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-906788639" + ) + @Export("init") + protected void init() throws Exception { + } // L: 273 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-32" + ) + @Export("open") + protected void open(int var1) throws Exception { + } // L: 274 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-612241013" + ) + @Export("position") + protected int position() throws Exception { + return this.capacity; // L: 277 + } + + @ObfuscatedName("m") + @Export("write") + protected void write() throws Exception { + } // L: 280 + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-841767260" + descriptor = "(B)V", + garbageValue = "0" ) - protected void init() throws Exception { - } // L: 280 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-120" - ) - protected void open(int var1) throws Exception { + @Export("close") + protected void close() { } // L: 281 + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1393012391" + ) + @Export("discard") + protected void discard() throws Exception { + } // L: 282 + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "106" - ) - protected int position() throws Exception { - return this.capacity; // L: 284 - } - - @ObfuscatedName("t") - protected void write() throws Exception { - } // L: 287 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "667465439" - ) - protected void close() { - } // L: 288 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2027971398" - ) - protected void discard() throws Exception { - } // L: 289 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ldc;I)V", - garbageValue = "35825022" + descriptor = "(Lde;I)V", + garbageValue = "-239504049" ) + @Export("setStream") public final synchronized void setStream(PcmStream var1) { - this.stream = var1; // L: 79 - } // L: 80 + this.stream = var1; // L: 72 + } // L: 73 - @ObfuscatedName("ab") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1677504744" + descriptor = "(B)V", + garbageValue = "29" ) + @Export("run") public final synchronized void run() { - if (this.samples != null) { // L: 83 - long var1 = PacketWriter.currentTimeMillis(); // L: 84 + if (this.samples != null) { // L: 76 + long var1 = User.currentTimeMillis(); // L: 77 try { - if (this.field1440 != 0L) { // L: 86 - if (var1 < this.field1440) { // L: 87 + if (0L != this.field1432) { // L: 79 + if (var1 < this.field1432) { // L: 80 return; } - this.open(this.capacity); // L: 88 - this.field1440 = 0L; // L: 89 - this.field1445 = true; // L: 90 + this.open(this.capacity); // L: 81 + this.field1432 = 0L; // L: 82 + this.field1448 = true; // L: 83 } - int var3 = this.position(); // L: 92 - if (this.field1443 - var3 > this.field1446) { // L: 93 - this.field1446 = this.field1443 - var3; + int var3 = this.position(); // L: 85 + if (this.field1435 - var3 > this.field1444) { // L: 86 + this.field1444 = this.field1435 - var3; } - int var4 = this.field1451 + this.field1438; // L: 94 - if (var4 + 256 > 16384) { // L: 95 + int var4 = this.field1441 + this.field1454; // L: 87 + if (var4 + 256 > 16384) { // L: 88 var4 = 16128; } - if (var4 + 256 > this.capacity) { // L: 96 - this.capacity += 1024; // L: 97 - if (this.capacity > 16384) { // L: 98 + if (var4 + 256 > this.capacity) { // L: 89 + this.capacity += 1024; // L: 90 + if (this.capacity > 16384) { // L: 91 this.capacity = 16384; } - this.close(); // L: 99 - this.open(this.capacity); // L: 100 - var3 = 0; // L: 101 - this.field1445 = true; // L: 102 - if (var4 + 256 > this.capacity) { // L: 103 - var4 = this.capacity - 256; // L: 104 - this.field1451 = var4 - this.field1438; // L: 105 + this.close(); // L: 92 + this.open(this.capacity); // L: 93 + var3 = 0; // L: 94 + this.field1448 = true; // L: 95 + if (var4 + 256 > this.capacity) { // L: 96 + var4 = this.capacity - 256; // L: 97 + this.field1454 = var4 - this.field1441; // L: 98 } } - while (var3 < var4) { // L: 108 - this.fill(this.samples, 256); // L: 109 - this.write(); // L: 110 - var3 += 256; // L: 111 + while (var3 < var4) { // L: 101 + this.fill(this.samples, 256); // L: 102 + this.write(); // L: 103 + var3 += 256; // L: 104 } - if (var1 > this.field1444) { // L: 113 - if (!this.field1445) { // L: 114 - if (this.field1446 == 0 && this.field1442 == 0) { // L: 115 - this.close(); // L: 116 - this.field1440 = 2000L + var1; // L: 117 - return; // L: 118 + if (var1 > this.field1456) { // L: 106 + if (!this.field1448) { // L: 107 + if (this.field1444 == 0 && this.field1445 == 0) { // L: 108 + this.close(); // L: 109 + this.field1432 = 2000L + var1; // L: 110 + return; // L: 111 } - this.field1451 = Math.min(this.field1442, this.field1446); // L: 120 - this.field1442 = this.field1446; // L: 121 + this.field1454 = Math.min(this.field1445, this.field1444); // L: 113 + this.field1445 = this.field1444; // L: 114 } else { - this.field1445 = false; // L: 123 + this.field1448 = false; // L: 116 } - this.field1446 = 0; // L: 124 - this.field1444 = 2000L + var1; // L: 125 + this.field1444 = 0; // L: 117 + this.field1456 = 2000L + var1; // L: 118 } - this.field1443 = var3; // L: 127 - } catch (Exception var7) { // L: 129 - this.close(); // L: 130 - this.field1440 = var1 + 2000L; // L: 131 + this.field1435 = var3; // L: 120 + } catch (Exception var7) { // L: 122 + this.close(); // L: 123 + this.field1432 = var1 + 2000L; // L: 124 } try { - if (var1 > this.timeMs + 500000L) { // L: 134 + if (var1 > 500000L + this.timeMs) { // L: 127 var1 = this.timeMs; } - while (var1 > 5000L + this.timeMs) { // L: 135 - this.skip(256); // L: 136 - this.timeMs += (long)(256000 / field1447); // L: 137 + while (var1 > 5000L + this.timeMs) { // L: 128 + this.skip(256); // L: 129 + this.timeMs += (long)(256000 / field1442); // L: 130 } - } catch (Exception var6) { // L: 140 - this.timeMs = var1; // L: 141 + } catch (Exception var6) { // L: 133 + this.timeMs = var1; // L: 134 } } - } // L: 143 + } // L: 136 - @ObfuscatedName("ag") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2142907235" + garbageValue = "-170851511" ) - public final void method2517() { - this.field1445 = true; // L: 146 - } // L: 147 + public final void method2562() { + this.field1448 = true; // L: 139 + } // L: 140 - @ObfuscatedName("ao") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "30633041" + garbageValue = "2091297211" ) + @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1445 = true; // L: 150 + this.field1448 = true; // L: 143 try { - this.discard(); // L: 152 - } catch (Exception var2) { // L: 154 - this.close(); // L: 155 - this.field1440 = PacketWriter.currentTimeMillis() + 2000L; // L: 156 + this.discard(); // L: 145 + } catch (Exception var2) { // L: 147 + this.close(); // L: 148 + this.field1432 = User.currentTimeMillis() + 2000L; // L: 149 } - } // L: 158 + } // L: 151 - @ObfuscatedName("ae") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2048322330" + descriptor = "(B)V", + garbageValue = "115" ) + @Export("shutdown") public final synchronized void shutdown() { - if (class1.soundSystem != null) { // L: 161 - boolean var1 = true; // L: 162 + if (WorldMapDecoration.soundSystem != null) { // L: 154 + boolean var1 = true; // L: 155 - for (int var2 = 0; var2 < 2; ++var2) { // L: 163 - if (this == class1.soundSystem.players[var2]) { // L: 164 - class1.soundSystem.players[var2] = null; + for (int var2 = 0; var2 < 2; ++var2) { // L: 156 + if (this == WorldMapDecoration.soundSystem.players[var2]) { // L: 157 + WorldMapDecoration.soundSystem.players[var2] = null; } - if (class1.soundSystem.players[var2] != null) { // L: 165 + if (WorldMapDecoration.soundSystem.players[var2] != null) { // L: 158 var1 = false; } } - if (var1) { // L: 167 - soundSystemExecutor.shutdownNow(); // L: 168 - soundSystemExecutor = null; // L: 169 - class1.soundSystem = null; // L: 170 + if (var1) { // L: 160 + RunException.soundSystemExecutor.shutdownNow(); // L: 161 + RunException.soundSystemExecutor = null; // L: 162 + WorldMapDecoration.soundSystem = null; // L: 163 } } - this.close(); // L: 173 - this.samples = null; // L: 174 - } // L: 175 + this.close(); // L: 166 + this.samples = null; // L: 167 + } // L: 168 - @ObfuscatedName("ap") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2014217671" + descriptor = "(IB)V", + garbageValue = "79" ) + @Export("skip") final void skip(int var1) { - this.field1441 -= var1; // L: 178 - if (this.field1441 < 0) { - this.field1441 = 0; // L: 179 + this.field1450 -= var1; // L: 171 + if (this.field1450 < 0) { + this.field1450 = 0; // L: 172 } if (this.stream != null) { - this.stream.skip(var1); // L: 180 + this.stream.skip(var1); // L: 173 } - } // L: 181 + } // L: 174 - @ObfuscatedName("au") + @ObfuscatedName("ab") + @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; // L: 185 - if (PcmPlayer_stereo) { // L: 186 + int var3 = var2; // L: 178 + if (PcmPlayer_stereo) { // L: 179 var3 = var2 << 1; } - class310.clearIntArray(var1, 0, var3); // L: 187 - this.field1441 -= var2; // L: 188 - if (this.stream != null && this.field1441 <= 0) { // L: 189 - this.field1441 += field1447 >> 4; // L: 190 - PacketBufferNode.PcmStream_disable(this.stream); // L: 191 - this.method2522(this.stream, this.stream.vmethod2837()); // L: 192 - int var4 = 0; // L: 193 - int var5 = 255; // L: 194 + class311.clearIntArray(var1, 0, var3); // L: 180 + this.field1450 -= var2; // L: 181 + if (this.stream != null && this.field1450 <= 0) { // L: 182 + this.field1450 += field1442 >> 4; // L: 183 + Client.PcmStream_disable(this.stream); + this.method2606(this.stream, this.stream.vmethod2850()); + int var4 = 0; + int var5 = 255; // L: 187 int var6; PcmStream var10; label108: - for (var6 = 7; var5 != 0; --var6) { // L: 195 + for (var6 = 7; var5 != 0; --var6) { // L: 188 int var7; int var8; - if (var6 < 0) { // L: 198 - var7 = var6 & 3; // L: 199 - var8 = -(var6 >> 2); // L: 200 + if (var6 < 0) { // L: 191 + var7 = var6 & 3; // L: 192 + var8 = -(var6 >> 2); // L: 193 } else { - var7 = var6; // L: 203 - var8 = 0; // L: 204 + var7 = var6; // L: 196 + var8 = 0; // L: 197 } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 206 208 - if ((var9 & 1) != 0) { // L: 211 - var5 &= ~(1 << var7); // L: 214 - var10 = null; // L: 215 - PcmStream var11 = this.field1448[var7]; // L: 216 + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 199 201 + if ((var9 & 1) != 0) { // L: 204 + var5 &= ~(1 << var7); // L: 207 + var10 = null; // L: 208 + PcmStream var11 = this.field1451[var7]; // L: 209 label102: while (true) { while (true) { - if (var11 == null) { // L: 217 + if (var11 == null) { // L: 210 break label102; } - AbstractSound var12 = var11.sound; // L: 218 - if (var12 != null && var12.position > var8) { // L: 219 - var5 |= 1 << var7; // L: 220 - var10 = var11; // L: 221 - var11 = var11.after; // L: 222 + AbstractSound var12 = var11.sound; // L: 211 + if (var12 != null && var12.position > var8) { // L: 212 + var5 |= 1 << var7; // L: 213 + var10 = var11; // L: 214 + var11 = var11.after; // L: 215 } else { - var11.active = true; // L: 225 - int var13 = var11.vmethod3987(); // L: 226 - var4 += var13; // L: 227 + var11.active = true; // L: 218 + int var13 = var11.vmethod4043(); // L: 219 + var4 += var13; // L: 220 if (var12 != null) { - var12.position += var13; // L: 228 + var12.position += var13; // L: 221 } - if (var4 >= this.field1435) { // L: 229 + if (var4 >= this.field1438) { // L: 222 break label108; } - PcmStream var14 = var11.firstSubStream(); // L: 230 - if (var14 != null) { // L: 231 - for (int var15 = var11.field1519; var14 != null; var14 = var11.nextSubStream()) { // L: 232 233 235 - this.method2522(var14, var15 * var14.vmethod2837() >> 8); // L: 234 + PcmStream var14 = var11.firstSubStream(); // L: 223 + if (var14 != null) { // L: 224 + for (int var15 = var11.field1520; var14 != null; var14 = var11.nextSubStream()) { // L: 225 226 228 + this.method2606(var14, var15 * var14.vmethod2850() >> 8); // L: 227 } } - PcmStream var18 = var11.after; // L: 238 - var11.after = null; // L: 239 - if (var10 == null) { // L: 240 - this.field1448[var7] = var18; + PcmStream var18 = var11.after; // L: 231 + var11.after = null; // L: 232 + if (var10 == null) { // L: 233 + this.field1451[var7] = var18; } else { - var10.after = var18; // L: 241 + var10.after = var18; // L: 234 } - if (var18 == null) { // L: 242 - this.field1449[var7] = var10; + if (var18 == null) { // L: 235 + this.field1452[var7] = var10; } - var11 = var18; // L: 243 + var11 = var18; // L: 236 } } } } - var7 += 4; // L: 207 + var7 += 4; // L: 200 ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { // L: 247 - PcmStream var16 = this.field1448[var6]; // L: 248 - PcmStream[] var17 = this.field1448; // L: 249 - this.field1449[var6] = null; // L: 251 + for (var6 = 0; var6 < 8; ++var6) { // L: 240 + PcmStream var16 = this.field1451[var6]; // L: 241 + PcmStream[] var17 = this.field1451; // L: 242 + this.field1452[var6] = null; // L: 244 - for (var17[var6] = null; var16 != null; var16 = var10) { // L: 252 253 256 - var10 = var16.after; // L: 254 - var16.after = null; // L: 255 + for (var17[var6] = null; var16 != null; var16 = var10) { // L: 245 246 249 + var10 = var16.after; // L: 247 + var16.after = null; // L: 248 } } } - if (this.field1441 < 0) { // L: 260 - this.field1441 = 0; + if (this.field1450 < 0) { // L: 253 + this.field1450 = 0; } if (this.stream != null) { - this.stream.fill(var1, 0, var2); // L: 261 + this.stream.fill(var1, 0, var2); // L: 254 } - this.timeMs = PacketWriter.currentTimeMillis(); // L: 262 - } // L: 263 + this.timeMs = User.currentTimeMillis(); // L: 255 + } // L: 256 - @ObfuscatedName("ar") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ldc;II)V", - garbageValue = "-1443703786" + descriptor = "(Lde;II)V", + garbageValue = "750775441" ) - final void method2522(PcmStream var1, int var2) { - int var3 = var2 >> 5; // L: 272 - PcmStream var4 = this.field1449[var3]; // L: 273 - if (var4 == null) { // L: 274 - this.field1448[var3] = var1; + final void method2606(PcmStream var1, int var2) { + int var3 = var2 >> 5; // L: 265 + PcmStream var4 = this.field1452[var3]; // L: 266 + if (var4 == null) { // L: 267 + this.field1451[var3] = var1; } else { - var4.after = var1; // L: 275 + var4.after = var1; // L: 268 } - this.field1449[var3] = var1; // L: 276 - var1.field1519 = var2; // L: 277 - } // L: 278 + this.field1452[var3] = var1; // L: 269 + var1.field1520 = var2; // L: 270 + } // L: 271 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-1294994184" + ) + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 184 + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; // L: 185 + } else { + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 186 + } + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Lje;I)Z", + garbageValue = "-1268197096" + ) + static boolean method2598(ObjectDefinition var0) { + if (var0.transforms != null) { // L: 633 + int[] var1 = var0.transforms; // L: 635 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 636 + int var3 = var1[var2]; // L: 637 + ObjectDefinition var4 = ScriptEvent.getObjectDefinition(var3); // L: 639 + if (var4.mapIconId != -1) { // L: 640 + return true; // L: 641 + } + } + } else if (var0.mapIconId != -1) { // L: 647 + return true; // L: 648 + } + + return false; // L: 650 + } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index cefeb39837..2ffee6a5ad 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -1,54 +1,65 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dc") +@ObfuscatedName("de") +@Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("w") - volatile boolean active; - @ObfuscatedName("f") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ldc;" + descriptor = "Lde;" ) + @Export("after") PcmStream after; @ObfuscatedName("y") - int field1519; - @ObfuscatedName("v") + int field1520; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Ldn;" ) + @Export("sound") AbstractSound sound; + @ObfuscatedName("j") + @Export("active") + volatile boolean active; protected PcmStream() { this.active = true; // L: 11 } // L: 13 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("w") - protected abstract int vmethod3987(); + @ObfuscatedName("c") + protected abstract int vmethod4043(); - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("aw") - int vmethod2837() { + @ObfuscatedName("aq") + int vmethod2850() { return 255; // L: 16 } - @ObfuscatedName("fd") + @ObfuscatedName("fb") + @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 this.fill(var1, var2, var3); diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index b2dd86c8f4..76eb1853d5 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -1,145 +1,155 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("df") +@Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lja;" ) + @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lja;" ) - NodeDeque field1365; - @ObfuscatedName("s") - int field1366; - @ObfuscatedName("t") - int field1368; + NodeDeque field1368; + @ObfuscatedName("l") + int field1369; + @ObfuscatedName("m") + int field1367; public PcmStreamMixer() { this.subStreams = new NodeDeque(); // L: 9 - this.field1365 = new NodeDeque(); // L: 10 - this.field1366 = 0; // L: 11 - this.field1368 = -1; // L: 12 + this.field1368 = new NodeDeque(); // L: 10 + this.field1369 = 0; // L: 11 + this.field1367 = -1; // L: 12 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ldc;)V" + descriptor = "(Lde;)V" ) + @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); // L: 15 } // L: 16 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ldc;)V" + descriptor = "(Lde;)V" ) + @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); // L: 19 } // L: 20 - @ObfuscatedName("s") - void method2385() { - if (this.field1366 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1365.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1365.previous()) { // L: 24 - var1.field1476 -= this.field1366; // L: 25 + @ObfuscatedName("l") + void method2455() { + if (this.field1369 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1368.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1368.previous()) { // L: 24 + var1.field1477 -= this.field1369; // L: 25 } - this.field1368 -= this.field1366; // L: 27 - this.field1366 = 0; // L: 28 + this.field1367 -= this.field1369; // L: 27 + this.field1369 = 0; // L: 28 } } // L: 30 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lgw;Ldi;)V" + descriptor = "(Lgn;Ldy;)V" ) - void method2408(Node var1, PcmStreamMixerListener var2) { - while (this.field1365.sentinel != var1 && ((PcmStreamMixerListener)var1).field1476 <= var2.field1476) { // L: 33 + void method2460(Node var1, PcmStreamMixerListener var2) { + while (this.field1368.sentinel != var1 && ((PcmStreamMixerListener)var1).field1477 <= var2.field1477) { // L: 33 var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field1368 = ((PcmStreamMixerListener)this.field1365.sentinel.previous).field1476; // L: 35 + this.field1367 = ((PcmStreamMixerListener)this.field1368.sentinel.previous).field1477; // L: 35 } // L: 36 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ldi;)V" + descriptor = "(Ldy;)V" ) - void method2388(PcmStreamMixerListener var1) { + void method2430(PcmStreamMixerListener var1) { var1.remove(); // L: 39 var1.remove2(); // L: 40 - Node var2 = this.field1365.sentinel.previous; // L: 41 - if (var2 == this.field1365.sentinel) { - this.field1368 = -1; // L: 42 + Node var2 = this.field1368.sentinel.previous; // L: 41 + if (var2 == this.field1368.sentinel) { + this.field1367 = -1; // L: 42 } else { - this.field1368 = ((PcmStreamMixerListener)var2).field1476; // L: 43 + this.field1367 = ((PcmStreamMixerListener)var2).field1477; // L: 43 } } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("w") - protected int vmethod3987() { + @ObfuscatedName("c") + protected int vmethod4043() { return 0; // L: 55 } - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1368 < 0) { // L: 60 + if (this.field1367 < 0) { // L: 60 this.updateSubStreams(var1, var2, var3); // L: 61 return; // L: 62 } - if (var3 + this.field1366 < this.field1368) { // L: 64 - this.field1366 += var3; // L: 65 + if (var3 + this.field1369 < this.field1367) { // L: 64 + this.field1369 += var3; // L: 65 this.updateSubStreams(var1, var2, var3); // L: 66 return; // L: 67 } - int var4 = this.field1368 - this.field1366; // L: 69 + int var4 = this.field1367 - this.field1369; // L: 69 this.updateSubStreams(var1, var2, var4); // L: 70 var2 += var4; // L: 71 var3 -= var4; // L: 72 - this.field1366 += var4; // L: 73 - this.method2385(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1365.last(); // L: 75 + this.field1369 += var4; // L: 73 + this.method2455(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1368.last(); // L: 75 synchronized(var5) { // L: 76 int var7 = var5.update(); // L: 77 if (var7 < 0) { // L: 78 - var5.field1476 = 0; // L: 79 - this.method2388(var5); // L: 80 + var5.field1477 = 0; // L: 79 + this.method2430(var5); // L: 80 } else { - var5.field1476 = var7; // L: 83 - this.method2408(var5.previous, var5); // L: 84 + var5.field1477 = var7; // L: 83 + this.method2460(var5.previous, var5); // L: 84 } } } while(var3 != 0); // L: 87 } - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 var4.update(var1, var2, var3); // L: 93 @@ -147,41 +157,43 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1368 < 0) { // L: 99 + if (this.field1367 < 0) { // L: 99 this.skipSubStreams(var1); // L: 100 return; // L: 101 } - if (this.field1366 + var1 < this.field1368) { // L: 103 - this.field1366 += var1; // L: 104 + if (this.field1369 + var1 < this.field1367) { // L: 103 + this.field1369 += var1; // L: 104 this.skipSubStreams(var1); // L: 105 return; // L: 106 } - int var2 = this.field1368 - this.field1366; // L: 108 + int var2 = this.field1367 - this.field1369; // L: 108 this.skipSubStreams(var2); // L: 109 var1 -= var2; // L: 110 - this.field1366 += var2; // L: 111 - this.method2385(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1365.last(); // L: 113 + this.field1369 += var2; // L: 111 + this.method2455(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1368.last(); // L: 113 synchronized(var3) { // L: 114 int var5 = var3.update(); // L: 115 if (var5 < 0) { // L: 116 - var3.field1476 = 0; // L: 117 - this.method2388(var3); // L: 118 + var3.field1477 = 0; // L: 117 + this.method2430(var3); // L: 118 } else { - var3.field1476 = var5; // L: 121 - this.method2408(var3.previous, var3); // L: 122 + var3.field1477 = var5; // L: 121 + this.method2460(var3.previous, var3); // L: 122 } } } while(var1 != 0); // L: 125 } - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 var2.skip(var1); // L: 131 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index a5d721a641..e6c3f7f9ac 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -1,17 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("dy") +@Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("z") - int field1476; + @ObfuscatedName("f") + int field1477; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("remove2") abstract void remove2(); - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ldh;)I" + descriptor = "(Ldf;)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 1f3676bdda..72c7a6789f 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -1,69 +1,90 @@ +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("bs") +@ObfuscatedName("bz") +@Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("z") + @ObfuscatedName("sx") @ObfuscatedGetter( - intValue = -1658510555 + intValue = -1592702363 ) - int objectId; - @ObfuscatedName("k") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("ag") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 537531937 + intValue = 1035256329 ) + @Export("plane") int plane; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -451639577 + intValue = -1164604575 ) + @Export("type") int type; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -805517653 + intValue = 1479469189 ) + @Export("x") int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 309622261 - ) - int y; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1728058903 - ) - int field960; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -629147525 - ) - int field961; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -922964443 - ) - int id; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1252885215 - ) - int orientation; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -743478207 + intValue = 1113436687 ) - int field964; - @ObfuscatedName("n") + @Export("y") + int y; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1560488333 + intValue = 175413889 ) + @Export("objectId") + int objectId; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1951305335 + ) + int field963; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -572899859 + ) + int field959; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1254625591 + ) + @Export("id") + int id; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -802321491 + ) + @Export("orientation") + int orientation; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1436097175 + ) + int field962; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -326130097 + ) + @Export("delay") int delay; - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1735849843 + intValue = 1413090507 ) + @Export("hitpoints") int hitpoints; PendingSpawn() { @@ -71,58 +92,215 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; // L: 17 } // L: 19 - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "681625855" + descriptor = "(IB)Ljp;", + garbageValue = "25" ) - static final int method1795(int var0, int var1) { - if (var0 == -1) { // L: 863 - return 12345678; + public static FloorOverlayDefinition method1839(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - var1 = (var0 & 127) * var1 / 128; // L: 864 - if (var1 < 2) { // L: 865 - var1 = 2; - } else if (var1 > 126) { // L: 866 - var1 = 126; + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var1 = new FloorOverlayDefinition(); + if (var2 != null) { // L: 30 + var1.decode(new Buffer(var2), var0); } - return (var0 & 65408) + var1; // L: 867 + var1.postDecode(); // L: 31 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 } } - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "1" + descriptor = "(IB)Lig;", + garbageValue = "88" ) - static int method1794(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1122 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1123 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var3)); // L: 1124 - return 1; // L: 1125 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1127 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1134 - if (var3.dataText == null) { // L: 1135 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1136 + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = class25.VarpDefinition_archive.takeFile(16, var0); // L: 25 + var1 = new VarpDefinition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 + return var1; // L: 29 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "1776367578" + ) + static final int method1841(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 450 + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 451 + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(ILco;ZB)I", + garbageValue = "-42" + ) + static int method1840(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.ADD) { // L: 2416 + MilliClock.Interpreter_intStackSize -= 2; // L: 2417 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2418 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2419 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 + var4; // L: 2420 + return 1; // L: 2421 + } else if (var0 == ScriptOpcodes.SUB) { // L: 2423 + MilliClock.Interpreter_intStackSize -= 2; // L: 2424 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2425 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2426 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 - var4; // L: 2427 + return 1; // L: 2428 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2430 + MilliClock.Interpreter_intStackSize -= 2; // L: 2431 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2432 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2433 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4 * var9; // L: 2434 + return 1; // L: 2435 + } else if (var0 == ScriptOpcodes.DIV) { // L: 2437 + MilliClock.Interpreter_intStackSize -= 2; // L: 2438 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2439 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2440 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 / var4; // L: 2441 + return 1; // L: 2442 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2444 + var9 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2445 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var9); // L: 2446 + return 1; // L: 2447 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2449 + var9 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2450 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var9 + 1)); // L: 2451 + return 1; // L: 2452 + } else if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2454 + MilliClock.Interpreter_intStackSize -= 5; // L: 2455 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2456 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2457 + int var10 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 2458 + int var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3]; // L: 2459 + int var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 4]; // L: 2460 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 + (var4 - var9) * (var11 - var10) / (var6 - var10); // L: 2461 + return 1; // L: 2462 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2464 + MilliClock.Interpreter_intStackSize -= 2; // L: 2465 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2466 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2467 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 + var4 * var9 / 100; // L: 2468 + return 1; // L: 2469 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2471 + MilliClock.Interpreter_intStackSize -= 2; // L: 2472 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2473 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2474 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 | 1 << var4; // L: 2475 + return 1; // L: 2476 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2478 + MilliClock.Interpreter_intStackSize -= 2; // L: 2479 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2480 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2481 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 & -1 - (1 << var4); // L: 2482 + return 1; // L: 2483 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2485 + MilliClock.Interpreter_intStackSize -= 2; // L: 2486 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2487 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2488 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (var9 & 1 << var4) != 0 ? 1 : 0; // L: 2489 + return 1; // L: 2490 + } else if (var0 == ScriptOpcodes.MOD) { // L: 2492 + MilliClock.Interpreter_intStackSize -= 2; // L: 2493 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2494 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2495 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 % var4; // L: 2496 + return 1; // L: 2497 + } else if (var0 == ScriptOpcodes.POW) { // L: 2499 + MilliClock.Interpreter_intStackSize -= 2; // L: 2500 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2501 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2502 + if (var9 == 0) { // L: 2503 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, (double)var4); // L: 2504 + } + + return 1; // L: 2505 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2507 + MilliClock.Interpreter_intStackSize -= 2; // L: 2508 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2509 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2510 + if (var9 == 0) { // L: 2511 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2512 + return 1; // L: 2513 + } else { + switch(var4) { // L: 2515 + case 0: + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2538 + break; // L: 2539 + case 1: + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9; // L: 2528 + break; // L: 2529 + case 2: + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var9); // L: 2543 + break; + case 3: + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var9); // L: 2533 + break; // L: 2534 + case 4: + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var9)); // L: 2523 + break; // L: 2524 + default: + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, 1.0D / (double)var4); // L: 2518 } - return 1; // L: 1137 - } else { - return 2; // L: 1139 + return 1; // L: 2547 } + } else if (var0 == ScriptOpcodes.AND) { // L: 2549 + MilliClock.Interpreter_intStackSize -= 2; // L: 2550 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2551 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2552 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 & var4; // L: 2553 + return 1; // L: 2554 + } else if (var0 == ScriptOpcodes.OR) { // L: 2556 + MilliClock.Interpreter_intStackSize -= 2; // L: 2557 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2558 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2559 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var9 | var4; // L: 2560 + return 1; // L: 2561 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 2563 + MilliClock.Interpreter_intStackSize -= 3; // L: 2564 + long var3 = (long)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2565 + long var5 = (long)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2566 + long var7 = (long)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 2567 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (int)(var7 * var3 / var5); // L: 2568 + return 1; // L: 2569 } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1128 - --var4; // L: 1129 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1130 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1131 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; - } + return 2; // L: 2571 + } + } - return 1; // L: 1132 + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(Lht;B)Ljava/lang/String;", + garbageValue = "-42" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (JagexCache.Widget_unpackTargetMask(WorldMapData_0.getWidgetFlags(var0)) == 0) { // L: 11536 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11537 11538 11540 } } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 7fca5c7462..c4f095f1d0 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -1,226 +1,191 @@ +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("mr") +@ObfuscatedName("me") +@Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("ap") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1124416131 + intValue = -433932703 ) - int field3946; - @ObfuscatedName("au") - boolean field3947; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = -2075791329 - ) - int field3966; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 1751132195 - ) - int field3949; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 1214639501 - ) - int field3950; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = -118237247 - ) - int field3951; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = -392627061 - ) - int field3942; + int field3961; @ObfuscatedName("ah") - boolean field3953; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = 41619559 - ) - int field3957; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -1839522133 - ) - int field3948; + boolean field3968; @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1827610411 + intValue = 1848627019 ) - int field3956; - @ObfuscatedName("ad") + int field3952; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 773398051 + intValue = -1832118753 + ) + int field3958; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -555698661 ) int field3959; @ObfuscatedName("ai") - String field3958; - @ObfuscatedName("ay") - String field3960; - @ObfuscatedName("aj") - String field3937; - @ObfuscatedName("aw") - String field3961; - @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1592928573 + intValue = -970589663 ) - int field3962; - @ObfuscatedName("ak") + int field3950; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 325841347 + intValue = -1243453955 + ) + int field3976; + @ObfuscatedName("ag") + boolean field3962; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -668677467 ) int field3963; - @ObfuscatedName("ac") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -865607359 + intValue = 1196353791 ) int field3964; - @ObfuscatedName("bl") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1202183243 + intValue = 2023487119 ) int field3965; - @ObfuscatedName("bc") - String field3941; - @ObfuscatedName("bz") - String field3967; - @ObfuscatedName("bj") - int[] field3968; - @ObfuscatedName("bh") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1188578061 + intValue = -1164464565 ) - int field3969; - @ObfuscatedName("bi") + int field3966; + @ObfuscatedName("at") + String field3979; + @ObfuscatedName("as") + String field3953; + @ObfuscatedName("aj") + String field3969; + @ObfuscatedName("ae") String field3970; + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = -1856505343 + ) + int field3971; + @ObfuscatedName("ap") + @ObfuscatedGetter( + intValue = -908092979 + ) + int field3954; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = -319239105 + ) + int field3973; + @ObfuscatedName("bb") + @ObfuscatedGetter( + intValue = -2054037315 + ) + int field3974; + @ObfuscatedName("bf") + String field3975; + @ObfuscatedName("bp") + String field3960; + @ObfuscatedName("bg") + int[] field3977; + @ObfuscatedName("bc") + @ObfuscatedGetter( + intValue = 173908363 + ) + int field3978; + @ObfuscatedName("bj") + String field3955; 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.field3968 = new int[3]; // L: 62 - this.field3946 = var1; // L: 67 - this.field3947 = var2; // L: 68 - this.field3966 = var3; // L: 69 - this.field3949 = var4; // L: 70 - this.field3950 = var5; // L: 71 - this.field3951 = var6; // L: 72 - this.field3942 = var7; // L: 73 - this.field3953 = var8; // L: 74 - this.field3957 = var9; // L: 75 - this.field3948 = var10; // L: 76 - this.field3956 = var11; // L: 77 - this.field3959 = var12; // L: 78 - this.field3958 = var13; // L: 79 - this.field3960 = var14; // L: 80 - this.field3937 = var15; // L: 81 - this.field3961 = var16; // L: 82 - this.field3962 = var17; // L: 83 - this.field3963 = var18; // L: 84 - this.field3964 = var19; // L: 85 - this.field3965 = var20; // L: 86 - this.field3941 = var21; // L: 87 - this.field3967 = var22; // L: 88 - this.field3968 = var23; // L: 89 - this.field3969 = var24; // L: 90 - this.field3970 = var25; // L: 91 + this.field3977 = new int[3]; // L: 62 + this.field3961 = var1; // L: 67 + this.field3968 = var2; // L: 68 + this.field3952 = var3; // L: 69 + this.field3958 = var4; // L: 70 + this.field3959 = var5; // L: 71 + this.field3950 = var6; // L: 72 + this.field3976 = var7; // L: 73 + this.field3962 = var8; // L: 74 + this.field3963 = var9; // L: 75 + this.field3964 = var10; // L: 76 + this.field3965 = var11; // L: 77 + this.field3966 = var12; // L: 78 + this.field3979 = var13; // L: 79 + this.field3953 = var14; // L: 80 + this.field3969 = var15; // L: 81 + this.field3970 = var16; // L: 82 + this.field3971 = var17; // L: 83 + this.field3954 = var18; // L: 84 + this.field3973 = var19; // L: 85 + this.field3974 = var20; // L: 86 + this.field3975 = var21; // L: 87 + this.field3960 = var22; // L: 88 + this.field3977 = var23; // L: 89 + this.field3978 = var24; // L: 90 + this.field3955 = var25; // L: 91 } // L: 92 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "34" + descriptor = "(Lkb;I)V", + garbageValue = "1047408836" ) + @Export("write") public void write(Buffer var1) { var1.writeByte(8); // L: 95 - var1.writeByte(this.field3946); // L: 96 - var1.writeByte(this.field3947 ? 1 : 0); // L: 97 - var1.writeShort(this.field3966); // L: 98 - var1.writeByte(this.field3949); // L: 99 - var1.writeByte(this.field3950); // L: 100 - var1.writeByte(this.field3951); // L: 101 - var1.writeByte(this.field3942); // L: 102 - var1.writeByte(this.field3953 ? 1 : 0); // L: 103 - var1.writeShort(this.field3957); // L: 104 - var1.writeByte(this.field3948); // L: 105 - var1.writeMedium(this.field3956); // L: 106 - var1.writeShort(this.field3959); - var1.writeStringCp1252NullCircumfixed(this.field3958); - var1.writeStringCp1252NullCircumfixed(this.field3960); - var1.writeStringCp1252NullCircumfixed(this.field3937); - var1.writeStringCp1252NullCircumfixed(this.field3961); - var1.writeByte(this.field3963); - var1.writeShort(this.field3962); - var1.writeStringCp1252NullCircumfixed(this.field3941); - var1.writeStringCp1252NullCircumfixed(this.field3967); - var1.writeByte(this.field3964); - var1.writeByte(this.field3965); + var1.writeByte(this.field3961); // L: 96 + var1.writeByte(this.field3968 ? 1 : 0); // L: 97 + var1.writeShort(this.field3952); // L: 98 + var1.writeByte(this.field3958); // L: 99 + var1.writeByte(this.field3959); // L: 100 + var1.writeByte(this.field3950); // L: 101 + var1.writeByte(this.field3976); // L: 102 + var1.writeByte(this.field3962 ? 1 : 0); // L: 103 + var1.writeShort(this.field3963); // L: 104 + var1.writeByte(this.field3964); // L: 105 + var1.writeMedium(this.field3965); // L: 106 + var1.writeShort(this.field3966); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field3979); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field3953); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field3969); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field3970); // L: 111 + var1.writeByte(this.field3954); // L: 112 + var1.writeShort(this.field3971); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field3975); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field3960); // L: 115 + var1.writeByte(this.field3973); // L: 116 + var1.writeByte(this.field3974); // L: 117 - for (int var2 = 0; var2 < this.field3968.length; ++var2) { // L: 118 - var1.writeInt(this.field3968[var2]); + for (int var2 = 0; var2 < this.field3977.length; ++var2) { // L: 118 + var1.writeInt(this.field3977[var2]); } - var1.writeInt(this.field3969); - var1.writeStringCp1252NullCircumfixed(this.field3970); - } + var1.writeInt(this.field3978); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field3955); // L: 120 + } // L: 121 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-202992024" + garbageValue = "2060654992" ) + @Export("size") public int size() { - byte var1 = 39; - int var2 = var1 + class228.method4189(this.field3958); - var2 += class228.method4189(this.field3960); - var2 += class228.method4189(this.field3937); - var2 += class228.method4189(this.field3961); - var2 += class228.method4189(this.field3941); - var2 += class228.method4189(this.field3967); // L: 130 - var2 += class228.method4189(this.field3970); - return var2; + byte var1 = 39; // L: 124 + int var2 = var1 + class90.method2169(this.field3979); // L: 125 + var2 += class90.method2169(this.field3953); // L: 126 + var2 += class90.method2169(this.field3969); // L: 127 + var2 += class90.method2169(this.field3970); // L: 128 + var2 += class90.method2169(this.field3975); // L: 129 + var2 += class90.method2169(this.field3960); // L: 130 + var2 += class90.method2169(this.field3955); // L: 131 + return var2; // L: 132 } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-34" - ) - static final void method6411() { - if (!ViewportMouse.ViewportMouse_false0) { // L: 107 - int var0 = Scene.Scene_cameraPitchSine; // L: 108 - int var1 = Scene.Scene_cameraPitchCosine; // L: 109 - int var2 = Scene.Scene_cameraYawSine; // L: 110 - int var3 = Scene.Scene_cameraYawCosine; // L: 111 - byte var4 = 50; // L: 112 - short var5 = 3500; // L: 113 - int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 114 - int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 115 - int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 116 - int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 117 - int var10 = Rasterizer3D.method3132(var7, var4, var1, var0); // L: 119 - int var11 = Rasterizer3D.method3124(var7, var4, var1, var0); // L: 120 - var7 = var10; // L: 121 - var10 = Rasterizer3D.method3132(var9, var5, var1, var0); // L: 122 - int var12 = Rasterizer3D.method3124(var9, var5, var1, var0); // L: 123 - var9 = var10; // L: 124 - var10 = Rasterizer3D.method3131(var6, var11, var3, var2); // L: 125 - var11 = Rasterizer3D.method3111(var6, var11, var3, var2); // L: 126 - var6 = var10; // L: 127 - var10 = Rasterizer3D.method3131(var8, var12, var3, var2); // L: 128 - var12 = Rasterizer3D.method3111(var8, var12, var3, var2); // L: 129 - ViewportMouse.field1768 = (var6 + var10) / 2; // L: 131 - class217.field2537 = (var7 + var9) / 2; // L: 132 - ViewportMouse.field1769 = (var11 + var12) / 2; // L: 133 - SpriteMask.field2552 = (var10 - var6) / 2; // L: 134 - WorldMapSectionType.field178 = (var9 - var7) / 2; // L: 135 - ViewportMouse.field1770 = (var12 - var11) / 2; // L: 136 - class3.field25 = Math.abs(SpriteMask.field2552); // L: 137 - class234.field3100 = Math.abs(WorldMapSectionType.field178); // L: 138 - ViewportMouse.field1771 = Math.abs(ViewportMouse.field1770); // L: 139 - } - } // L: 140 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 245e9039b3..c73bb1ff62 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -1,12 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("my") +@Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lmr;", - garbageValue = "-1896317364" + descriptor = "(I)Lme;", + garbageValue = "1154202585" ) + @Export("get") PlatformInfo get(); } diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 1f54ede915..6e04aa5997 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -1,175 +1,195 @@ +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("bf") +@ObfuscatedName("bi") +@Implements("Player") public final class Player extends Actor { - @ObfuscatedName("oa") - @ObfuscatedSignature( - descriptor = "Lfd;" + @ObfuscatedName("rf") + @ObfuscatedGetter( + intValue = 130763941 ) - static MouseWheel mouseWheel; - @ObfuscatedName("pp") + static int field674; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lld;" - ) - static PrivateChatMode privateChatMode; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkm;" ) + @Export("username") Username username; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhu;" ) + @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 262221405 + intValue = -135527215 ) + @Export("headIconPk") int headIconPk; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1053442849 - ) - int headIconPrayer; - @ObfuscatedName("o") - String[] actions; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1265290789 - ) - int combatLevel; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -2038384431 - ) - int skillLevel; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1117584059 - ) - int tileHeight; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1379087493 + intValue = 290512353 ) - int animationCycleStart; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1569239967 - ) - int animationCycleEnd; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 658942553 - ) - int field645; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 232655151 - ) - int tileHeight2; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1335611075 - ) - int field640; + @Export("headIconPrayer") + int headIconPrayer; @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Ler;" + @Export("actions") + String[] actions; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -953649939 ) - Model model0; + @Export("combatLevel") + int combatLevel; @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 896754859 + intValue = 1936137135 ) - int field649; - @ObfuscatedName("f") + @Export("skillLevel") + int skillLevel; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 177396383 + intValue = -1383715643 ) - int field635; - @ObfuscatedName("y") + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -797190095 + intValue = -1872616351 ) - int field651; - @ObfuscatedName("v") + @Export("animationCycleStart") + int animationCycleStart; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -191920347 + intValue = 176416391 ) - int field643; - @ObfuscatedName("j") - boolean isUnanimated; + @Export("animationCycleEnd") + int animationCycleEnd; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1206566317 + ) + int field654; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 72603633 + ) + @Export("tileHeight2") + int tileHeight2; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1944024049 + ) + int field656; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Leh;" + ) + @Export("model0") + Model model0; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1988252929 + intValue = 1268773483 ) + int field646; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1951672955 + ) + int field669; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1924513749 + ) + int field660; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1046092383 + ) + int field661; + @ObfuscatedName("w") + @Export("isUnanimated") + boolean isUnanimated; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1668602233 + ) + @Export("team") int team; - @ObfuscatedName("u") + @ObfuscatedName("d") + @Export("isHidden") boolean isHidden; - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -398923579 + intValue = -2138277467 ) + @Export("plane") int plane; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1030686615 + intValue = -1613823593 ) + @Export("index") int index; - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("isInClanChat") TriBool isInClanChat; @ObfuscatedName("ab") - boolean field660; - @ObfuscatedName("ag") + boolean field664; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 321223155 + intValue = 1561517337 ) + @Export("tileX") int tileX; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1001779515 + intValue = 844316393 ) + @Export("tileY") int tileY; Player() { this.headIconPk = -1; this.headIconPrayer = -1; // L: 19 - this.actions = new String[3]; // L: 21 + this.actions = new String[3]; - for (int var1 = 0; var1 < 3; ++var1) { // L: 24 + for (int var1 = 0; var1 < 3; ++var1) { this.actions[var1] = ""; } - this.combatLevel = 0; // L: 27 - this.skillLevel = 0; // L: 28 - this.animationCycleStart = 0; // L: 30 - this.animationCycleEnd = 0; // L: 31 + this.combatLevel = 0; + this.skillLevel = 0; + this.animationCycleStart = 0; + this.animationCycleEnd = 0; this.isUnanimated = false; // L: 40 this.team = 0; // L: 41 this.isHidden = false; // L: 42 this.isFriendTriBool = TriBool.TriBool_unknown; // L: 45 this.isInClanChat = TriBool.TriBool_unknown; // L: 46 - this.field660 = false; // L: 47 + this.field664 = false; // L: 47 } // L: 51 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-1567604648" + descriptor = "(Lkb;I)V", + garbageValue = "-1251055038" ) + @Export("read") final void read(Buffer var1) { var1.offset = 0; // L: 54 int var2 = var1.readUnsignedByte(); // L: 55 @@ -194,7 +214,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { // L: 73 - int var8 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var4[var5] - 512).team; // L: 74 + int var8 = AbstractWorldMapData.ItemDefinition_get(var4[var5] - 512).team; // L: 74 if (var8 != 0) { // L: 75 this.team = var8; } @@ -204,28 +224,28 @@ public final class Player extends Actor { int[] var9 = new int[5]; // L: 78 - for (var6 = 0; var6 < 5; ++var6) { - var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= WorldMapSprite.field253[var6].length) { + for (var6 = 0; var6 < 5; ++var6) { // L: 79 + var7 = var1.readUnsignedByte(); // L: 80 + if (var7 < 0 || var7 >= MouseRecorder.field628[var6].length) { // L: 81 var7 = 0; } - var9[var6] = var7; + var9[var6] = var7; // L: 82 } - super.idleSequence = var1.readUnsignedShort(); - if (super.idleSequence == 65535) { + super.idleSequence = var1.readUnsignedShort(); // L: 84 + if (super.idleSequence == 65535) { // L: 85 super.idleSequence = -1; } - super.turnLeftSequence = var1.readUnsignedShort(); + super.turnLeftSequence = var1.readUnsignedShort(); // L: 86 if (super.turnLeftSequence == 65535) { // L: 87 super.turnLeftSequence = -1; } super.turnRightSequence = super.turnLeftSequence; // L: 88 super.walkSequence = var1.readUnsignedShort(); // L: 89 - if (super.walkSequence == 65535) { + if (super.walkSequence == 65535) { // L: 90 super.walkSequence = -1; } @@ -235,8 +255,8 @@ public final class Player extends Actor { } super.walkLeftSequence = var1.readUnsignedShort(); // L: 93 - if (super.walkLeftSequence == 65535) { - super.walkLeftSequence = -1; // L: 94 + if (super.walkLeftSequence == 65535) { // L: 94 + super.walkLeftSequence = -1; } super.walkRightSequence = var1.readUnsignedShort(); // L: 95 @@ -249,11 +269,11 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapAreaData.loginType); // L: 99 + this.username = new Username(var1.readStringCp1252NullTerminated(), UserComparator4.loginType); // L: 99 this.clearIsFriend(); // L: 100 this.clearIsInClanChat(); // L: 101 - if (this == WorldMapLabelSize.localPlayer) { // L: 102 - RunException.localPlayerName = this.username.getName(); + if (this == PlayerType.localPlayer) { // L: 102 + class217.localPlayerName = this.username.getName(); } this.combatLevel = var1.readUnsignedByte(); // L: 103 @@ -270,11 +290,12 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); // L: 108 } // L: 109 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-659819020" + descriptor = "(B)Z", + garbageValue = "9" ) + @Export("isFriend") boolean isFriend() { if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 112 this.checkIsFriend(); // L: 113 @@ -283,29 +304,32 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; // L: 115 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1737435180" + garbageValue = "1585923406" ) + @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; // L: 119 } // L: 120 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1949087224" + garbageValue = "-1534173505" ) + @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = class60.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 123 + this.isFriendTriBool = WorldMapLabelSize.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 123 } // L: 124 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "73" + garbageValue = "1" ) + @Export("isClanMember") boolean isClanMember() { if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 127 this.updateIsInClanChat(); // L: 128 @@ -314,44 +338,48 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; // L: 130 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "94" + descriptor = "(I)V", + garbageValue = "-1010398193" ) + @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; // L: 134 } // L: 135 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2055605300" + garbageValue = "1596026564" ) + @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = Entity.clanChat != null && Entity.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 138 + this.isInClanChat = DevicePcmPlayerProvider.clanChat != null && DevicePcmPlayerProvider.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 138 } // L: 139 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1374983546" + garbageValue = "255897896" ) + @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? Skeleton.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 142 143 145 + return this.appearance != null && this.appearance.npcTransformId != -1 ? Clock.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 142 143 145 } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ler;", - garbageValue = "-2026237468" + descriptor = "(I)Leh;", + garbageValue = "-2070677844" ) + @Export("getModel") protected final Model getModel() { if (this.appearance == null) { // L: 149 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapRegion.SequenceDefinition_get(super.sequence) : null; // L: 150 - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? WorldMapRegion.SequenceDefinition_get(super.movementSequence) : null; // L: 151 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class105.SequenceDefinition_get(super.sequence) : null; // L: 150 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : class105.SequenceDefinition_get(super.movementSequence); // L: 151 Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 152 if (var3 == null) { // L: 153 return null; @@ -361,9 +389,9 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 156 - var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 157 + var4 = HealthBarUpdate.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 157 if (var4 != null) { // L: 158 - var4.offsetBy(0, -super.field1003, 0); // L: 159 + var4.offsetBy(0, -super.field1016, 0); // L: 159 var5 = new Model[]{var3, var4}; // L: 160 var3 = new Model(var5, 2); // L: 161 } @@ -376,7 +404,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 166 var4 = this.model0; // L: 167 - var4.offsetBy(this.field645 - super.x, this.tileHeight2 - this.tileHeight, this.field640 - super.y); // L: 168 + var4.offsetBy(this.field654 - super.x, this.tileHeight2 - this.tileHeight, this.field656 - super.y); // L: 168 if (super.orientation == 512) { // L: 169 var4.rotateY90Ccw(); // L: 170 var4.rotateY90Ccw(); // L: 171 @@ -401,7 +429,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); // L: 189 } - var4.offsetBy(super.x - this.field645, this.tileHeight - this.tileHeight2, super.y - this.field640); // L: 191 + var4.offsetBy(super.x - this.field654, this.tileHeight - this.tileHeight2, super.y - this.field656); // L: 191 } } @@ -411,24 +439,24 @@ public final class Player extends Actor { } } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "954112592" + garbageValue = "-645272281" ) - final void method1286(int var1, int var2, byte var3) { - if (super.sequence != -1 && WorldMapRegion.SequenceDefinition_get(super.sequence).field3541 == 1) { // L: 199 + final void method1335(int var1, int var2, byte var3) { + if (super.sequence != -1 && class105.SequenceDefinition_get(super.sequence).field3550 == 1) { // L: 199 super.sequence = -1; } - super.field1000 = -1; // L: 200 + super.field1003 = -1; // L: 200 if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 201 if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 202 if (var3 == 2) { // L: 204 - PacketBuffer.method5598(this, var1, var2, (byte)2); + class281.method5133(this, var1, var2, (byte)2); } - this.method1288(var1, var2, var3); // L: 205 + this.method1337(var1, var2, var3); // L: 205 } else { this.resetPath(var1, var2); } @@ -438,28 +466,29 @@ public final class Player extends Actor { } // L: 207 - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1761567284" + garbageValue = "-1359568653" ) + @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; // L: 210 - super.field973 = 0; // L: 211 - super.field1032 = 0; // L: 212 + super.field1034 = 0; // L: 211 + super.field978 = 0; // L: 212 super.pathX[0] = var1; // L: 213 super.pathY[0] = var2; // L: 214 int var3 = this.transformedSize(); // L: 215 super.x = var3 * 64 + super.pathX[0] * 128; // L: 216 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 217 + super.y = super.pathY[0] * 128 + var3 * 64; // L: 217 } // L: 218 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIBB)V", - garbageValue = "5" + descriptor = "(IIBI)V", + garbageValue = "1011126819" ) - final void method1288(int var1, int var2, byte var3) { + final void method1337(int var1, int var2, byte var3) { if (super.pathLength < 9) { // L: 221 ++super.pathLength; } @@ -475,765 +504,202 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; // L: 229 } // L: 230 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "68470795" + garbageValue = "2035007323" ) + @Export("isVisible") final boolean isVisible() { return this.appearance != null; // L: 233 } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lkf;Ljava/lang/String;I)I", - garbageValue = "-1169357315" - ) - public static int method1326(Buffer var0, String var1) { - int var2 = var0.offset; // L: 14 - byte[] var3 = EnumDefinition.method4644(var1); // L: 15 - var0.writeSmartByteShort(var3.length); // L: 16 - var0.offset += class219.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 17 - return var0.offset - var2; // L: 18 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-94" - ) - static final void method1327(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79 - for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80 - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81 - class22.field122[0][var5][var4] = 127; // L: 82 - if (var0 == var5 && var5 > 0) { // L: 83 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { // L: 84 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { // L: 85 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var3 + var1 == var4 && var4 < 103) { // L: 86 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - - } // L: 90 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lkr;Lkr;Lkr;B)V", - garbageValue = "-76" - ) - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (FloorDecoration.canvasWidth - 765) / 2; // L: 1105 - Login.loginBoxX = Login.xPadding + 202; // L: 1106 - IsaacCipher.loginBoxCenter = Login.loginBoxX + 180; // L: 1107 - if (Login.worldSelectOpen) { // L: 1108 - ItemDefinition.method4823(var0, var1); // L: 1109 - } else { - UserComparator2.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1112 - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1113 - AbstractByteArrayCopier.logoSprite.drawAt(Login.xPadding + 382 - AbstractByteArrayCopier.logoSprite.subWidth / 2, 18); // L: 1114 - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { // L: 1115 - byte var3 = 20; // L: 1116 - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1117 - var4 = 253 - var3; // L: 1118 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1119 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1120 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1121 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1122 - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1123 - } - - String var5; - String var6; - short var22; - int var23; - short var24; - if (Client.gameState == 20) { // L: 1125 - class296.titleboxSprite.drawAt(Login.loginBoxX + 180 - class296.titleboxSprite.subWidth / 2, 271 - class296.titleboxSprite.subHeight / 2); // L: 1126 - var22 = 201; // L: 1127 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1128 - var23 = var22 + 15; // L: 1129 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1130 - var23 += 15; // L: 1131 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1132 - var23 += 15; // L: 1133 - var23 += 7; // L: 1134 - if (Login.loginIndex != 4) { // L: 1135 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var23, 16777215, 0); // L: 1136 - var24 = 200; // L: 1137 - - for (var5 = WorldMapRectangle.method359(); var0.stringWidth(var5) > var24; var5 = var5.substring(0, var5.length() - 1)) { // L: 1138 1139 1140 - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var23, 16777215, 0); // L: 1142 - var23 += 15; // L: 1143 - - for (var6 = FontName.method5445(Login.Login_password); var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { // L: 1144 1145 1146 - } - - var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1148 - var23 += 15; // L: 1149 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 1152 - class296.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1153 - short var17; - if (Login.loginIndex == 0) { // L: 1154 - var22 = 251; // L: 1155 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1156 - var23 = var22 + 30; // L: 1157 - var4 = Login.loginBoxX + 180 - 80; // L: 1158 - var17 = 291; // L: 1159 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1160 - var0.drawLines("New User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1161 - var4 = Login.loginBoxX + 180 + 80; // L: 1162 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1163 - var0.drawLines("Existing User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1164 - } else if (Login.loginIndex == 1) { // L: 1166 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1167 - var22 = 236; // L: 1168 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1169 - var23 = var22 + 15; // L: 1170 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1171 - var23 += 15; // L: 1172 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1173 - var23 += 15; // L: 1174 - var4 = Login.loginBoxX + 180 - 80; // L: 1175 - var17 = 321; // L: 1176 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1177 - var0.drawCentered("Continue", var4, var17 + 5, 16777215, 0); // L: 1178 - var4 = Login.loginBoxX + 180 + 80; // L: 1179 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1180 - var0.drawCentered("Cancel", var4, var17 + 5, 16777215, 0); // L: 1181 - } else { - int var7; - if (Login.loginIndex == 2) { // L: 1183 - var22 = 201; // L: 1184 - var0.drawCentered(Login.Login_response1, IsaacCipher.loginBoxCenter, var22, 16776960, 0); // L: 1185 - var23 = var22 + 15; // L: 1186 - var0.drawCentered(Login.Login_response2, IsaacCipher.loginBoxCenter, var23, 16776960, 0); // L: 1187 - var23 += 15; // L: 1188 - var0.drawCentered(Login.Login_response3, IsaacCipher.loginBoxCenter, var23, 16776960, 0); // L: 1189 - var23 += 15; // L: 1190 - var23 += 7; // L: 1191 - var0.draw("Login: ", IsaacCipher.loginBoxCenter - 110, var23, 16777215, 0); // L: 1192 - var24 = 200; // L: 1193 - - for (var5 = WorldMapRectangle.method359(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { // L: 1194 1195 1196 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), IsaacCipher.loginBoxCenter - 70, var23, 16777215, 0); // L: 1198 - var23 += 15; // L: 1199 - - for (var6 = FontName.method5445(Login.Login_password); var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { // L: 1200 1201 1202 - } - - var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), IsaacCipher.loginBoxCenter - 108, var23, 16777215, 0); // L: 1204 - var23 += 15; // L: 1205 - var22 = 277; // L: 1206 - var7 = IsaacCipher.loginBoxCenter + -117; // L: 1207 - boolean var9 = Client.Login_isUsernameRemembered; // L: 1209 - boolean var10 = Login.field1224; // L: 1210 - IndexedSprite var20 = var9 ? (var10 ? Login.field1221 : MusicPatchNode2.options_buttons_2Sprite) : (var10 ? PlayerType.field3134 : class227.options_buttons_0Sprite); // L: 1212 - var20.drawAt(var7, var22); // L: 1215 - var7 = var7 + var20.subWidth + 5; // L: 1216 - var1.draw("Remember username", var7, var22 + 13, 16776960, 0); // L: 1217 - var7 = IsaacCipher.loginBoxCenter + 24; // L: 1218 - boolean var13 = Tile.clientPreferences.hideUsername; // L: 1220 - boolean var14 = Login.field1201; // L: 1221 - IndexedSprite var12 = var13 ? (var14 ? Login.field1221 : MusicPatchNode2.options_buttons_2Sprite) : (var14 ? PlayerType.field3134 : class227.options_buttons_0Sprite); // L: 1223 - var12.drawAt(var7, var22); // L: 1226 - var7 = var7 + var12.subWidth + 5; // L: 1227 - var1.draw("Hide username", var7, var22 + 13, 16776960, 0); // L: 1228 - var23 = var22 + 15; // L: 1229 - int var15 = IsaacCipher.loginBoxCenter - 80; // L: 1230 - short var16 = 321; // L: 1231 - ModelData0.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); // L: 1232 - var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); // L: 1233 - var15 = IsaacCipher.loginBoxCenter + 80; // L: 1234 - ModelData0.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); // L: 1235 - var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); // L: 1236 - var22 = 357; // L: 1237 - switch(Login.field1213) { // L: 1238 - case 2: - ModelData0.field1904 = "Having trouble logging in?"; // L: 1240 - break; - default: - ModelData0.field1904 = "Can't login? Click here."; // L: 1243 - } - - GrandExchangeOfferNameComparator.field112 = new Bounds(IsaacCipher.loginBoxCenter, var22, var1.stringWidth(ModelData0.field1904), 11); // L: 1246 - MusicPatchPcmStream.field2519 = new Bounds(IsaacCipher.loginBoxCenter, var22, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1247 - var1.drawCentered(ModelData0.field1904, IsaacCipher.loginBoxCenter, var22, 16777215, 0); // L: 1248 - } else if (Login.loginIndex == 3) { // L: 1250 - var22 = 201; // L: 1251 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1252 - var23 = var22 + 20; // L: 1253 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1254 - var23 += 15; // L: 1255 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1256 - var23 += 15; // L: 1257 - var4 = Login.loginBoxX + 180; // L: 1258 - var17 = 276; // L: 1259 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1260 - var2.drawCentered("Try again", var4, var17 + 5, 16777215, 0); // L: 1261 - var4 = Login.loginBoxX + 180; // L: 1262 - var17 = 326; // L: 1263 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1264 - var2.drawCentered("Forgotten password?", var4, var17 + 5, 16777215, 0); // L: 1265 - } else { - short var8; - if (Login.loginIndex == 4) { // L: 1267 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1268 - var22 = 236; // L: 1269 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1270 - var23 = var22 + 15; // L: 1271 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1272 - var23 += 15; // L: 1273 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1274 - var23 += 15; // L: 1275 - var0.draw("PIN: " + FontName.method5445(WorldMapLabelSize.otp) + (Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1276 - var23 -= 8; // L: 1277 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1278 - var23 += 15; // L: 1279 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1280 - var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1281 - int var27 = var23 - var0.ascent; // L: 1282 - IndexedSprite var25; - if (Login.field1223) { // L: 1284 - var25 = MusicPatchNode2.options_buttons_2Sprite; // L: 1285 - } else { - var25 = class227.options_buttons_0Sprite; // L: 1288 - } - - var25.drawAt(var4, var27); // L: 1290 - var23 += 15; // L: 1291 - var7 = Login.loginBoxX + 180 - 80; // L: 1292 - var8 = 321; // L: 1293 - ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1294 - var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); // L: 1295 - var7 = Login.loginBoxX + 180 + 80; // L: 1296 - ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1297 - var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); // L: 1298 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1299 - } else if (Login.loginIndex == 5) { // L: 1301 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1302 - var22 = 221; // L: 1303 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1304 - var23 = var22 + 15; // L: 1305 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1306 - var23 += 15; // L: 1307 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1308 - var23 += 15; // L: 1309 - var23 += 14; // L: 1310 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var23, 16777215, 0); // L: 1311 - var24 = 174; // L: 1312 - - for (var5 = WorldMapRectangle.method359(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { // L: 1313 1314 1315 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var23, 16777215, 0); // L: 1317 - var23 += 15; // L: 1318 - int var19 = Login.loginBoxX + 180 - 80; // L: 1319 - short var26 = 321; // L: 1320 - ModelData0.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); // L: 1321 - var0.drawCentered("Recover", var19, var26 + 5, 16777215, 0); // L: 1322 - var19 = Login.loginBoxX + 180 + 80; // L: 1323 - ModelData0.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); // L: 1324 - var0.drawCentered("Back", var19, var26 + 5, 16777215, 0); // L: 1325 - var26 = 356; // L: 1326 - var1.drawCentered("Still having trouble logging in?", IsaacCipher.loginBoxCenter, var26, 268435455, 0); // L: 1327 - } else if (Login.loginIndex == 6) { // L: 1329 - var22 = 201; // L: 1330 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1331 - var23 = var22 + 15; // L: 1332 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1333 - var23 += 15; // L: 1334 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1335 - var23 += 15; // L: 1336 - var4 = Login.loginBoxX + 180; // L: 1337 - var17 = 321; // L: 1338 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1339 - var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); // L: 1340 - } else if (Login.loginIndex == 7) { // L: 1342 - var22 = 216; // L: 1343 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1344 - var23 = var22 + 15; // L: 1345 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1346 - var23 += 15; // L: 1347 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1348 - var23 += 15; // L: 1349 - var4 = Login.loginBoxX + 180 - 80; // L: 1350 - var17 = 321; // L: 1351 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1352 - var0.drawCentered("Set Date of Birth", var4, var17 + 5, 16777215, 0); // L: 1353 - var4 = Login.loginBoxX + 180 + 80; // L: 1354 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1355 - var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); // L: 1356 - } else if (Login.loginIndex == 8) { // L: 1358 - var22 = 216; // L: 1359 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1360 - var23 = var22 + 15; // L: 1361 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1362 - var23 += 15; // L: 1363 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1364 - var23 += 15; // L: 1365 - var4 = Login.loginBoxX + 180 - 80; // L: 1366 - var17 = 321; // L: 1367 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1368 - var0.drawCentered("Privacy Policy", var4, var17 + 5, 16777215, 0); // L: 1369 - var4 = Login.loginBoxX + 180 + 80; // L: 1370 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1371 - var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); // L: 1372 - } else if (Login.loginIndex == 12) { // L: 1374 - var22 = 201; // L: 1375 - String var18 = ""; // L: 1376 - var5 = ""; // L: 1377 - var6 = ""; // L: 1378 - switch(Login.field1210) { // L: 1379 - case 0: - var18 = "Your account has been disabled."; // L: 1382 - var5 = Strings.field2988; // L: 1383 - var6 = ""; // L: 1384 - break; - case 1: - var18 = "Account locked as we suspect it has been stolen."; // L: 1394 - var5 = Strings.field2936; // L: 1395 - var6 = ""; // L: 1396 - break; - default: - class41.Login_promptCredentials(false); // L: 1389 - } - - var0.drawCentered(var18, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1400 - var23 = var22 + 15; // L: 1401 - var2.drawCentered(var5, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1402 - var23 += 15; // L: 1403 - var2.drawCentered(var6, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1404 - var23 += 15; // L: 1405 - var7 = Login.loginBoxX + 180; // L: 1406 - var8 = 276; // L: 1407 - ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1408 - var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); // L: 1409 - var7 = Login.loginBoxX + 180; // L: 1410 - var8 = 326; // L: 1411 - ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1412 - var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); // L: 1413 - } else if (Login.loginIndex == 24) { // L: 1415 - var22 = 221; // L: 1416 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1417 - var23 = var22 + 15; // L: 1418 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1419 - var23 += 15; // L: 1420 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1421 - var23 += 15; // L: 1422 - var4 = Login.loginBoxX + 180; // L: 1423 - var17 = 301; // L: 1424 - ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1425 - var0.drawCentered("Ok", var4, var17 + 5, 16777215, 0); // L: 1426 - } - } - } - } - - if (Client.gameState >= 10) { // L: 1429 - int[] var21 = new int[4]; // L: 1430 - Rasterizer2D.Rasterizer2D_getClipArray(var21); // L: 1431 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, GameShell.canvasHeight); // L: 1432 - Varcs.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1433 - Varcs.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1434 - Rasterizer2D.Rasterizer2D_setClipArray(var21); // L: 1435 - } - - ClientPreferences.title_muteSprite[Tile.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1437 - if (Client.gameState > 5 && class58.clientLanguage == Language.Language_EN) { // L: 1438 - if (class7.field36 != null) { // L: 1439 - var23 = Login.xPadding + 5; // L: 1440 - var24 = 463; // L: 1441 - byte var29 = 100; // L: 1442 - byte var28 = 35; // L: 1443 - class7.field36.drawAt(var23, var24); // L: 1444 - var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var23, var28 / 2 + var24 - 2, 16777215, 0); // L: 1445 - if (WorldMapScaleHandler.World_request != null) { // L: 1446 - var1.drawCentered("Loading...", var29 / 2 + var23, var28 / 2 + var24 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var29 / 2 + var23, var28 / 2 + var24 + 12, 16777215, 0); // L: 1447 - } - } else { - class7.field36 = class234.SpriteBuffer_getIndexedSpriteByName(Huffman.archive8, "sl_button", ""); // L: 1450 - } - } - - } - } // L: 1110 1453 - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "750694700" - ) - static int method1324(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { // L: 3470 - var3 = Huffman.Client_plane; // L: 3471 - int var15 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 3472 - int var8 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 3473 - WorldMapSection0.getWorldMap().method6482(var3, var15, var8, true); // L: 3474 - return 1; // L: 3475 - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3477 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3478 - String var16 = ""; // L: 3479 - var9 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3480 - if (var9 != null) { // L: 3481 - var16 = var9.getExternalName(); // L: 3482 - } - - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16; // L: 3484 - return 1; // L: 3485 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3487 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3488 - WorldMapSection0.getWorldMap().setCurrentMapAreaId(var3); // L: 3489 - return 1; // L: 3490 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3492 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getZoomLevel(); // L: 3493 - return 1; // L: 3494 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3496 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3497 - WorldMapSection0.getWorldMap().setZoomPercentage(var3); // L: 3498 - return 1; // L: 3499 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3501 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3502 - return 1; // L: 3503 + @ObfuscatedName("f") + public static final int method1325(double var0, double var2, double var4) { + double var6 = var4; // L: 9 + double var8 = var4; // L: 10 + double var10 = var4; // L: 11 + if (0.0D != var2) { // L: 12 + double var12; + if (var4 < 0.5D) { // L: 14 + var12 = var4 * (var2 + 1.0D); } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3505 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3506 - WorldMapSection0.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3507 - return 1; // L: 3508 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3510 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3511 - WorldMapSection0.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3512 - return 1; // L: 3513 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3515 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3516 - WorldMapSection0.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3517 - return 1; // L: 3518 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3520 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3521 - WorldMapSection0.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3522 - return 1; // L: 3523 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3525 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayX(); // L: 3526 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayY(); // L: 3527 - return 1; // L: 3528 - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3530 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3531 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3532 - if (var11 == null) { // L: 3533 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3534 + var12 = var4 + var2 - var4 * var2; // L: 15 + } + + double var14 = 2.0D * var4 - var12; // L: 16 + double var16 = var0 + 0.3333333333333333D; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; + } + + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; + } + + if (var16 * 6.0D < 1.0D) { // L: 22 + var6 = (var12 - var14) * 6.0D * var16 + var14; + } else if (var16 * 2.0D < 1.0D) { // L: 23 + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { // L: 24 + var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; + } else { + var6 = var14; // L: 25 + } + + if (6.0D * var0 < 1.0D) { // L: 26 + var8 = var14 + (var12 - var14) * 6.0D * var0; + } else if (var0 * 2.0D < 1.0D) { // L: 27 + var8 = var12; + } else if (3.0D * var0 < 2.0D) { // L: 28 + var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; + } else { + var8 = var14; // L: 29 + } + + if (var20 * 6.0D < 1.0D) { // L: 30 + var10 = (var12 - var14) * 6.0D * var20 + var14; + } else if (var20 * 2.0D < 1.0D) { // L: 31 + var10 = var12; + } else if (3.0D * var20 < 2.0D) { // L: 32 + var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); + } else { + var10 = var14; // L: 33 + } + } + + int var22 = (int)(var6 * 256.0D); // L: 35 + int var13 = (int)(256.0D * var8); // L: 36 + int var23 = (int)(var10 * 256.0D); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILco;ZB)I", + garbageValue = "122" + ) + static int method1354(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 1861 + MilliClock.Interpreter_intStackSize -= 2; // L: 1862 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1863 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1864 + EnumDefinition var10 = Decimator.getEnum(var3); // L: 1865 + if (var10.outputType != 's') { // L: 1866 + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 1867 + if (var9 == var10.keys[var6]) { // L: 1868 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 1869 + var10 = null; // L: 1870 + break; + } + } + + if (var10 != null) { // L: 1874 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; // L: 1875 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 1877 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 1903 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1904 + EnumDefinition var4 = Decimator.getEnum(var3); // L: 1905 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.size(); // L: 1906 + return 1; // L: 1907 + } else { + return 2; // L: 1909 + } + } else { + MilliClock.Interpreter_intStackSize -= 4; // L: 1878 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1879 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1880 + int var5 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 1881 + var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3]; // L: 1882 + EnumDefinition var7 = Decimator.getEnum(var5); // L: 1883 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 1884 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 1889 + if (var6 == var7.keys[var8]) { // L: 1890 + if (var9 == 115) { // L: 1891 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var7.strVals[var8]; } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3537 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 1892 } - return 1; // L: 3539 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3541 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3542 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3543 - if (var11 == null) { // L: 3544 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3545 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3546 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3549 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3550 - } - - return 1; // L: 3552 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3554 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3555 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3556 - if (var11 == null) { // L: 3557 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3558 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3559 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3560 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3561 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3564 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3565 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3566 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3567 - } - - return 1; // L: 3569 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3571 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3572 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3573 - if (var11 == null) { // L: 3574 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3575 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3578 - } - - return 1; // L: 3580 - } else if (var0 == 6615) { // L: 3582 - var14 = WorldMapSection0.getWorldMap().getDisplayCoord(); // L: 3583 - if (var14 == null) { // L: 3584 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3585 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3586 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; // L: 3589 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; // L: 3590 - } - - return 1; // L: 3592 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3594 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().currentMapAreaId(); // L: 3595 - return 1; // L: 3596 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3598 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3599 - var11 = WorldMapSection0.getWorldMap().getCurrentMapArea(); // L: 3600 - if (var11 == null) { // L: 3601 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3602 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3603 - return 1; // L: 3604 - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3606 - if (var12 == null) { // L: 3607 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3608 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3609 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; // L: 3612 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; // L: 3613 - } - - return 1; // L: 3615 - } - } else { - Coord var5; - if (var0 == 6618) { // L: 3617 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3618 - var11 = WorldMapSection0.getWorldMap().getCurrentMapArea(); // L: 3619 - if (var11 == null) { // L: 3620 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3621 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3622 - return 1; // L: 3623 - } else { - var5 = var11.coord(var14.x, var14.y); // L: 3625 - if (var5 == null) { // L: 3626 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3627 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 3630 - } - - return 1; // L: 3632 - } - } else { - Coord var10; - if (var0 == 6619) { // L: 3634 - Interpreter.Interpreter_intStackSize -= 2; // L: 3635 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3636 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3637 - MouseHandler.method1150(var3, var10, false); // L: 3638 - return 1; // L: 3639 - } else if (var0 == 6620) { // L: 3641 - Interpreter.Interpreter_intStackSize -= 2; // L: 3642 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3643 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3644 - MouseHandler.method1150(var3, var10, true); // L: 3645 - return 1; // L: 3646 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3648 - Interpreter.Interpreter_intStackSize -= 2; // L: 3649 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3650 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3651 - var9 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3652 - if (var9 == null) { // L: 3653 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3654 - return 1; // L: 3655 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3657 - return 1; // L: 3658 - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3660 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayWith(); // L: 3661 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayHeight(); // L: 3662 - return 1; // L: 3663 - } else if (var0 == 6623) { // L: 3665 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3666 - var11 = WorldMapSection0.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3667 - if (var11 == null) { // L: 3668 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3669 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); // L: 3672 - } - - return 1; // L: 3674 - } else if (var0 == 6624) { // L: 3676 - WorldMapSection0.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3677 - return 1; // L: 3678 - } else if (var0 == 6625) { // L: 3680 - WorldMapSection0.getWorldMap().resetMaxFlashCount(); // L: 3681 - return 1; // L: 3682 - } else if (var0 == 6626) { // L: 3684 - WorldMapSection0.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3685 - return 1; // L: 3686 - } else if (var0 == 6627) { // L: 3688 - WorldMapSection0.getWorldMap().resetCyclesPerFlash(); // L: 3689 - return 1; // L: 3690 - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 3692 - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3693 - WorldMapSection0.getWorldMap().setPerpetualFlash(var13); // L: 3694 - return 1; // L: 3695 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 3697 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3698 - WorldMapSection0.getWorldMap().flashElement(var3); // L: 3699 - return 1; // L: 3700 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 3702 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3703 - WorldMapSection0.getWorldMap().flashCategory(var3); // L: 3704 - return 1; // L: 3705 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 3707 - WorldMapSection0.getWorldMap().stopCurrentFlashes(); // L: 3708 - return 1; // L: 3709 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 3711 - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3712 - WorldMapSection0.getWorldMap().setElementsDisabled(var13); // L: 3713 - return 1; // L: 3714 - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 3716 - Interpreter.Interpreter_intStackSize -= 2; // L: 3717 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3718 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3719 - WorldMapSection0.getWorldMap().disableElement(var3, var7); // L: 3720 - return 1; // L: 3721 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 3723 - Interpreter.Interpreter_intStackSize -= 2; // L: 3724 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3725 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3726 - WorldMapSection0.getWorldMap().setCategoryDisabled(var3, var7); // L: 3727 - return 1; // L: 3728 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 3730 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 3731 - return 1; // L: 3732 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 3734 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3735 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 3736 - return 1; // L: 3737 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 3739 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3740 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 3741 - return 1; // L: 3742 - } else if (var0 == 6638) { // L: 3744 - Interpreter.Interpreter_intStackSize -= 2; // L: 3745 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3746 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3747 - var5 = WorldMapSection0.getWorldMap().method6507(var3, var10); // L: 3748 - if (var5 == null) { // L: 3749 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3750 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 3753 - } - - return 1; // L: 3755 - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 3757 - var6 = WorldMapSection0.getWorldMap().iconStart(); // L: 3758 - if (var6 == null) { // L: 3759 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3760 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3761 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3764 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3765 - } - - return 1; // L: 3767 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 3769 - var6 = WorldMapSection0.getWorldMap().iconNext(); // L: 3770 - if (var6 == null) { // L: 3771 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3772 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3773 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3776 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3777 - } - - return 1; // L: 3779 - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 3781 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3782 - var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3783 - if (var4.name == null) { // L: 3784 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3785 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.name; // L: 3788 - } - - return 1; // L: 3790 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 3792 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3793 - var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3794 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; // L: 3795 - return 1; // L: 3796 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 3798 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3799 - var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3800 - if (var4 == null) { // L: 3801 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3802 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; // L: 3805 - } - - return 1; // L: 3807 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 3809 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3810 - var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3811 - if (var4 == null) { // L: 3812 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3813 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; // L: 3816 - } - - return 1; // L: 3818 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 3820 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Frames.worldMapEvent.mapElement; // L: 3821 - return 1; // L: 3822 - } else if (var0 == 6698) { // L: 3824 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Frames.worldMapEvent.coord1.packed(); // L: 3825 - return 1; // L: 3826 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 3828 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Frames.worldMapEvent.coord2.packed(); // L: 3829 - return 1; // L: 3830 - } else { - return 2; // L: 3832 - } - } - } - } - } - } + var7 = null; // L: 1893 + break; } } + + if (var7 != null) { // L: 1897 + if (var9 == 115) { // L: 1898 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 1899 + } + } + + return 1; // L: 1901 + } else { + if (var9 == 115) { // L: 1885 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1886 + } + + return 1; // L: 1887 } } } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(Lbs;ZI)V", + garbageValue = "-669963127" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 11299 + int var3 = (int)var0.key; // L: 11300 + var0.remove(); // L: 11301 + if (var1) { // L: 11302 + class206.method3852(var2); + } + + UserComparator2.method6067(var2); // L: 11303 + Widget var4 = UserComparator4.getWidget(var3); // L: 11304 + if (var4 != null) { // L: 11305 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var4); + } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { // L: 11307 + if (DynamicObject.method2362(Client.menuOpcodes[var5])) { // L: 11308 + if (var5 < Client.menuOptionsCount - 1) { // L: 11309 + for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) { // L: 11310 + Client.menuActions[var6] = Client.menuActions[var6 + 1]; // L: 11311 + Client.menuTargets[var6] = Client.menuTargets[var6 + 1]; // L: 11312 + Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1]; // L: 11313 + Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1]; // L: 11314 + Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1]; // L: 11315 + Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1]; // L: 11316 + Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1]; // L: 11317 + } + } + + --var5; // L: 11320 + --Client.menuOptionsCount; // L: 11321 + } + } + + TileItemPile.method2908(); // L: 11324 + if (Client.rootInterface != -1) { // L: 11326 + WorldMapAreaData.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 11327 } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index e9a4c6baa8..16c28ef98d 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -1,71 +1,69 @@ +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("ha") +@ObfuscatedName("hu") +@Implements("PlayerAppearance") public class PlayerAppearance { - @ObfuscatedName("n") - static final int[] equipmentIndices; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("cq") - @ObfuscatedGetter( - intValue = 1000886071 - ) - public static int field2581; - @ObfuscatedName("dg") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive14; - @ObfuscatedName("ee") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive15; - @ObfuscatedName("z") - int[] equipment; @ObfuscatedName("k") - int[] bodyColors; - @ObfuscatedName("s") - public boolean isFemale; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 32109537 - ) - public int npcTransformId; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = 7297189778048494063L - ) - long hash; + public static short[] field2559; + @ObfuscatedName("e") + @Export("equipmentIndices") + static final int[] equipmentIndices; @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = 549450533580292223L + @ObfuscatedSignature( + descriptor = "Lev;" ) - long field2575; + @Export("PlayerAppearance_cachedModels") + static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("f") + @Export("equipment") + int[] equipment; + @ObfuscatedName("b") + @Export("bodyColors") + int[] bodyColors; + @ObfuscatedName("l") + @Export("isFemale") + public boolean isFemale; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1998131209 + ) + @Export("npcTransformId") + public int npcTransformId; + @ObfuscatedName("z") + @ObfuscatedGetter( + longValue = -3297432427762095127L + ) + @Export("hash") + long hash; + @ObfuscatedName("q") + @ObfuscatedGetter( + longValue = -3842356906884846791L + ) + long field2564; static { - equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; - PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); + equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 23 + PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 24 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([I[IZII)V", - garbageValue = "1005364184" + descriptor = "([I[IZIB)V", + garbageValue = "124" ) + @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { - if (var1 == null) { - var1 = new int[12]; + if (var1 == null) { // L: 27 + var1 = new int[12]; // L: 28 for (int var5 = 0; var5 < 7; ++var5) { // L: 29 for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 30 - KitDefinition var7 = FriendSystem.KitDefinition_get(var6); // L: 31 - if (var7 != null && !var7.nonSelectable && (var3 ? 7 : 0) + var5 == var7.bodypartID) { // L: 32 + KitDefinition var7 = WorldMapIcon_0.KitDefinition_get(var6); // L: 31 + if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { // L: 32 var1[equipmentIndices[var5]] = var6 + 256; // L: 33 break; // L: 34 } @@ -80,11 +78,12 @@ public class PlayerAppearance { this.setHash(); // L: 43 } // L: 44 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IZB)V", - garbageValue = "-97" + descriptor = "(IZI)V", + garbageValue = "2030071885" ) + @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { if (var1 != 1 || !this.isFemale) { // L: 47 int var3 = this.equipment[equipmentIndices[var1]]; // L: 48 @@ -105,31 +104,31 @@ public class PlayerAppearance { } } - var4 = FriendSystem.KitDefinition_get(var3); // L: 60 - } while(var4 == null || var4.nonSelectable || var4.bodypartID != var1 + (this.isFemale ? 7 : 0)); // L: 61 + var4 = WorldMapIcon_0.KitDefinition_get(var3); // L: 60 + } while(var4 == null || var4.nonSelectable || (this.isFemale ? 7 : 0) + var1 != var4.bodypartID); // L: 61 - this.equipment[equipmentIndices[var1]] = var3 + 256; - this.setHash(); + this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 63 + this.setHash(); // L: 64 } } - } + } // L: 65 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-1662290602" + garbageValue = "1266192115" ) - public void method4102(int var1, boolean var2) { - int var3 = this.bodyColors[var1]; + public void method4148(int var1, boolean var2) { + int var3 = this.bodyColors[var1]; // L: 68 boolean var4; - if (!var2) { + if (!var2) { // L: 69 do { - --var3; + --var3; // L: 71 if (var3 < 0) { // L: 72 - var3 = WorldMapSprite.field253[var1].length - 1; + var3 = MouseRecorder.field628[var1].length - 1; // L: 73 } - if (var1 == 4 && var3 >= 8) { + if (var1 == 4 && var3 >= 8) { // L: 77 var4 = false; // L: 78 } else { var4 = true; // L: 81 @@ -138,7 +137,7 @@ public class PlayerAppearance { } else { do { ++var3; // L: 88 - if (var3 >= WorldMapSprite.field253[var1].length) { // L: 89 + if (var3 >= MouseRecorder.field628[var1].length) { // L: 89 var3 = 0; } @@ -154,22 +153,24 @@ public class PlayerAppearance { this.setHash(); // L: 102 } // L: 103 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1897659753" + descriptor = "(ZB)V", + garbageValue = "-48" ) + @Export("changeSex") public void changeSex(boolean var1) { if (this.isFemale != var1) { // L: 106 this.update((int[])null, this.bodyColors, var1, -1); // L: 107 } } // L: 108 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "85946625" + descriptor = "(Lkb;I)V", + garbageValue = "-406740524" ) + @Export("write") public void write(Buffer var1) { var1.writeByte(this.isFemale ? 1 : 0); // L: 111 @@ -189,11 +190,12 @@ public class PlayerAppearance { } // L: 118 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "6" + descriptor = "(I)V", + garbageValue = "-993461341" ) + @Export("setHash") void setHash() { long var1 = this.hash; // L: 121 int var3 = this.equipment[5]; // L: 122 @@ -233,14 +235,15 @@ public class PlayerAppearance { } // L: 142 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljm;ILjm;IB)Ler;", - garbageValue = "-25" + descriptor = "(Ljg;ILjg;II)Leh;", + garbageValue = "1516185298" ) + @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { // L: 145 - return Skeleton.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 146 + return Clock.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 146 } else { long var5 = this.hash; // L: 148 int[] var7 = this.equipment; // L: 149 @@ -269,18 +272,18 @@ public class PlayerAppearance { int var11; for (int var10 = 0; var10 < 12; ++var10) { // L: 165 var11 = var7[var10]; // L: 166 - if (var11 >= 256 && var11 < 512 && !FriendSystem.KitDefinition_get(var11 - 256).ready()) { // L: 167 168 + if (var11 >= 256 && var11 < 512 && !WorldMapIcon_0.KitDefinition_get(var11 - 256).ready()) { // L: 167 168 var9 = true; } - if (var11 >= 512 && !GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 170 171 + if (var11 >= 512 && !AbstractWorldMapData.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 170 171 var9 = true; } } if (var9) { // L: 174 - if (-1L != this.field2575) { // L: 175 - var15 = (Model)PlayerAppearance_cachedModels.get(this.field2575); + if (this.field2564 != -1L) { // L: 175 + var15 = (Model)PlayerAppearance_cachedModels.get(this.field2564); } if (var15 == null) { // L: 176 @@ -297,14 +300,14 @@ public class PlayerAppearance { var13 = var7[var12]; // L: 182 ModelData var14; if (var13 >= 256 && var13 < 512) { // L: 183 - var14 = FriendSystem.KitDefinition_get(var13 - 256).getModelData(); // L: 184 + var14 = WorldMapIcon_0.KitDefinition_get(var13 - 256).getModelData(); // L: 184 if (var14 != null) { // L: 185 var16[var11++] = var14; } } if (var13 >= 512) { // L: 187 - var14 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var13 - 512).method4760(this.isFemale); // L: 188 + var14 = AbstractWorldMapData.ItemDefinition_get(var13 - 512).method4820(this.isFemale); // L: 188 if (var14 != null) { // L: 189 var16[var11++] = var14; } @@ -314,18 +317,18 @@ public class PlayerAppearance { ModelData var17 = new ModelData(var16, var11); // L: 192 for (var13 = 0; var13 < 5; ++var13) { // L: 193 - if (this.bodyColors[var13] < WorldMapSprite.field253[var13].length) { // L: 194 - var17.recolor(Calendar.field2535[var13], WorldMapSprite.field253[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < MouseRecorder.field628[var13].length) { // L: 194 + var17.recolor(field2559[var13], MouseRecorder.field628[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < UserComparator7.field2021[var13].length) { // L: 195 - var17.recolor(GrandExchangeOfferTotalQuantityComparator.field83[var13], UserComparator7.field2021[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < MusicPatchPcmStream.field2516[var13].length) { // L: 195 + var17.recolor(FriendLoginUpdate.field3671[var13], MusicPatchPcmStream.field2516[var13][this.bodyColors[var13]]); } } var15 = var17.toModel(64, 850, -30, -50, -30); // L: 197 PlayerAppearance_cachedModels.put(var15, var5); // L: 198 - this.field2575 = var5; // L: 199 + this.field2564 = var5; // L: 199 } } @@ -346,25 +349,26 @@ public class PlayerAppearance { } } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Lee;", - garbageValue = "491299614" + descriptor = "(B)Len;", + garbageValue = "-99" ) + @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { // L: 211 - return Skeleton.getNpcDefinition(this.npcTransformId).getModelData(); // L: 212 + return Clock.getNpcDefinition(this.npcTransformId).getModelData(); // L: 212 } else { boolean var1 = false; // L: 214 int var3; for (int var2 = 0; var2 < 12; ++var2) { // L: 215 var3 = this.equipment[var2]; // L: 216 - if (var3 >= 256 && var3 < 512 && !FriendSystem.KitDefinition_get(var3 - 256).method4543()) { // L: 217 218 + if (var3 >= 256 && var3 < 512 && !WorldMapIcon_0.KitDefinition_get(var3 - 256).method4620()) { // L: 217 218 var1 = true; } - if (var3 >= 512 && !GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3 - 512).method4805(this.isFemale)) { // L: 220 221 + if (var3 >= 512 && !AbstractWorldMapData.ItemDefinition_get(var3 - 512).method4809(this.isFemale)) { // L: 220 221 var1 = true; } } @@ -380,14 +384,14 @@ public class PlayerAppearance { var5 = this.equipment[var4]; // L: 228 ModelData var6; if (var5 >= 256 && var5 < 512) { // L: 229 - var6 = FriendSystem.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 230 + var6 = WorldMapIcon_0.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 230 if (var6 != null) { // L: 231 var7[var3++] = var6; } } if (var5 >= 512) { // L: 233 - var6 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var5 - 512).method4762(this.isFemale); // L: 234 + var6 = AbstractWorldMapData.ItemDefinition_get(var5 - 512).method4822(this.isFemale); // L: 234 if (var6 != null) { // L: 235 var7[var3++] = var6; } @@ -397,12 +401,12 @@ public class PlayerAppearance { ModelData var8 = new ModelData(var7, var3); // L: 238 for (var5 = 0; var5 < 5; ++var5) { // L: 239 - if (this.bodyColors[var5] < WorldMapSprite.field253[var5].length) { // L: 240 - var8.recolor(Calendar.field2535[var5], WorldMapSprite.field253[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < MouseRecorder.field628[var5].length) { // L: 240 + var8.recolor(field2559[var5], MouseRecorder.field628[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < UserComparator7.field2021[var5].length) { // L: 241 - var8.recolor(GrandExchangeOfferTotalQuantityComparator.field83[var5], UserComparator7.field2021[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < MusicPatchPcmStream.field2516[var5].length) { // L: 241 + var8.recolor(FriendLoginUpdate.field3671[var5], MusicPatchPcmStream.field2516[var5][this.bodyColors[var5]]); } } @@ -411,88 +415,13 @@ public class PlayerAppearance { } } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2109600157" + garbageValue = "-1510142127" ) + @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 + Skeleton.getNpcDefinition(this.npcTransformId).id; // L: 247 248 + 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 + Clock.getNpcDefinition(this.npcTransformId).id; // L: 247 248 } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IB)Lil;", - garbageValue = "19" - ) - public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); // L: 23 - var1 = new ParamDefinition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 26 - ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 - return var1; // L: 28 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "401735028" - ) - static String method4116(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); // L: 62 - - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 63 - int var5 = var0[var4] & 255; // L: 64 - var3.append(class299.field3676[var5 >>> 2]); // L: 65 - if (var4 < var2 - 1) { // L: 66 - int var6 = var0[var4 + 1] & 255; // L: 67 - var3.append(class299.field3676[(var5 & 3) << 4 | var6 >>> 4]); // L: 68 - if (var4 < var2 - 2) { // L: 69 - int var7 = var0[var4 + 2] & 255; // L: 70 - var3.append(class299.field3676[(var6 & 15) << 2 | var7 >>> 6]).append(class299.field3676[var7 & 63]); // L: 71 - } else { - var3.append(class299.field3676[(var6 & 15) << 2]).append("="); // L: 73 - } - } else { - var3.append(class299.field3676[(var5 & 3) << 4]).append("=="); // L: 75 - } - } - - return var3.toString(); // L: 77 - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "1591550158" - ) - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (WorldMapSprite.loadInterface(var0)) { // L: 8652 - GrandExchangeOfferNameComparator.field115 = null; // L: 8659 - Decimator.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 8660 - if (GrandExchangeOfferNameComparator.field115 != null) { // L: 8661 - Decimator.drawInterface(GrandExchangeOfferNameComparator.field115, -1412584499, var1, var2, var3, var4, Client.field947, class219.field2547, var7); // L: 8662 - GrandExchangeOfferNameComparator.field115 = null; // L: 8663 - } - - } else { - if (var7 != -1) { // L: 8653 - Client.field882[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 8655 - Client.field882[var8] = true; - } - } - - } - } // L: 8657 8665 } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 2a711025ef..1dda43ff82 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -1,12 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dd") +@Implements("PlayerProvider") public interface PlayerProvider { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ldr;", - garbageValue = "-1032997343" + descriptor = "(I)Ldh;", + garbageValue = "1306134642" ) + @Export("player") PcmPlayer player(); } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index d85865dd4b..8a48c9a024 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -1,63 +1,78 @@ +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("ix") +@ObfuscatedName("in") +@Implements("PlayerType") public enum PlayerType implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lin;" + ) + @Export("PlayerType_normal") + PlayerType_normal(0, -1, true, false, true), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lin;" + ) + @Export("PlayerType_playerModerator") + PlayerType_playerModerator(1, 0, true, true, true), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lin;" + ) + @Export("PlayerType_jagexModerator") + PlayerType_jagexModerator(2, 1, true, true, false), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lin;" + ) + @Export("PlayerType_ironman") + PlayerType_ironman(3, 2, false, false, true), @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lin;" ) - PlayerType_normal(0, -1, true, false, true), + @Export("PlayerType_ultimateIronman") + PlayerType_ultimateIronman(4, 3, false, false, true), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lin;" + ) + @Export("PlayerType_hardcoreIronman") + PlayerType_hardcoreIronman(5, 10, false, false, true), @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Lin;" ) - PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - field3131(6, 22, false, false, true); + field3125(6, 22, false, false, true); - @ObfuscatedName("d") + @ObfuscatedName("kz") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lbi;" ) - static IndexedSprite field3134; - @ObfuscatedName("w") + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1823451795 + intValue = -933718651 ) + @Export("id") final int id; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1522972387 + intValue = 1124234319 ) + @Export("modIcon") public final int modIcon; - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { @@ -67,12 +82,45 @@ public enum PlayerType implements Enumerated { this.isUser = var7; // L: 27 } // L: 28 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 31 } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-2138223094" + ) + static int method4274(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1144 + var0 -= 1000; // L: 1145 + var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 1146 + } else { + var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 1148 + } + + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { // L: 1149 + if (Interpreter.field1119 >= 10) { // L: 1150 + throw new RuntimeException(); // L: 1151 + } else if (var3.onResize == null) { // L: 1153 + return 0; + } else { + ScriptEvent var4 = new ScriptEvent(); // L: 1154 + var4.widget = var3; // L: 1155 + var4.args = var3.onResize; // L: 1156 + var4.field600 = Interpreter.field1119 + 1; // L: 1157 + Client.scriptEvents.addFirst(var4); // L: 1158 + return 1; // L: 1159 + } + } else { + return 2; // L: 1161 + } + } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index e408b9731f..9eb058e307 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -1,60 +1,67 @@ +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("cv") +@Implements("Players") public class Players { - @ObfuscatedName("qh") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("s") - static byte[] field1285; - @ObfuscatedName("t") - static byte[] field1284; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "[Lkf;" - ) - static Buffer[] field1277; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1580537391 - ) - static int Players_count; - @ObfuscatedName("x") - static int[] Players_indices; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1079575751 - ) - static int Players_emptyIdxCount; - @ObfuscatedName("g") - static int[] Players_emptyIndices; + @ObfuscatedName("l") + static byte[] field1282; @ObfuscatedName("m") - static int[] Players_regions; - @ObfuscatedName("n") - static int[] Players_orientations; - @ObfuscatedName("d") - static int[] Players_targetIndices; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1779975483 - ) - static int Players_pendingUpdateCount; - @ObfuscatedName("a") - static int[] Players_pendingUpdateIndices; - @ObfuscatedName("q") + static byte[] field1295; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "[Lkb;" ) - static Buffer field1287; + static Buffer[] field1284; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1488243341 + ) + @Export("Players_count") + static int Players_count; + @ObfuscatedName("k") + @Export("Players_indices") + static int[] Players_indices; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -745504319 + ) + @Export("Players_emptyIdxCount") + static int Players_emptyIdxCount; + @ObfuscatedName("u") + @Export("Players_emptyIndices") + static int[] Players_emptyIndices; + @ObfuscatedName("t") + @Export("Players_regions") + static int[] Players_regions; + @ObfuscatedName("e") + @Export("Players_orientations") + static int[] Players_orientations; + @ObfuscatedName("o") + @Export("Players_targetIndices") + static int[] Players_targetIndices; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 568889217 + ) + @Export("Players_pendingUpdateCount") + static int Players_pendingUpdateCount; + @ObfuscatedName("x") + @Export("Players_pendingUpdateIndices") + static int[] Players_pendingUpdateIndices; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + static Buffer field1280; static { - field1285 = new byte[2048]; // L: 18 - field1284 = new byte[2048]; // L: 19 - field1277 = new Buffer[2048]; // L: 20 + field1282 = new byte[2048]; // L: 18 + field1295 = new byte[2048]; // L: 19 + field1284 = new Buffer[2048]; // L: 20 Players_count = 0; // L: 21 Players_indices = new int[2048]; // L: 22 Players_emptyIdxCount = 0; // L: 23 @@ -64,6 +71,6 @@ public class Players { Players_targetIndices = new int[2048]; // L: 27 Players_pendingUpdateCount = 0; // L: 28 Players_pendingUpdateIndices = new int[2048]; // L: 29 - field1287 = new Buffer(new byte[5000]); // L: 30 + field1280 = new Buffer(new byte[5000]); // L: 30 } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 6221ea1a06..ee8b100a4f 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,58 +1,48 @@ +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lb") +@Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llb;" ) - static final PrivateChatMode field3822; - @ObfuscatedName("k") + static final PrivateChatMode field3827; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llb;" ) - public static final PrivateChatMode field3821; - @ObfuscatedName("s") + public static final PrivateChatMode field3824; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Llb;" ) - static final PrivateChatMode field3823; - @ObfuscatedName("t") + static final PrivateChatMode field3826; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2012095045 + intValue = 1809257021 ) - public final int field3824; + public final int field3825; static { - field3822 = new PrivateChatMode(0); // L: 5 - field3821 = new PrivateChatMode(1); // L: 6 - field3823 = new PrivateChatMode(2); + field3827 = new PrivateChatMode(0); // L: 5 + field3824 = new PrivateChatMode(1); // L: 6 + field3826 = new PrivateChatMode(2); } // L: 7 PrivateChatMode(int var1) { - this.field3824 = var1; // L: 15 + this.field3825 = var1; // L: 15 } // L: 16 - @ObfuscatedName("gf") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lbf;I)Z", - garbageValue = "200454944" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "250205673" ) - static boolean method6022(Player var0) { - if (Client.drawPlayerNames == 0) { // L: 4413 - return false; - } else if (WorldMapLabelSize.localPlayer == var0) { // L: 4414 - return TileItem.method2208(); // L: 4425 - } else { - boolean var1 = LoginPacket.method3707() || Client.method1792() && var0.isFriend(); // L: 4415 - if (!var1) { // L: 4416 - boolean var2 = (Client.drawPlayerNames & 2) != 0; // L: 4419 - var1 = var2 && var0.isClanMember(); // L: 4421 - } - - return var1; // L: 4423 - } + static String method6034(int var0) { + return ""; // L: 18 } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 4f4c667e0f..12f5ebab71 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -1,113 +1,141 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cm") +@Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1675813545 - ) - int id; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1633530883 - ) - int plane; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1241662831 - ) - int sourceX; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 674628417 - ) - int sourceY; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1517344079 - ) - int sourceZ; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1565729659 - ) - int endHeight; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 287551571 - ) - int cycleStart; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -23705649 - ) - int cycleEnd; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1941838325 - ) - int slope; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1921562263 - ) - int startHeight; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1380116723 - ) - int targetIndex; - @ObfuscatedName("d") - boolean isMoving; - @ObfuscatedName("h") - double x; - @ObfuscatedName("a") - double y; - @ObfuscatedName("q") - double z; - @ObfuscatedName("c") - double speedX; @ObfuscatedName("f") - double speedY; - @ObfuscatedName("y") - double speed; - @ObfuscatedName("v") - double speedZ; - @ObfuscatedName("j") - double accelerationZ; - @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -2137407611 + intValue = 127950911 ) - int yaw; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2024563433 - ) - int pitch; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ljm;" - ) - SequenceDefinition sequenceDefinition; + @Export("id") + int id; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1681921945 + intValue = 1863046985 ) - int frame; + @Export("plane") + int plane; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1329964451 + intValue = -1665161409 ) + @Export("sourceX") + int sourceX; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -893343909 + ) + @Export("sourceY") + int sourceY; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -263031347 + ) + @Export("sourceZ") + int sourceZ; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -2028575857 + ) + @Export("endHeight") + int endHeight; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 982684035 + ) + @Export("cycleStart") + int cycleStart; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 628428817 + ) + @Export("cycleEnd") + int cycleEnd; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 941880901 + ) + @Export("slope") + int slope; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1476235573 + ) + @Export("startHeight") + int startHeight; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1149707689 + ) + @Export("targetIndex") + int targetIndex; + @ObfuscatedName("o") + @Export("isMoving") + boolean isMoving; + @ObfuscatedName("n") + @Export("x") + double x; + @ObfuscatedName("x") + @Export("y") + double y; + @ObfuscatedName("p") + @Export("z") + double z; + @ObfuscatedName("r") + @Export("speedX") + double speedX; + @ObfuscatedName("y") + @Export("speedY") + double speedY; + @ObfuscatedName("s") + @Export("speed") + double speed; + @ObfuscatedName("j") + @Export("speedZ") + double speedZ; + @ObfuscatedName("w") + @Export("accelerationZ") + double accelerationZ; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 424232085 + ) + @Export("yaw") + int yaw; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -833335819 + ) + @Export("pitch") + int pitch; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Ljg;" + ) + @Export("sequenceDefinition") + SequenceDefinition sequenceDefinition; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 795159959 + ) + @Export("frame") + int frame; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 529023201 + ) + @Export("frameCycle") int frameCycle; Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { - this.isMoving = false; // L: 20 - this.frame = 0; // L: 32 - this.frameCycle = 0; // L: 33 - this.id = var1; // L: 36 + this.isMoving = false; + this.frame = 0; + this.frameCycle = 0; + this.id = var1; this.plane = var2; // L: 37 this.sourceX = var3; // L: 38 this.sourceY = var4; // L: 39 @@ -119,28 +147,29 @@ public final class Projectile extends Entity { this.targetIndex = var10; // L: 45 this.endHeight = var11; // L: 46 this.isMoving = false; // L: 47 - int var12 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 48 + int var12 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence; // L: 48 if (var12 != -1) { // L: 49 - this.sequenceDefinition = WorldMapRegion.SequenceDefinition_get(var12); + this.sequenceDefinition = class105.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; // L: 50 } } // L: 51 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "81" + descriptor = "(IIIII)V", + garbageValue = "-968797731" ) + @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; if (!this.isMoving) { // L: 54 var5 = (double)(var1 - this.sourceX); // L: 55 double var7 = (double)(var2 - this.sourceY); // L: 56 - double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57 - this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; // L: 58 - this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; // L: 59 + double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 + this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; // L: 58 + this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; // L: 59 this.z = (double)this.sourceZ; // L: 60 } @@ -152,19 +181,20 @@ public final class Projectile extends Entity { this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); // L: 67 + this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); // L: 67 } // L: 68 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-28" + descriptor = "(II)V", + garbageValue = "-1771638026" ) + @Export("advance") final void advance(int var1) { this.isMoving = true; // L: 71 - this.x += this.speedX * (double)var1; // L: 72 - this.y += this.speedY * (double)var1; // L: 73 - this.z += (double)var1 * (double)var1 * 0.5D * this.accelerationZ + this.speedZ * (double)var1; // L: 74 + this.x += (double)var1 * this.speedX; // L: 72 + this.y += (double)var1 * this.speedY; // L: 73 + this.z += this.speedZ * (double)var1 + 0.5D * this.accelerationZ * (double)var1 * (double)var1; // L: 74 this.speedZ += this.accelerationZ * (double)var1; // L: 75 this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76 this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77 @@ -190,13 +220,14 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ler;", - garbageValue = "-2026237468" + descriptor = "(I)Leh;", + garbageValue = "-2070677844" ) + @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 92 + SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id); // L: 92 Model var2 = var1.getModel(this.frame); // L: 93 if (var2 == null) { // L: 94 return null; @@ -206,69 +237,194 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("jb") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Lhq;II)V", - garbageValue = "-823007916" + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "-809557598" ) - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10302 - Widget var3 = var0[var2]; // L: 10303 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !GrandExchangeOfferUnitPriceComparator.isComponentHidden(var3))) { // L: 10304 10305 10306 - if (var3.type == 0) { // L: 10307 - if (!var3.isIf3 && GrandExchangeOfferUnitPriceComparator.isComponentHidden(var3) && var3 != TriBool.mousedOverWidgetIf1) { // L: 10308 - continue; - } + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { // L: 9 + int var4 = (var3 + var2) / 2; // L: 10 + int var5 = var2; // L: 11 + String var6 = var0[var4]; // L: 12 + var0[var4] = var0[var3]; // L: 13 + var0[var3] = var6; // L: 14 + short var7 = var1[var4]; // L: 15 + var1[var4] = var1[var3]; // L: 16 + var1[var3] = var7; // L: 17 - drawModelComponents(var0, var3.id); // L: 10309 - if (var3.children != null) { // L: 10310 - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10311 - if (var4 != null) { // L: 10312 - class58.method913(var4.group); - } + for (int var8 = var2; var8 < var3; ++var8) { // L: 18 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 + String var9 = var0[var8]; // L: 20 + var0[var8] = var0[var5]; // L: 21 + var0[var5] = var9; // L: 22 + short var10 = var1[var8]; // L: 23 + var1[var8] = var1[var5]; // L: 24 + var1[var5++] = var10; // L: 25 } + } - if (var3.type == 6) { // L: 10314 - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 10315 - boolean var7 = MusicPatch.runCs1(var3); // L: 10316 - if (var7) { // L: 10318 - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; // L: 10319 - } + var0[var3] = var0[var5]; // L: 29 + var0[var5] = var6; // L: 30 + var1[var3] = var1[var5]; // L: 31 + var1[var5] = var7; // L: 32 + sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 + sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 + } - if (var5 != -1) { // L: 10320 - SequenceDefinition var6 = WorldMapRegion.SequenceDefinition_get(var5); // L: 10321 + } // L: 36 - for (var3.modelFrameCycle += Client.field737; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class52.invalidateWidget(var3)) { // L: 10322 10323 10330 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 10324 - ++var3.modelFrame; // L: 10325 - if (var3.modelFrame >= var6.frameIds.length) { // L: 10326 - var3.modelFrame -= var6.frameCount; // L: 10327 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 10328 - var3.modelFrame = 0; - } - } - } - } + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1613642703" + ) + public static void method2228() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123 + } // L: 124 + + @ObfuscatedName("ff") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-73" + ) + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.musicVolume != 0 && var0 != -1) { // L: 3605 + Canvas.method952(AbstractByteArrayCopier.archive11, var0, 0, Client.musicVolume, false); // L: 3606 + Client.field916 = true; // L: 3607 + } + + } // L: 3609 + + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-206735455" + ) + static void method2226() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4815 + ArchiveLoader.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4816 + } + + } // L: 4818 + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "506267788" + ) + static final void method2223(int var0, int var1, boolean var2) { + if (!var2 || var0 != GrandExchangeEvent.field78 || AbstractWorldMapData.field198 != var1) { // L: 5569 + GrandExchangeEvent.field78 = var0; // L: 5572 + AbstractWorldMapData.field198 = var1; // L: 5573 + BuddyRankComparator.updateGameState(25); // L: 5574 + AbstractWorldMapData.drawLoadingMessage("Loading - please wait.", true); // L: 5575 + int var3 = FloorDecoration.baseX; // L: 5576 + int var4 = WorldMapData_0.baseY; // L: 5577 + FloorDecoration.baseX = (var0 - 6) * 8; // L: 5578 + WorldMapData_0.baseY = (var1 - 6) * 8; // L: 5579 + int var5 = FloorDecoration.baseX - var3; // L: 5580 + int var6 = WorldMapData_0.baseY - var4; // L: 5581 + var3 = FloorDecoration.baseX; // L: 5582 + var4 = WorldMapData_0.baseY; // L: 5583 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5584 + NPC var19 = Client.npcs[var7]; // L: 5585 + if (var19 != null) { // L: 5586 + for (var9 = 0; var9 < 10; ++var9) { // L: 5587 + var10000 = var19.pathX; // L: 5588 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5589 + var10000[var9] -= var6; } - if (var3.field2633 != 0 && !var3.isIf3) { // L: 10334 - int var8 = var3.field2633 >> 16; // L: 10335 - var5 = var3.field2633 << 16 >> 16; // L: 10336 - var8 *= Client.field737; // L: 10337 - var5 *= Client.field737; // L: 10338 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 10339 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 10340 - class52.invalidateWidget(var3); // L: 10341 + var19.x -= var5 * 128; // L: 5591 + var19.y -= var6 * 128; // L: 5592 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 5595 + Player var22 = Client.players[var7]; // L: 5596 + if (var22 != null) { // L: 5597 + for (var9 = 0; var9 < 10; ++var9) { // L: 5598 + var10000 = var22.pathX; // L: 5599 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5600 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5602 + var22.y -= var6 * 128; // L: 5603 + } + } + + byte var20 = 0; // L: 5606 + byte var8 = 104; // L: 5607 + byte var21 = 1; // L: 5608 + if (var5 < 0) { // L: 5609 + var20 = 103; // L: 5610 + var8 = -1; // L: 5611 + var21 = -1; // L: 5612 + } + + byte var10 = 0; // L: 5614 + byte var11 = 104; // L: 5615 + byte var12 = 1; // L: 5616 + if (var6 < 0) { // L: 5617 + var10 = 103; // L: 5618 + var11 = -1; // L: 5619 + var12 = -1; // L: 5620 + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5622 + for (var14 = var10; var14 != var11; var14 += var12) { // L: 5623 + int var15 = var13 + var5; // L: 5624 + int var16 = var14 + var6; // L: 5625 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5626 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5627 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5628 + } } } } - } - } // L: 10345 + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5632 5633 5637 + var18.x -= var5; // L: 5634 + var18.y -= var6; // L: 5635 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5636 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5639 + Client.destinationX -= var5; // L: 5640 + Client.destinationY -= var6; // L: 5641 + } + + Client.soundEffectCount = 0; // L: 5643 + Client.isCameraLocked = false; // L: 5644 + ItemContainer.cameraX -= var5 << 7; // L: 5645 + WorldMapManager.cameraZ -= var6 << 7; // L: 5646 + TileItem.oculusOrbFocalPointX -= var5 << 7; // L: 5647 + Interpreter.oculusOrbFocalPointY -= var6 << 7; // L: 5648 + Client.field906 = -1; // L: 5649 + Client.graphicsObjects.clear(); // L: 5650 + Client.projectiles.clear(); // L: 5651 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5652 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 5570 5653 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index a27eaea581..f1f78280b6 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -9,14 +9,19 @@ import java.awt.image.DirectColorModel; import java.awt.image.Raster; import java.awt.image.WritableRaster; 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("bn") +@ObfuscatedName("be") +@Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("component") Component component; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("image") Image image; RasterProvider(int var1, int var2, Component var3) { @@ -31,38 +36,42 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); // L: 31 } // L: 32 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-90781444" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "118" ) + @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1964598850" + garbageValue = "-1818523436" ) + @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 } // L: 40 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "147756616" + garbageValue = "868198553" ) + @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 } // L: 44 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIB)V", - garbageValue = "0" + descriptor = "(Ljava/awt/Graphics;III)V", + garbageValue = "-2098710805" ) + @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { var1.drawImage(this.image, var2, var3, this.component); // L: 48 @@ -72,11 +81,12 @@ public final class RasterProvider extends AbstractRasterProvider { } // L: 53 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIIIB)V", - garbageValue = "-54" + descriptor = "(Ljava/awt/Graphics;IIIII)V", + garbageValue = "-206364767" ) + @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { Shape var6 = var1.getClip(); // L: 57 diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index c6847fbbf4..e7daaddb4b 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -1,21 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("lm") +@Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ag") + @ObfuscatedName("ac") + @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; @ObfuscatedName("ao") + @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ae") + @ObfuscatedName("af") + @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("an") + @ObfuscatedName("av") + @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("am") + @ObfuscatedName("ar") + @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ap") + @ObfuscatedName("ay") + @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("au") + @ObfuscatedName("ah") + @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; static { @@ -28,7 +38,8 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } // L: 16 - @ObfuscatedName("cs") + @ObfuscatedName("cz") + @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 Rasterizer2D_width = var1; // L: 20 @@ -36,7 +47,8 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 } // L: 23 - @ObfuscatedName("ck") + @ObfuscatedName("ch") + @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 Rasterizer2D_yClipStart = 0; // L: 27 @@ -45,6 +57,7 @@ public class Rasterizer2D extends DualNode { } // L: 30 @ObfuscatedName("co") + @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 var0 = 0; @@ -68,7 +81,8 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; // L: 40 } // L: 41 - @ObfuscatedName("cz") + @ObfuscatedName("ck") + @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 Rasterizer2D_xClipStart = var0; @@ -88,7 +102,8 @@ public class Rasterizer2D extends DualNode { } // L: 48 - @ObfuscatedName("cy") + @ObfuscatedName("cr") + @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 var0[1] = Rasterizer2D_yClipStart; // L: 52 @@ -96,7 +111,8 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; // L: 54 } // L: 55 - @ObfuscatedName("cb") + @ObfuscatedName("dg") + @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 Rasterizer2D_yClipStart = var0[1]; // L: 59 @@ -104,7 +120,8 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; // L: 61 } // L: 62 - @ObfuscatedName("cl") + @ObfuscatedName("db") + @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -124,7 +141,8 @@ public class Rasterizer2D extends DualNode { } // L: 79 - @ObfuscatedName("dx") + @ObfuscatedName("dv") + @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 Rasterizer2D_setPixel(var0, var1, var3); // L: 83 @@ -218,7 +236,8 @@ public class Rasterizer2D extends DualNode { } } // L: 84 133 - @ObfuscatedName("dh") + @ObfuscatedName("df") + @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 if (var4 == 256) { // L: 137 @@ -331,6 +350,7 @@ public class Rasterizer2D extends DualNode { } // L: 139 207 @ObfuscatedName("dd") + @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { // L: 210 var2 -= Rasterizer2D_xClipStart - var0; // L: 211 @@ -367,7 +387,8 @@ public class Rasterizer2D extends DualNode { } // L: 232 - @ObfuscatedName("db") + @ObfuscatedName("dl") + @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 var2 -= Rasterizer2D_xClipStart - var0; // L: 236 @@ -400,7 +421,8 @@ public class Rasterizer2D extends DualNode { } // L: 253 - @ObfuscatedName("dj") + @ObfuscatedName("dq") + @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) { // L: 256 int var6 = 0; // L: 257 @@ -443,7 +465,8 @@ public class Rasterizer2D extends DualNode { } } // L: 282 - @ObfuscatedName("dk") + @ObfuscatedName("dp") + @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) { // L: 285 int var8 = 0; // L: 286 @@ -500,11 +523,12 @@ public class Rasterizer2D extends DualNode { } } // L: 326 - @ObfuscatedName("de") + @ObfuscatedName("do") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" ) + @Export("Rasterizer2D_drawGradientPixels") public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { if (var0 + var2 >= 0 && var3 + var1 >= 0) { // L: 329 if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { // L: 330 @@ -580,7 +604,8 @@ public class Rasterizer2D extends DualNode { } } // L: 380 - @ObfuscatedName("da") + @ObfuscatedName("dm") + @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); // L: 384 @@ -588,7 +613,8 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 } // L: 387 - @ObfuscatedName("dr") + @ObfuscatedName("dh") + @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); // L: 390 Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); // L: 391 @@ -599,7 +625,8 @@ public class Rasterizer2D extends DualNode { } // L: 396 - @ObfuscatedName("dw") + @ObfuscatedName("da") + @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 if (var0 < Rasterizer2D_xClipStart) { // L: 400 @@ -620,7 +647,8 @@ public class Rasterizer2D extends DualNode { } } // L: 407 - @ObfuscatedName("dy") + @ObfuscatedName("dz") + @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 if (var0 < Rasterizer2D_xClipStart) { // L: 411 @@ -650,6 +678,7 @@ public class Rasterizer2D extends DualNode { } // L: 431 @ObfuscatedName("ds") + @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 if (var1 < Rasterizer2D_yClipStart) { // L: 435 @@ -670,7 +699,8 @@ public class Rasterizer2D extends DualNode { } } // L: 442 - @ObfuscatedName("dl") + @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) { // L: 445 if (var1 < Rasterizer2D_yClipStart) { // L: 446 @@ -700,7 +730,8 @@ public class Rasterizer2D extends DualNode { } } // L: 467 - @ObfuscatedName("di") + @ObfuscatedName("dy") + @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 var3 -= var1; // L: 471 @@ -781,14 +812,16 @@ public class Rasterizer2D extends DualNode { } } // L: 475 480 524 - @ObfuscatedName("do") + @ObfuscatedName("dj") + @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) { // L: 527 Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; // L: 528 } } // L: 529 - @ObfuscatedName("df") + @ObfuscatedName("dw") + @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; // L: 532 diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 0690a30a75..8dcdd7272b 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -1,75 +1,94 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("et") +@Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("z") - static boolean field1791; - @ObfuscatedName("k") - static boolean field1808; - @ObfuscatedName("s") - static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("t") - public static boolean field1788; - @ObfuscatedName("i") - static int Rasterizer3D_alpha; - @ObfuscatedName("d") - public static int Rasterizer3D_zoom; - @ObfuscatedName("h") - static int Rasterizer3D_clipMidX; - @ObfuscatedName("a") - static int Rasterizer3D_clipMidY; - @ObfuscatedName("q") - static int Rasterizer3D_clipWidth; - @ObfuscatedName("c") - static int Rasterizer3D_clipHeight; @ObfuscatedName("f") - static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("y") - static int Rasterizer3D_clipMidX2; - @ObfuscatedName("v") - static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("j") - static int Rasterizer3D_clipMidY2; - @ObfuscatedName("r") - static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("u") - public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Ley;" - ) - public static TextureLoader Rasterizer3D_textureLoader; + static boolean field1800; @ObfuscatedName("b") - static int[] field1785; + static boolean field1811; @ObfuscatedName("l") - static int[] field1809; - @ObfuscatedName("e") + @Export("Rasterizer3D_isLowDetailTexture") + static boolean Rasterizer3D_isLowDetailTexture; + @ObfuscatedName("m") + public static boolean field1794; + @ObfuscatedName("z") + @Export("Rasterizer3D_alpha") + static int Rasterizer3D_alpha; + @ObfuscatedName("o") + @Export("Rasterizer3D_zoom") + public static int Rasterizer3D_zoom; + @ObfuscatedName("n") + @Export("Rasterizer3D_clipMidX") + static int Rasterizer3D_clipMidX; + @ObfuscatedName("x") + @Export("Rasterizer3D_clipMidY") + static int Rasterizer3D_clipMidY; + @ObfuscatedName("p") + @Export("Rasterizer3D_clipWidth") + static int Rasterizer3D_clipWidth; + @ObfuscatedName("r") + @Export("Rasterizer3D_clipHeight") + static int Rasterizer3D_clipHeight; + @ObfuscatedName("y") + @Export("Rasterizer3D_clipNegativeMidX") + static int Rasterizer3D_clipNegativeMidX; + @ObfuscatedName("s") + @Export("Rasterizer3D_clipMidX2") + static int Rasterizer3D_clipMidX2; + @ObfuscatedName("j") + @Export("Rasterizer3D_clipNegativeMidY") + static int Rasterizer3D_clipNegativeMidY; + @ObfuscatedName("w") + @Export("Rasterizer3D_clipMidY2") + static int Rasterizer3D_clipMidY2; + @ObfuscatedName("v") + @Export("Rasterizer3D_rowOffsets") + static int[] Rasterizer3D_rowOffsets; + @ObfuscatedName("d") + @Export("Rasterizer3D_colorPalette") + public static int[] Rasterizer3D_colorPalette; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lea;" + ) + @Export("Rasterizer3D_textureLoader") + public static TextureLoader Rasterizer3D_textureLoader; + @ObfuscatedName("g") + static int[] field1812; + @ObfuscatedName("h") + static int[] field1813; + @ObfuscatedName("i") + @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; @ObfuscatedName("ab") + @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1791 = false; // L: 8 - field1808 = false; // L: 9 + field1800 = false; // L: 8 + field1811 = false; // L: 9 Rasterizer3D_isLowDetailTexture = false; // L: 10 - field1788 = true; // L: 11 + field1794 = true; // L: 11 Rasterizer3D_alpha = 0; // L: 12 Rasterizer3D_zoom = 512; // L: 19 Rasterizer3D_rowOffsets = new int[1024]; // L: 28 Rasterizer3D_colorPalette = new int[65536]; // L: 29 - field1785 = new int[512]; // L: 31 - field1809 = new int[2048]; // L: 32 + field1812 = new int[512]; // L: 31 + field1813 = new int[2048]; // L: 32 Rasterizer3D_sine = new int[2048]; // L: 33 Rasterizer3D_cosine = new int[2048]; // L: 34 int var0; for (var0 = 1; var0 < 512; ++var0) { // L: 37 - field1785[var0] = 32768 / var0; // L: 38 + field1812[var0] = 32768 / var0; // L: 38 } for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field1809[var0] = 65536 / var0; // L: 41 + field1813[var0] = 65536 / var0; // L: 41 } for (var0 = 0; var0 < 2048; ++var0) { // L: 43 @@ -79,18 +98,20 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 47 - @ObfuscatedName("z") + @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); // L: 54 } // L: 55 - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; // L: 58 Rasterizer3D_clipHeight = var3 - var1; // L: 59 Rasterizer3D_method3(); // L: 60 if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 - Rasterizer3D_rowOffsets = new int[class297.method5378(Rasterizer3D_clipHeight)]; + Rasterizer3D_rowOffsets = new int[WorldMapData_0.method266(Rasterizer3D_clipHeight)]; } int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 @@ -102,7 +123,8 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 67 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 71 @@ -112,8 +134,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 } // L: 76 - @ObfuscatedName("t") - public static final void method3181(int var0, int var1) { + @ObfuscatedName("m") + public static final void method3174(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; // L: 79 int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80 int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81 @@ -125,20 +147,23 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 } // L: 88 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ley;)V" + descriptor = "(Lea;)V" ) + @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; // L: 91 } // L: 92 - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 } // L: 96 - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; // L: 99 @@ -216,7 +241,8 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 140 - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 144 @@ -230,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); // L: 152 } - @ObfuscatedName("g") - public static void method3120(int var0, int var1, int var2) { - field1791 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 + @ObfuscatedName("u") + public static void method3137(int var0, int var1, int var2) { + field1800 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 } // L: 157 - @ObfuscatedName("m") - static final void method3117(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("t") + static final void method3155(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = var4 - var3; // L: 160 int var10 = var1 - var0; // L: 161 int var11 = var5 - var3; // L: 162 @@ -741,9 +767,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("e") + @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 (field1791) { // L: 524 + if (field1800) { // L: 524 if (var5 > Rasterizer3D_clipWidth) { // L: 525 var5 = Rasterizer3D_clipWidth; } @@ -759,7 +786,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field1788) { // L: 531 + if (field1794) { // L: 531 var3 = var5 - var4 >> 2; // L: 532 var7 <<= 2; // L: 533 if (Rasterizer3D_alpha == 0) { // L: 534 @@ -843,8 +870,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 581 602 - @ObfuscatedName("d") - public static final void method3172(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("o") + public static final void method3149(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7 = 0; // L: 607 if (var0 != var1) { // L: 608 var7 = (var4 - var3 << 14) / (var1 - var0); @@ -951,33 +978,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; // L: 676 } - if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { // L: 678 - var1 -= var2; // L: 697 - var2 -= var0; // L: 698 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 699 - - while (true) { - --var2; // L: 700 - if (var2 < 0) { - while (true) { - --var1; // L: 706 - if (var1 < 0) { - return; // L: 712 - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 707 - var5 += var8; // L: 708 - var3 += var7; // L: 709 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 710 - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 701 - var4 += var9; // L: 702 - var3 += var7; // L: 703 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 704 - } - } else { + if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { // L: 678 var1 -= var2; // L: 679 var2 -= var0; // L: 680 var0 = Rasterizer3D_rowOffsets[var0]; // L: 681 @@ -1003,6 +1004,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; // L: 685 var0 += Rasterizer2D.Rasterizer2D_width; // L: 686 } + } else { + var1 -= var2; // L: 697 + var2 -= var0; // L: 698 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 699 + + while (true) { + --var2; // L: 700 + if (var2 < 0) { + while (true) { + --var1; // L: 706 + if (var1 < 0) { + return; // L: 712 + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 707 + var5 += var8; // L: 708 + var3 += var7; // L: 709 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 710 + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 701 + var4 += var9; // L: 702 + var3 += var7; // L: 703 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 704 + } } } } @@ -1299,9 +1326,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("n") + @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1791) { // L: 925 + if (field1800) { // L: 925 if (var5 > Rasterizer3D_clipWidth) { // L: 926 var5 = Rasterizer3D_clipWidth; } @@ -1393,16 +1421,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("a") - static final void method3144(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("x") + static final void method3156(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); // L: 979 int var20; if (var19 == null) { // L: 980 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 981 - method3117(var0, var1, var2, var3, var4, var5, method3134(var20, var6), method3134(var20, var7), method3134(var20, var8)); // L: 982 + method3155(var0, var1, var2, var3, var4, var5, method3186(var20, var6), method3186(var20, var7), method3186(var20, var8)); // L: 982 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 985 - field1808 = Rasterizer3D_textureLoader.vmethod3396(var18); // L: 986 + field1811 = Rasterizer3D_textureLoader.vmethod3401(var18); // L: 986 var20 = var4 - var3; // L: 987 int var21 = var1 - var0; // L: 988 int var22 = var5 - var3; // L: 989 @@ -1474,41 +1502,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1037 var35 += var37 * var41; // L: 1038 var38 += var40 * var41; // L: 1039 - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1040 - var2 -= var1; // L: 1067 - var1 -= var0; // L: 1068 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069 - - while (true) { - --var1; // L: 1070 - if (var1 < 0) { - while (true) { - --var2; // L: 1080 - if (var2 < 0) { - return; // L: 1090 - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1081 - var5 += var28; // L: 1082 - var4 += var27; // L: 1083 - var6 += var31; // L: 1084 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1085 - var32 += var34; // L: 1086 - var35 += var37; // L: 1087 - var38 += var40; // L: 1088 - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071 - var5 += var28; // L: 1072 - var3 += var26; // L: 1073 - var6 += var31; // L: 1074 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075 - var32 += var34; // L: 1076 - var35 += var37; // L: 1077 - var38 += var40; // L: 1078 - } - } else { + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1040 var2 -= var1; // L: 1041 var1 -= var0; // L: 1042 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1043 @@ -1542,6 +1536,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1051 var38 += var40; // L: 1052 } + } else { + var2 -= var1; // L: 1067 + var1 -= var0; // L: 1068 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069 + + while (true) { + --var1; // L: 1070 + if (var1 < 0) { + while (true) { + --var2; // L: 1080 + if (var2 < 0) { + return; // L: 1090 + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1081 + var5 += var28; // L: 1082 + var4 += var27; // L: 1083 + var6 += var31; // L: 1084 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1085 + var32 += var34; // L: 1086 + var35 += var37; // L: 1087 + var38 += var40; // L: 1088 + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071 + var5 += var28; // L: 1072 + var3 += var26; // L: 1073 + var6 += var31; // L: 1074 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075 + var32 += var34; // L: 1076 + var35 += var37; // L: 1077 + var38 += var40; // L: 1078 + } } } else { var4 = var3 <<= 14; // L: 1094 @@ -2014,9 +2042,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 983 - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("Rasterizer3D_iDontKnow") static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field1791) { // L: 1461 + if (field1800) { // L: 1461 if (var6 > Rasterizer3D_clipWidth) { // L: 1462 var6 = Rasterizer3D_clipWidth; } @@ -2080,7 +2109,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1506 var8 <<= 3; // L: 1507 var15 = var7 >> 8; // L: 1508 - if (field1808) { // L: 1509 + if (field1811) { // L: 1509 if (var17 > 0) { // L: 1510 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1512 @@ -2275,7 +2304,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 1681 var8 <<= 3; // L: 1682 var15 = var7 >> 8; // L: 1683 - if (field1808) { // L: 1684 + if (field1811) { // L: 1684 if (var17 > 0) { // L: 1685 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1687 @@ -2434,16 +2463,17 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1819 - @ObfuscatedName("c") + @ObfuscatedName("r") + @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); // L: 1822 int var20; if (var19 == null) { // L: 1823 var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1824 - method3117(var0, var1, var2, var3, var4, var5, method3134(var20, var6), method3134(var20, var7), method3134(var20, var8)); // L: 1825 + method3155(var0, var1, var2, var3, var4, var5, method3186(var20, var6), method3186(var20, var7), method3186(var20, var8)); // L: 1825 } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1828 - field1808 = Rasterizer3D_textureLoader.vmethod3396(var18); // L: 1829 + field1811 = Rasterizer3D_textureLoader.vmethod3401(var18); // L: 1829 var20 = var4 - var3; // L: 1830 int var21 = var1 - var0; // L: 1831 int var22 = var5 - var3; // L: 1832 @@ -2515,41 +2545,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1880 var35 += var37 * var41; // L: 1881 var38 += var40 * var41; // L: 1882 - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1883 - var2 -= var1; // L: 1884 - var1 -= var0; // L: 1885 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 - - while (true) { - --var1; // L: 1887 - if (var1 < 0) { - while (true) { - --var2; // L: 1897 - if (var2 < 0) { - return; // L: 1907 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1898 - var5 += var28; // L: 1899 - var4 += var27; // L: 1900 - var6 += var31; // L: 1901 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1902 - var32 += var34; // L: 1903 - var35 += var37; // L: 1904 - var38 += var40; // L: 1905 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 - var5 += var28; // L: 1889 - var3 += var26; // L: 1890 - var6 += var31; // L: 1891 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 - var32 += var34; // L: 1893 - var35 += var37; // L: 1894 - var38 += var40; // L: 1895 - } - } else { + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1883 var2 -= var1; // L: 1910 var1 -= var0; // L: 1911 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912 @@ -2583,6 +2579,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1920 var38 += var40; // L: 1921 } + } else { + var2 -= var1; // L: 1884 + var1 -= var0; // L: 1885 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 + + while (true) { + --var1; // L: 1887 + if (var1 < 0) { + while (true) { + --var2; // L: 1897 + if (var2 < 0) { + return; // L: 1907 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1898 + var5 += var28; // L: 1899 + var4 += var27; // L: 1900 + var6 += var31; // L: 1901 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1902 + var32 += var34; // L: 1903 + var35 += var37; // L: 1904 + var38 += var40; // L: 1905 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 + var5 += var28; // L: 1889 + var3 += var26; // L: 1890 + var6 += var31; // L: 1891 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 + var32 += var34; // L: 1893 + var35 += var37; // L: 1894 + var38 += var40; // L: 1895 + } } } else { var4 = var3 <<= 14; // L: 1937 @@ -2603,41 +2633,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 1950 var35 += var37 * var41; // L: 1951 var38 += var40 * var41; // L: 1952 - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1953 - var1 -= var2; // L: 1954 - var2 -= var0; // L: 1955 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 - - while (true) { - --var2; // L: 1957 - if (var2 < 0) { - while (true) { - --var1; // L: 1967 - if (var1 < 0) { - return; // L: 1977 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 - var5 += var27; // L: 1969 - var3 += var26; // L: 1970 - var6 += var31; // L: 1971 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 - var32 += var34; // L: 1973 - var35 += var37; // L: 1974 - var38 += var40; // L: 1975 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 - var4 += var28; // L: 1959 - var3 += var26; // L: 1960 - var6 += var31; // L: 1961 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 - var32 += var34; // L: 1963 - var35 += var37; // L: 1964 - var38 += var40; // L: 1965 - } - } else { + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1953 var1 -= var2; // L: 1980 var2 -= var0; // L: 1981 var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982 @@ -2671,6 +2667,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 1990 var38 += var40; // L: 1991 } + } else { + var1 -= var2; // L: 1954 + var2 -= var0; // L: 1955 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 + + while (true) { + --var2; // L: 1957 + if (var2 < 0) { + while (true) { + --var1; // L: 1967 + if (var1 < 0) { + return; // L: 1977 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 + var5 += var27; // L: 1969 + var3 += var26; // L: 1970 + var6 += var31; // L: 1971 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 + var32 += var34; // L: 1973 + var35 += var37; // L: 1974 + var38 += var40; // L: 1975 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 + var4 += var28; // L: 1959 + var3 += var26; // L: 1960 + var6 += var31; // L: 1961 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 + var32 += var34; // L: 1963 + var35 += var37; // L: 1964 + var38 += var40; // L: 1965 + } } } } @@ -2704,41 +2734,7 @@ public class Rasterizer3D extends Rasterizer2D { var32 += var34 * var41; // L: 2026 var35 += var37 * var41; // L: 2027 var38 += var40 * var41; // L: 2028 - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2029 - var0 -= var2; // L: 2056 - var2 -= var1; // L: 2057 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 - - while (true) { - --var2; // L: 2059 - if (var2 < 0) { - while (true) { - --var0; // L: 2069 - if (var0 < 0) { - return; // L: 2079 - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2070 - var3 += var26; // L: 2071 - var5 += var28; // L: 2072 - var7 += var31; // L: 2073 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2074 - var32 += var34; // L: 2075 - var35 += var37; // L: 2076 - var38 += var40; // L: 2077 - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 - var3 += var26; // L: 2061 - var4 += var27; // L: 2062 - var7 += var31; // L: 2063 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 - var32 += var34; // L: 2065 - var35 += var37; // L: 2066 - var38 += var40; // L: 2067 - } - } else { + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2029 var0 -= var2; // L: 2030 var2 -= var1; // L: 2031 var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032 @@ -2772,6 +2768,40 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; // L: 2040 var38 += var40; // L: 2041 } + } else { + var0 -= var2; // L: 2056 + var2 -= var1; // L: 2057 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 + + while (true) { + --var2; // L: 2059 + if (var2 < 0) { + while (true) { + --var0; // L: 2069 + if (var0 < 0) { + return; // L: 2079 + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2070 + var3 += var26; // L: 2071 + var5 += var28; // L: 2072 + var7 += var31; // L: 2073 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2074 + var32 += var34; // L: 2075 + var35 += var37; // L: 2076 + var38 += var40; // L: 2077 + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 + var3 += var26; // L: 2061 + var4 += var27; // L: 2062 + var7 += var31; // L: 2063 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 + var32 += var34; // L: 2065 + var35 += var37; // L: 2066 + var38 += var40; // L: 2067 + } } } else { var5 = var4 <<= 14; // L: 2083 @@ -3055,9 +3085,10 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 1826 - @ObfuscatedName("j") + @ObfuscatedName("y") + @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 (field1791) { // L: 2304 + if (field1800) { // L: 2304 if (var6 > Rasterizer3D_clipWidth) { // L: 2305 var6 = Rasterizer3D_clipWidth; } @@ -3110,7 +3141,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2346 var8 <<= 3; // L: 2347 var15 = var7 >> 8; // L: 2348 - if (field1808) { // L: 2350 + if (field1811) { // L: 2350 if (var17 > 0) { // L: 2351 do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2353 @@ -3253,7 +3284,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; // L: 2483 var8 <<= 3; // L: 2484 var15 = var7 >> 8; // L: 2485 - if (field1808) { // L: 2487 + if (field1811) { // L: 2487 if (var17 > 0) { // L: 2488 do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2490 @@ -3370,8 +3401,8 @@ public class Rasterizer3D extends Rasterizer2D { } } // L: 2586 - @ObfuscatedName("r") - static final int method3134(int var0, int var1) { + @ObfuscatedName("s") + static final int method3186(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 2589 if (var1 < 2) { // L: 2590 var1 = 2; @@ -3382,33 +3413,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; // L: 2592 } - @ObfuscatedName("u") - static final int method3129(int var0, int var1, int var2, int var3) { + @ObfuscatedName("j") + static final int method3157(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2596 } - @ObfuscatedName("p") - static final int method3130(int var0, int var1, int var2, int var3) { + @ObfuscatedName("d") + static final int method3179(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2600 } - @ObfuscatedName("b") - static final int method3131(int var0, int var1, int var2, int var3) { + @ObfuscatedName("a") + static final int method3158(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; // L: 2604 } - @ObfuscatedName("l") - static final int method3111(int var0, int var1, int var2, int var3) { + @ObfuscatedName("g") + static final int method3159(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; // L: 2608 } - @ObfuscatedName("e") - static final int method3132(int var0, int var1, int var2, int var3) { + @ObfuscatedName("h") + static final int method3196(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; // L: 2612 } @ObfuscatedName("ab") - static final int method3124(int var0, int var1, int var2, int var3) { + static final int method3161(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; // L: 2616 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 3574ae9fae..36b313c7c9 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -1,100 +1,109 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("dx") +@Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("z") - int field1506; - @ObfuscatedName("k") - int field1492; - @ObfuscatedName("s") - int field1494; - @ObfuscatedName("t") - int field1503; - @ObfuscatedName("i") + @ObfuscatedName("f") int field1493; - @ObfuscatedName("o") - int field1497; - @ObfuscatedName("x") - int field1498; - @ObfuscatedName("g") - int numLoops; - @ObfuscatedName("m") - int start; - @ObfuscatedName("n") - int end; - @ObfuscatedName("d") - boolean field1502; - @ObfuscatedName("h") - int field1496; - @ObfuscatedName("a") + @ObfuscatedName("b") int field1504; + @ObfuscatedName("l") + int field1494; + @ObfuscatedName("m") + int field1506; + @ObfuscatedName("z") + int field1496; @ObfuscatedName("q") - int field1505; + int field1497; + @ObfuscatedName("k") + int field1498; @ObfuscatedName("c") - int field1500; + @Export("numLoops") + int numLoops; + @ObfuscatedName("u") + @Export("start") + int start; + @ObfuscatedName("t") + @Export("end") + int end; + @ObfuscatedName("e") + boolean field1502; + @ObfuscatedName("o") + int field1503; + @ObfuscatedName("n") + int field1492; + @ObfuscatedName("x") + int field1499; + @ObfuscatedName("p") + int field1505; @ObfuscatedSignature( - descriptor = "(Lde;III)V" + descriptor = "(Ldo;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; // L: 51 this.start = var1.start; // L: 52 this.end = var1.end; // L: 53 - this.field1502 = var1.field1417; // L: 54 - this.field1492 = var2; // L: 55 + this.field1502 = var1.field1416; // L: 54 + this.field1504 = var2; // L: 55 this.field1494 = var3; // L: 56 - this.field1503 = var4; // L: 57 - this.field1506 = 0; // L: 58 - this.method2647(); // L: 59 + this.field1506 = var4; // L: 57 + this.field1493 = 0; // L: 58 + this.method2816(); // L: 59 } // L: 60 @ObfuscatedSignature( - descriptor = "(Lde;II)V" + descriptor = "(Ldo;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; // L: 39 this.start = var1.start; // L: 40 this.end = var1.end; // L: 41 - this.field1502 = var1.field1417; // L: 42 - this.field1492 = var2; // L: 43 + this.field1502 = var1.field1416; // L: 42 + this.field1504 = var2; // L: 43 this.field1494 = var3; // L: 44 - this.field1503 = 8192; // L: 45 - this.field1506 = 0; // L: 46 - this.method2647(); // L: 47 + this.field1506 = 8192; // L: 45 + this.field1493 = 0; // L: 46 + this.method2816(); // L: 47 } // L: 48 - @ObfuscatedName("i") - void method2647() { - this.field1493 = this.field1494; // L: 73 - this.field1497 = method2733(this.field1494, this.field1503); // L: 74 - this.field1498 = method2768(this.field1494, this.field1503); // L: 75 + @ObfuscatedName("z") + void method2816() { + this.field1496 = this.field1494; // L: 73 + this.field1497 = method2765(this.field1494, this.field1506); // L: 74 + this.field1498 = method2710(this.field1494, this.field1506); // L: 75 } // L: 76 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("firstSubStream") protected PcmStream firstSubStream() { return null; // L: 200 } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldc;" + descriptor = "()Lde;" ) + @Export("nextSubStream") protected PcmStream nextSubStream() { return null; // L: 204 } - @ObfuscatedName("w") - protected int vmethod3987() { - return this.field1494 == 0 && this.field1496 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("c") + protected int vmethod4043() { + return this.field1494 == 0 && this.field1503 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1494 == 0 && this.field1496 == 0) { // L: 213 + if (this.field1494 == 0 && this.field1503 == 0) { // L: 213 this.skip(var3); // L: 214 } else { RawSound var4 = (RawSound)super.sound; // L: 217 @@ -108,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; // L: 223 var3 += var2; // L: 224 - if (this.field1506 < 0) { // L: 225 - if (this.field1492 <= 0) { // L: 226 - this.method2648(); // L: 228 + if (this.field1493 < 0) { // L: 225 + if (this.field1504 <= 0) { // L: 226 + this.method2774(); // L: 228 this.remove(); // L: 229 return; // L: 230 } - this.field1506 = 0; + this.field1493 = 0; } - if (this.field1506 >= var7) { // L: 233 - if (this.field1492 >= 0) { // L: 234 - this.method2648(); // L: 236 + if (this.field1493 >= var7) { // L: 233 + if (this.field1504 >= 0) { // L: 234 + this.method2774(); // L: 236 this.remove(); // L: 237 return; // L: 238 } - this.field1506 = var7 - 1; + this.field1493 = var7 - 1; } if (this.numLoops < 0) { // L: 241 if (this.field1502) { // L: 242 - if (this.field1492 < 0) { // L: 243 - var9 = this.method2664(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field1506 >= var5) { // L: 245 + if (this.field1504 < 0) { // L: 243 + var9 = this.method2698(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field1493 >= var5) { // L: 245 return; } - this.field1506 = var5 + var5 - 1 - this.field1506; // L: 246 - this.field1492 = -this.field1492; // L: 247 + this.field1493 = var5 + var5 - 1 - this.field1493; // L: 246 + this.field1504 = -this.field1504; // L: 247 } while (true) { - var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field1506 < var6) { // L: 251 + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field1493 < var6) { // L: 251 return; } - this.field1506 = var6 + var6 - 1 - this.field1506; // L: 252 - this.field1492 = -this.field1492; // L: 253 - var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field1506 >= var5) { // L: 255 + this.field1493 = var6 + var6 - 1 - this.field1493; // L: 252 + this.field1504 = -this.field1504; // L: 253 + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field1493 >= var5) { // L: 255 return; } - this.field1506 = var5 + var5 - 1 - this.field1506; // L: 256 - this.field1492 = -this.field1492; // L: 257 + this.field1493 = var5 + var5 - 1 - this.field1493; // L: 256 + this.field1504 = -this.field1504; // L: 257 } - } else if (this.field1492 < 0) { // L: 260 + } else if (this.field1504 < 0) { // L: 260 while (true) { - var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field1506 >= var5) { // L: 263 + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field1493 >= var5) { // L: 263 return; } - this.field1506 = var6 - 1 - (var6 - 1 - this.field1506) % var8; // L: 264 + this.field1493 = var6 - 1 - (var6 - 1 - this.field1493) % var8; // L: 264 } } else { while (true) { - var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field1506 < var6) { // L: 270 + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field1493 < var6) { // L: 270 return; } - this.field1506 = var5 + (this.field1506 - var5) % var8; // L: 271 + this.field1493 = var5 + (this.field1493 - var5) % var8; // L: 271 } } } else { if (this.numLoops > 0) { // L: 275 if (this.field1502) { // L: 276 label127: { - if (this.field1492 < 0) { // L: 277 - var9 = this.method2664(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field1506 >= var5) { // L: 279 + if (this.field1504 < 0) { // L: 277 + var9 = this.method2698(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field1493 >= var5) { // L: 279 return; } - this.field1506 = var5 + var5 - 1 - this.field1506; // L: 280 - this.field1492 = -this.field1492; // L: 281 + this.field1493 = var5 + var5 - 1 - this.field1493; // L: 280 + this.field1504 = -this.field1504; // L: 281 if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field1506 < var6) { // L: 286 + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field1493 < var6) { // L: 286 return; } - this.field1506 = var6 + var6 - 1 - this.field1506; // L: 287 - this.field1492 = -this.field1492; // L: 288 + this.field1493 = var6 + var6 - 1 - this.field1493; // L: 287 + this.field1504 = -this.field1504; // L: 288 if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field1506 >= var5) { // L: 291 + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field1493 >= var5) { // L: 291 return; } - this.field1506 = var5 + var5 - 1 - this.field1506; // L: 292 - this.field1492 = -this.field1492; // L: 293 + this.field1493 = var5 + var5 - 1 - this.field1493; // L: 292 + this.field1504 = -this.field1504; // L: 293 } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field1492 < 0) { // L: 297 + if (this.field1504 < 0) { // L: 297 while (true) { - var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field1506 >= var5) { // L: 300 + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field1493 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field1506) / var8; // L: 301 + var10 = (var6 - 1 - this.field1493) / var8; // L: 301 if (var10 >= this.numLoops) { // L: 302 - this.field1506 += var8 * this.numLoops; // L: 303 + this.field1493 += var8 * this.numLoops; // L: 303 this.numLoops = 0; // L: 304 break; // L: 305 } - this.field1506 += var8 * var10; // L: 307 + this.field1493 += var8 * var10; // L: 307 this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field1506 < var6) { // L: 314 + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field1493 < var6) { // L: 314 return; } - var10 = (this.field1506 - var5) / var8; // L: 315 + var10 = (this.field1493 - var5) / var8; // L: 315 if (var10 >= this.numLoops) { // L: 316 - this.field1506 -= var8 * this.numLoops; // L: 317 + this.field1493 -= var8 * this.numLoops; // L: 317 this.numLoops = 0; // L: 318 break; // L: 319 } - this.field1506 -= var8 * var10; // L: 321 + this.field1493 -= var8 * var10; // L: 321 this.numLoops -= var10; // L: 322 } } } } - if (this.field1492 < 0) { // L: 326 - this.method2664(var1, var9, 0, var3, 0); // L: 327 - if (this.field1506 < 0) { // L: 328 - this.field1506 = -1; // L: 329 - this.method2648(); // L: 330 + if (this.field1504 < 0) { // L: 326 + this.method2698(var1, var9, 0, var3, 0); // L: 327 + if (this.field1493 < 0) { // L: 328 + this.field1493 = -1; // L: 329 + this.method2774(); // L: 330 this.remove(); // L: 331 } } else { - this.method2662(var1, var9, var7, var3, 0); // L: 335 - if (this.field1506 >= var7) { // L: 336 - this.field1506 = var7; // L: 337 - this.method2648(); // L: 338 + this.method2697(var1, var9, var7, var3, 0); // L: 335 + if (this.field1493 >= var7) { // L: 336 + this.field1493 = var7; // L: 337 + this.method2774(); // L: 338 this.remove(); // L: 339 } } @@ -273,31 +282,33 @@ public class RawPcmStream extends PcmStream { } } // L: 215 342 - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("skip") public synchronized void skip(int var1) { - if (this.field1496 > 0) { // L: 345 - if (var1 >= this.field1496) { // L: 346 + if (this.field1503 > 0) { // L: 345 + if (var1 >= this.field1503) { // L: 346 if (this.field1494 == Integer.MIN_VALUE) { // L: 347 this.field1494 = 0; // L: 348 this.field1498 = 0; // L: 349 this.field1497 = 0; // L: 350 - this.field1493 = 0; // L: 351 + this.field1496 = 0; // L: 351 this.remove(); // L: 352 - var1 = this.field1496; // L: 353 + var1 = this.field1503; // L: 353 } - this.field1496 = 0; // L: 355 - this.method2647(); // L: 356 + this.field1503 = 0; // L: 355 + this.method2816(); // L: 356 } else { - this.field1493 += this.field1504 * var1; // L: 359 - this.field1497 += this.field1505 * var1; // L: 360 - this.field1498 += this.field1500 * var1; // L: 361 - this.field1496 -= var1; // L: 362 + this.field1496 += this.field1492 * var1; // L: 359 + this.field1497 += this.field1499 * var1; // L: 360 + this.field1498 += this.field1505 * var1; // L: 361 + this.field1503 -= var1; // L: 362 } } @@ -310,62 +321,62 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1506 < 0) { // L: 371 - if (this.field1492 <= 0) { // L: 372 - this.method2648(); // L: 374 + if (this.field1493 < 0) { // L: 371 + if (this.field1504 <= 0) { // L: 372 + this.method2774(); // L: 374 this.remove(); // L: 375 return; // L: 376 } - this.field1506 = 0; + this.field1493 = 0; } - if (this.field1506 >= var5) { // L: 379 - if (this.field1492 >= 0) { // L: 380 - this.method2648(); // L: 382 + if (this.field1493 >= var5) { // L: 379 + if (this.field1504 >= 0) { // L: 380 + this.method2774(); // L: 382 this.remove(); // L: 383 return; // L: 384 } - this.field1506 = var5 - 1; + this.field1493 = var5 - 1; } - this.field1506 += this.field1492 * var1; // L: 387 + this.field1493 += this.field1504 * var1; // L: 387 if (this.numLoops < 0) { // L: 388 if (!this.field1502) { // L: 389 - if (this.field1492 < 0) { // L: 404 - if (this.field1506 >= var3) { // L: 405 + if (this.field1504 < 0) { // L: 404 + if (this.field1493 >= var3) { // L: 405 return; } - this.field1506 = var4 - 1 - (var4 - 1 - this.field1506) % var6; // L: 406 + this.field1493 = var4 - 1 - (var4 - 1 - this.field1493) % var6; // L: 406 } else { - if (this.field1506 < var4) { // L: 409 + if (this.field1493 < var4) { // L: 409 return; } - this.field1506 = var3 + (this.field1506 - var3) % var6; // L: 410 + this.field1493 = var3 + (this.field1493 - var3) % var6; // L: 410 } } else { - if (this.field1492 < 0) { // L: 390 - if (this.field1506 >= var3) { // L: 391 + if (this.field1504 < 0) { // L: 390 + if (this.field1493 >= var3) { // L: 391 return; } - this.field1506 = var3 + var3 - 1 - this.field1506; // L: 392 - this.field1492 = -this.field1492; // L: 393 + this.field1493 = var3 + var3 - 1 - this.field1493; // L: 392 + this.field1504 = -this.field1504; // L: 393 } - while (this.field1506 >= var4) { // L: 396 - this.field1506 = var4 + var4 - 1 - this.field1506; // L: 397 - this.field1492 = -this.field1492; // L: 398 - if (this.field1506 >= var3) { // L: 399 + while (this.field1493 >= var4) { // L: 396 + this.field1493 = var4 + var4 - 1 - this.field1493; // L: 397 + this.field1504 = -this.field1504; // L: 398 + if (this.field1493 >= var3) { // L: 399 return; } - this.field1506 = var3 + var3 - 1 - this.field1506; // L: 400 - this.field1492 = -this.field1492; // L: 401 + this.field1493 = var3 + var3 - 1 - this.field1493; // L: 400 + this.field1504 = -this.field1504; // L: 401 } } @@ -373,67 +384,67 @@ public class RawPcmStream extends PcmStream { if (this.numLoops > 0) { // L: 414 if (this.field1502) { // L: 415 label129: { - if (this.field1492 < 0) { // L: 416 - if (this.field1506 >= var3) { // L: 417 + if (this.field1504 < 0) { // L: 416 + if (this.field1493 >= var3) { // L: 417 return; } - this.field1506 = var3 + var3 - 1 - this.field1506; // L: 418 - this.field1492 = -this.field1492; // L: 419 + this.field1493 = var3 + var3 - 1 - this.field1493; // L: 418 + this.field1504 = -this.field1504; // L: 419 if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field1506 < var4) { // L: 423 + if (this.field1493 < var4) { // L: 423 return; } - this.field1506 = var4 + var4 - 1 - this.field1506; // L: 424 - this.field1492 = -this.field1492; // L: 425 + this.field1493 = var4 + var4 - 1 - this.field1493; // L: 424 + this.field1504 = -this.field1504; // L: 425 if (--this.numLoops == 0) { // L: 426 break; } - if (this.field1506 >= var3) { // L: 427 + if (this.field1493 >= var3) { // L: 427 return; } - this.field1506 = var3 + var3 - 1 - this.field1506; // L: 428 - this.field1492 = -this.field1492; // L: 429 + this.field1493 = var3 + var3 - 1 - this.field1493; // L: 428 + this.field1504 = -this.field1504; // L: 429 } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field1492 < 0) { // L: 433 - if (this.field1506 >= var3) { // L: 434 + if (this.field1504 < 0) { // L: 433 + if (this.field1493 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field1506) / var6; // L: 435 + var7 = (var4 - 1 - this.field1493) / var6; // L: 435 if (var7 >= this.numLoops) { // L: 436 - this.field1506 += var6 * this.numLoops; // L: 437 + this.field1493 += var6 * this.numLoops; // L: 437 this.numLoops = 0; // L: 438 break label161; // L: 439 } - this.field1506 += var6 * var7; // L: 441 + this.field1493 += var6 * var7; // L: 441 this.numLoops -= var7; // L: 442 } else { - if (this.field1506 < var4) { // L: 445 + if (this.field1493 < var4) { // L: 445 return; } - var7 = (this.field1506 - var3) / var6; // L: 446 + var7 = (this.field1493 - var3) / var6; // L: 446 if (var7 >= this.numLoops) { // L: 447 - this.field1506 -= var6 * this.numLoops; // L: 448 + this.field1493 -= var6 * this.numLoops; // L: 448 this.numLoops = 0; // L: 449 break label161; // L: 450 } - this.field1506 -= var6 * var7; // L: 452 + this.field1493 -= var6 * var7; // L: 452 this.numLoops -= var7; // L: 453 } @@ -442,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field1492 < 0) { // L: 457 - if (this.field1506 < 0) { // L: 458 - this.field1506 = -1; // L: 459 - this.method2648(); // L: 460 + if (this.field1504 < 0) { // L: 457 + if (this.field1493 < 0) { // L: 458 + this.field1493 = -1; // L: 459 + this.method2774(); // L: 460 this.remove(); // L: 461 } - } else if (this.field1506 >= var5) { // L: 465 - this.field1506 = var5; // L: 466 - this.method2648(); // L: 467 + } else if (this.field1493 >= var5) { // L: 465 + this.field1493 = var5; // L: 466 + this.method2774(); // L: 467 this.remove(); // L: 468 } } } // L: 412 471 - @ObfuscatedName("d") - public synchronized void method2641(int var1) { - this.method2791(var1 << 6, this.method2675()); // L: 83 + @ObfuscatedName("o") + public synchronized void method2677(int var1) { + this.method2679(var1 << 6, this.method2681()); // L: 83 } // L: 84 - @ObfuscatedName("h") - synchronized void method2642(int var1) { - this.method2791(var1, this.method2675()); // L: 87 + @ObfuscatedName("n") + synchronized void method2678(int var1) { + this.method2679(var1, this.method2681()); // L: 87 } // L: 88 - @ObfuscatedName("a") - synchronized void method2791(int var1, int var2) { + @ObfuscatedName("x") + synchronized void method2679(int var1, int var2) { this.field1494 = var1; // L: 91 - this.field1503 = var2; // L: 92 - this.field1496 = 0; // L: 93 - this.method2647(); // L: 94 + this.field1506 = var2; // L: 92 + this.field1503 = 0; // L: 93 + this.method2816(); // L: 94 } // L: 95 - @ObfuscatedName("q") - public synchronized int method2644() { + @ObfuscatedName("p") + public synchronized int method2680() { return this.field1494 == Integer.MIN_VALUE ? 0 : this.field1494; // L: 98 } - @ObfuscatedName("c") - public synchronized int method2675() { - return this.field1503 < 0 ? -1 : this.field1503; // L: 102 + @ObfuscatedName("r") + public synchronized int method2681() { + return this.field1506 < 0 ? -1 : this.field1506; // L: 102 } - @ObfuscatedName("j") - public synchronized void method2646(int var1) { + @ObfuscatedName("y") + public synchronized void method2682(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 if (var1 < -1) { // L: 107 var1 = -1; @@ -496,50 +507,50 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1506 = var1; // L: 109 + this.field1493 = var1; // L: 109 } // L: 110 - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method2777() { - this.field1492 = (this.field1492 ^ this.field1492 >> 31) + (this.field1492 >>> 31); // L: 113 - this.field1492 = -this.field1492; // L: 114 + public synchronized void method2788() { + this.field1504 = (this.field1504 ^ this.field1504 >> 31) + (this.field1504 >>> 31); // L: 113 + this.field1504 = -this.field1504; // L: 114 } // L: 115 - @ObfuscatedName("u") - void method2648() { - if (this.field1496 != 0) { // L: 118 + @ObfuscatedName("j") + void method2774() { + if (this.field1503 != 0) { // L: 118 if (this.field1494 == Integer.MIN_VALUE) { this.field1494 = 0; // L: 119 } - this.field1496 = 0; // L: 120 - this.method2647(); // L: 121 + this.field1503 = 0; // L: 120 + this.method2816(); // L: 121 } } // L: 123 - @ObfuscatedName("p") - public synchronized void method2744(int var1, int var2) { - this.method2650(var1, var2, this.method2675()); // L: 126 + @ObfuscatedName("d") + public synchronized void method2721(int var1, int var2) { + this.method2686(var1, var2, this.method2681()); // L: 126 } // L: 127 - @ObfuscatedName("b") - public synchronized void method2650(int var1, int var2, int var3) { + @ObfuscatedName("ao") + public synchronized void method2686(int var1, int var2, int var3) { if (var1 == 0) { // L: 130 - this.method2791(var2, var3); // L: 131 + this.method2679(var2, var3); // L: 131 } else { - int var4 = method2733(var2, var3); // L: 134 - int var5 = method2768(var2, var3); // L: 135 + int var4 = method2765(var2, var3); // L: 134 + int var5 = method2710(var2, var3); // L: 135 if (var4 == this.field1497 && var5 == this.field1498) { // L: 136 - this.field1496 = 0; // L: 137 + this.field1503 = 0; // L: 137 } else { - int var6 = var2 - this.field1493; // L: 140 - if (this.field1493 - var2 > var6) { // L: 141 - var6 = this.field1493 - var2; + int var6 = var2 - this.field1496; // L: 140 + if (this.field1496 - var2 > var6) { // L: 141 + var6 = this.field1496 - var2; } if (var4 - this.field1497 > var6) { // L: 142 @@ -562,30 +573,30 @@ public class RawPcmStream extends PcmStream { var1 = var6; } - this.field1496 = var1; // L: 147 + this.field1503 = var1; // L: 147 this.field1494 = var2; // L: 148 - this.field1503 = var3; // L: 149 - this.field1504 = (var2 - this.field1493) / var1; // L: 150 - this.field1505 = (var4 - this.field1497) / var1; // L: 151 - this.field1500 = (var5 - this.field1498) / var1; // L: 152 + this.field1506 = var3; // L: 149 + this.field1492 = (var2 - this.field1496) / var1; // L: 150 + this.field1499 = (var4 - this.field1497) / var1; // L: 151 + this.field1505 = (var5 - this.field1498) / var1; // L: 152 } } } // L: 132 138 153 - @ObfuscatedName("l") - public synchronized void method2681(int var1) { + @ObfuscatedName("af") + public synchronized void method2687(int var1) { if (var1 == 0) { // L: 156 - this.method2642(0); // L: 157 + this.method2678(0); // L: 157 this.remove(); // L: 158 } else if (this.field1497 == 0 && this.field1498 == 0) { // L: 161 - this.field1496 = 0; // L: 162 + this.field1503 = 0; // L: 162 this.field1494 = 0; // L: 163 - this.field1493 = 0; // L: 164 + this.field1496 = 0; // L: 164 this.remove(); // L: 165 } else { - int var2 = -this.field1493; // L: 168 - if (this.field1493 > var2) { // L: 169 - var2 = this.field1493; + int var2 = -this.field1496; // L: 168 + if (this.field1496 > var2) { // L: 169 + var2 = this.field1496; } if (-this.field1497 > var2) { // L: 170 @@ -608,141 +619,154 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1496 = var1; // L: 175 + this.field1503 = var1; // L: 175 this.field1494 = Integer.MIN_VALUE; // L: 176 - this.field1504 = -this.field1493 / var1; // L: 177 - this.field1505 = -this.field1497 / var1; // L: 178 - this.field1500 = -this.field1498 / var1; // L: 179 + this.field1492 = -this.field1496 / var1; // L: 177 + this.field1499 = -this.field1497 / var1; // L: 178 + this.field1505 = -this.field1498 / var1; // L: 179 } } // L: 159 166 180 - @ObfuscatedName("e") - public synchronized void method2652(int var1) { - if (this.field1492 < 0) { // L: 183 - this.field1492 = -var1; + @ObfuscatedName("av") + public synchronized void method2733(int var1) { + if (this.field1504 < 0) { // L: 183 + this.field1504 = -var1; } else { - this.field1492 = var1; // L: 184 + this.field1504 = var1; // L: 184 } } // L: 185 - @ObfuscatedName("ab") - public synchronized int method2687() { - return this.field1492 < 0 ? -this.field1492 : this.field1492; // L: 188 + @ObfuscatedName("ak") + public synchronized int method2689() { + return this.field1504 < 0 ? -this.field1504 : this.field1504; // L: 188 } - @ObfuscatedName("ag") - public boolean method2654() { - return this.field1506 < 0 || this.field1506 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + @ObfuscatedName("au") + public boolean method2690() { + return this.field1493 < 0 || this.field1493 >= ((RawSound)super.sound).samples.length << 8; // L: 192 } - @ObfuscatedName("ao") - public boolean method2655() { - return this.field1496 != 0; // L: 196 + @ObfuscatedName("ai") + public boolean method2786() { + return this.field1503 != 0; // L: 196 } - @ObfuscatedName("ae") - int method2662(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("aq") + int vmethod2850() { + int var1 = this.field1496 * 3 >> 6; // L: 31 + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 + if (this.numLoops == 0) { // L: 33 + var1 -= var1 * this.field1493 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 + } + + return var1 > 255 ? 255 : var1; // L: 35 + } + + @ObfuscatedName("aw") + int method2697(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field1496 > 0) { // L: 474 - int var6 = var2 + this.field1496; // L: 475 + if (this.field1503 > 0) { // L: 474 + int var6 = var2 + this.field1503; // L: 475 if (var6 > var4) { // L: 476 var6 = var4; } - this.field1496 += var2; // L: 477 - if (this.field1492 == 256 && (this.field1506 & 255) == 0) { // L: 478 + this.field1503 += var2; // L: 477 + if (this.field1504 == 256 && (this.field1493 & 255) == 0) { // L: 478 if (PcmPlayer.PcmPlayer_stereo) { // L: 479 - var2 = method2637(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this); + var2 = method2709(0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, this.field1499, this.field1505, 0, var6, var3, this); } else { - var2 = method2672(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this); // L: 480 + var2 = method2747(((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, this.field1492, 0, var6, var3, this); // L: 480 } } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 - var2 = method2759(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this, this.field1492, var5); + var2 = method2713(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, this.field1499, this.field1505, 0, var6, var3, this, this.field1504, var5); } else { - var2 = method2676(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this, this.field1492, var5); // L: 484 + var2 = method2712(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, this.field1492, 0, var6, var3, this, this.field1504, var5); // L: 484 } - this.field1496 -= var2; // L: 486 - if (this.field1496 != 0) { // L: 487 + this.field1503 -= var2; // L: 486 + if (this.field1503 != 0) { // L: 487 return var2; } - if (!this.method2663()) { // L: 488 + if (!this.method2758()) { // L: 488 continue; } return var4; } - if (this.field1492 == 256 && (this.field1506 & 255) == 0) { // L: 490 + if (this.field1504 == 256 && (this.field1493 & 255) == 0) { // L: 490 if (PcmPlayer.PcmPlayer_stereo) { // L: 491 - return method2685(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this); + return method2701(0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, 0, var4, var3, this); } - return method2722(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this); // L: 492 + return method2731(((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, 0, var4, var3, this); // L: 492 } if (PcmPlayer.PcmPlayer_stereo) { // L: 495 - return method2669(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this, this.field1492, var5); + return method2705(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, 0, var4, var3, this, this.field1504, var5); } - return method2668(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this, this.field1492, var5); // L: 496 + return method2790(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, 0, var4, var3, this, this.field1504, var5); // L: 496 } } - @ObfuscatedName("ap") - int method2664(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("an") + int method2698(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field1496 > 0) { // L: 501 - int var6 = var2 + this.field1496; // L: 502 + if (this.field1503 > 0) { // L: 501 + int var6 = var2 + this.field1503; // L: 502 if (var6 > var4) { // L: 503 var6 = var4; } - this.field1496 += var2; // L: 504 - if (this.field1492 == -256 && (this.field1506 & 255) == 0) { // L: 505 + this.field1503 += var2; // L: 504 + if (this.field1504 == -256 && (this.field1493 & 255) == 0) { // L: 505 if (PcmPlayer.PcmPlayer_stereo) { // L: 506 - var2 = method2793(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this); + var2 = method2711(0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, this.field1499, this.field1505, 0, var6, var3, this); } else { - var2 = method2674(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this); // L: 507 + var2 = method2699(((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, this.field1492, 0, var6, var3, this); // L: 507 } } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 - var2 = method2679(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this, this.field1492, var5); + var2 = method2715(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, this.field1499, this.field1505, 0, var6, var3, this, this.field1504, var5); } else { - var2 = method2678(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this, this.field1492, var5); // L: 511 + var2 = method2772(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, this.field1492, 0, var6, var3, this, this.field1504, var5); // L: 511 } - this.field1496 -= var2; // L: 513 - if (this.field1496 != 0) { // L: 514 + this.field1503 -= var2; // L: 513 + if (this.field1503 != 0) { // L: 514 return var2; } - if (!this.method2663()) { // L: 515 + if (!this.method2758()) { // L: 515 continue; } return var4; } - if (this.field1492 == -256 && (this.field1506 & 255) == 0) { // L: 517 + if (this.field1504 == -256 && (this.field1493 & 255) == 0) { // L: 517 if (PcmPlayer.PcmPlayer_stereo) { // L: 518 - return method2789(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this); + return method2703(0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, 0, var4, var3, this); } - return method2666(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this); // L: 519 + return method2702(((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, 0, var4, var3, this); // L: 519 } if (PcmPlayer.PcmPlayer_stereo) { // L: 522 - return method2734(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this, this.field1492, var5); + return method2707(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1497, this.field1498, 0, var4, var3, this, this.field1504, var5); } - return method2753(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this, this.field1492, var5); // L: 523 + return method2695(0, 0, ((RawSound)super.sound).samples, var1, this.field1493, var2, this.field1496, 0, var4, var3, this, this.field1504, var5); // L: 523 } } - @ObfuscatedName("au") - boolean method2663() { + @ObfuscatedName("am") + boolean method2758() { int var1 = this.field1494; // L: 528 int var2; int var3; @@ -751,109 +775,97 @@ public class RawPcmStream extends PcmStream { var2 = 0; // L: 533 var1 = 0; // L: 534 } else { - var2 = method2733(var1, this.field1503); // L: 537 - var3 = method2768(var1, this.field1503); // L: 538 + var2 = method2765(var1, this.field1506); // L: 537 + var3 = method2710(var1, this.field1506); // L: 538 } - if (var1 == this.field1493 && var2 == this.field1497 && var3 == this.field1498) { // L: 540 + if (var1 == this.field1496 && var2 == this.field1497 && var3 == this.field1498) { // L: 540 if (this.field1494 == Integer.MIN_VALUE) { // L: 570 this.field1494 = 0; // L: 571 this.field1498 = 0; // L: 572 this.field1497 = 0; // L: 573 - this.field1493 = 0; // L: 574 + this.field1496 = 0; // L: 574 this.remove(); // L: 575 return true; // L: 576 } else { - this.method2647(); // L: 578 + this.method2816(); // L: 578 return false; // L: 579 } } else { - if (this.field1493 < var1) { // L: 541 - this.field1504 = 1; // L: 542 - this.field1496 = var1 - this.field1493; // L: 543 - } else if (this.field1493 > var1) { // L: 545 - this.field1504 = -1; // L: 546 - this.field1496 = this.field1493 - var1; // L: 547 + if (this.field1496 < var1) { // L: 541 + this.field1492 = 1; // L: 542 + this.field1503 = var1 - this.field1496; // L: 543 + } else if (this.field1496 > var1) { // L: 545 + this.field1492 = -1; // L: 546 + this.field1503 = this.field1496 - var1; // L: 547 } else { - this.field1504 = 0; // L: 549 + this.field1492 = 0; // L: 549 } if (this.field1497 < var2) { // L: 550 - this.field1505 = 1; // L: 551 - if (this.field1496 == 0 || this.field1496 > var2 - this.field1497) { // L: 552 - this.field1496 = var2 - this.field1497; + this.field1499 = 1; // L: 551 + if (this.field1503 == 0 || this.field1503 > var2 - this.field1497) { // L: 552 + this.field1503 = var2 - this.field1497; } } else if (this.field1497 > var2) { // L: 554 - this.field1505 = -1; // L: 555 - if (this.field1496 == 0 || this.field1496 > this.field1497 - var2) { // L: 556 - this.field1496 = this.field1497 - var2; + this.field1499 = -1; // L: 555 + if (this.field1503 == 0 || this.field1503 > this.field1497 - var2) { // L: 556 + this.field1503 = this.field1497 - var2; } } else { - this.field1505 = 0; // L: 558 + this.field1499 = 0; // L: 558 } if (this.field1498 < var3) { // L: 559 - this.field1500 = 1; // L: 560 - if (this.field1496 == 0 || this.field1496 > var3 - this.field1498) { // L: 561 - this.field1496 = var3 - this.field1498; + this.field1505 = 1; // L: 560 + if (this.field1503 == 0 || this.field1503 > var3 - this.field1498) { // L: 561 + this.field1503 = var3 - this.field1498; } } else if (this.field1498 > var3) { // L: 563 - this.field1500 = -1; // L: 564 - if (this.field1496 == 0 || this.field1496 > this.field1498 - var3) { // L: 565 - this.field1496 = this.field1498 - var3; + this.field1505 = -1; // L: 564 + if (this.field1503 == 0 || this.field1503 > this.field1498 - var3) { // L: 565 + this.field1503 = this.field1498 - var3; } } else { - this.field1500 = 0; // L: 567 + this.field1505 = 0; // L: 567 } return false; // L: 568 } } - @ObfuscatedName("aw") - int vmethod2837() { - int var1 = this.field1493 * 3 >> 6; // L: 31 - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 - if (this.numLoops == 0) { // L: 33 - var1 -= var1 * this.field1506 / (((RawSound)super.sound).samples.length << 8); - } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 - } - - return var1 > 255 ? 255 : var1; // L: 35 - } - - @ObfuscatedName("z") - static int method2733(int var0, int var1) { + @ObfuscatedName("f") + static int method2765(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("k") - static int method2768(int var0, int var1) { + @ObfuscatedName("b") + static int method2710(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lde;II)Ldm;" + descriptor = "(Ldo;II)Ldx;" ) + @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field1447 * 100)), var2 << 6) : null; // L: 63 64 + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field1442 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lde;III)Ldm;" + descriptor = "(Ldo;III)Ldx;" ) - public static RawPcmStream method2638(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method2683(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69 } - @ObfuscatedName("ax") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILdm;)I" + descriptor = "([B[IIIIIIILdx;)I" ) - static int method2722(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2731(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 583 var7 >>= 8; // L: 584 var4 <<= 2; // L: 585 @@ -876,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 596 } - var8.field1506 = var2 << 8; // L: 598 + var8.field1493 = var2 << 8; // L: 598 return var3; // L: 599 } - @ObfuscatedName("ad") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILdm;)I" + descriptor = "(I[B[IIIIIIIILdx;)I" ) - static int method2685(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2701(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 603 var9 >>= 8; // L: 604 var5 <<= 2; // L: 605 @@ -927,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1506 = var3 << 8; // L: 631 + var10.field1493 = var3 << 8; // L: 631 return var4 >> 1; // L: 632 } - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILdm;)I" + descriptor = "([B[IIIIIIILdx;)I" ) - static int method2666(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2702(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 636 var7 >>= 8; // L: 637 var4 <<= 2; // L: 638 @@ -958,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 649 } - var8.field1506 = var2 << 8; // L: 651 + var8.field1493 = var2 << 8; // L: 651 return var3; // L: 652 } - @ObfuscatedName("ay") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILdm;)I" + descriptor = "(I[B[IIIIIIIILdx;)I" ) - static int method2789(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2703(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 656 var9 >>= 8; // L: 657 var5 <<= 2; // L: 658 @@ -1009,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1506 = var3 << 8; // L: 684 + var10.field1493 = var3 << 8; // L: 684 return var4 >> 1; // L: 685 } - @ObfuscatedName("aj") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIILdx;II)I" ) - static int method2668(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 method2790(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) { // L: 689 var7 = var8; } @@ -1042,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field1506 = var4; // L: 703 + var10.field1493 = var4; // L: 703 return var5; // L: 704 } - @ObfuscatedName("af") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIIILdx;II)I" ) - static int method2669(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 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) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 var8 = var9; } @@ -1084,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1506 = var4; // L: 729 + var11.field1493 = var4; // L: 729 return var5 >> 1; // L: 730 } - @ObfuscatedName("ak") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIILdx;II)I" ) - static int method2753(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 method2695(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) { // L: 734 var7 = var8; } @@ -1117,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 } - var10.field1506 = var4; // L: 748 + var10.field1493 = var4; // L: 748 return var5; // L: 749 } - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIIILdx;II)I" ) - static int method2734(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 method2707(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) { // L: 753 var8 = var9; } @@ -1157,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1506 = var4; // L: 773 + var11.field1493 = var4; // L: 773 return var5 >> 1; // L: 774 } - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILdm;)I" + descriptor = "([B[IIIIIIIILdx;)I" ) - static int method2672(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2747(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 778 var8 >>= 8; // L: 779 var4 <<= 2; // L: 780 @@ -1174,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1497 += var9.field1505 * (var6 - var3); // L: 783 - var9.field1498 += var9.field1500 * (var6 - var3); // L: 784 + var9.field1497 += var9.field1499 * (var6 - var3); // L: 783 + var9.field1498 += var9.field1505 * (var6 - var3); // L: 784 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 @@ -1197,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1493 = var4 >> 2; // L: 801 - var9.field1506 = var2 << 8; // L: 802 + var9.field1496 = var4 >> 2; // L: 801 + var9.field1493 = var2 << 8; // L: 802 return var3; // L: 803 } - @ObfuscatedName("bc") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILdm;)I" + descriptor = "(I[B[IIIIIIIIIILdx;)I" ) - static int method2637(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 method2709(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; // L: 807 var11 >>= 8; // L: 808 var5 <<= 2; // L: 809 @@ -1217,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1493 += var12.field1504 * (var9 - var4); // L: 814 + var12.field1496 += var12.field1492 * (var9 - var4); // L: 814 var4 <<= 1; // L: 815 var9 <<= 1; // L: 816 @@ -1264,15 +1276,15 @@ public class RawPcmStream extends PcmStream { var12.field1497 = var5 >> 2; // L: 848 var12.field1498 = var6 >> 2; // L: 849 - var12.field1506 = var3 << 8; // L: 850 + var12.field1493 = var3 << 8; // L: 850 return var4 >> 1; // L: 851 } - @ObfuscatedName("bz") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILdm;)I" + descriptor = "([B[IIIIIIIILdx;)I" ) - static int method2674(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2699(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 855 var8 >>= 8; // L: 856 var4 <<= 2; // L: 857 @@ -1281,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1497 += var9.field1505 * (var6 - var3); // L: 860 - var9.field1498 += var9.field1500 * (var6 - var3); // L: 861 + var9.field1497 += var9.field1499 * (var6 - var3); // L: 860 + var9.field1498 += var9.field1505 * (var6 - var3); // L: 861 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 @@ -1304,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1493 = var4 >> 2; // L: 878 - var9.field1506 = var2 << 8; // L: 879 + var9.field1496 = var4 >> 2; // L: 878 + var9.field1493 = var2 << 8; // L: 879 return var3; // L: 880 } - @ObfuscatedName("bj") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILdm;)I" + descriptor = "(I[B[IIIIIIIIIILdx;)I" ) - static int method2793(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 method2711(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; // L: 884 var11 >>= 8; // L: 885 var5 <<= 2; // L: 886 @@ -1324,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1493 += var12.field1504 * (var9 - var4); // L: 891 + var12.field1496 += var12.field1492 * (var9 - var4); // L: 891 var4 <<= 1; // L: 892 var9 <<= 1; // L: 893 @@ -1371,17 +1383,17 @@ public class RawPcmStream extends PcmStream { var12.field1497 = var5 >> 2; // L: 925 var12.field1498 = var6 >> 2; // L: 926 - var12.field1506 = var3 << 8; // L: 927 + var12.field1493 = var3 << 8; // L: 927 return var4 >> 1; // L: 928 } - @ObfuscatedName("bh") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIIILdx;II)I" ) - static int method2676(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.field1497 -= var11.field1505 * var5; // L: 932 - var11.field1498 -= var11.field1500 * var5; // L: 933 + static int method2712(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.field1497 -= var11.field1499 * var5; // L: 932 + var11.field1498 -= var11.field1505 * var5; // L: 933 if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } @@ -1408,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 947 } - var11.field1497 += var11.field1505 * var5; // L: 950 - var11.field1498 += var11.field1500 * var5; // L: 951 - var11.field1493 = var6; // L: 952 - var11.field1506 = var4; // L: 953 + var11.field1497 += var11.field1499 * var5; // L: 950 + var11.field1498 += var11.field1505 * var5; // L: 951 + var11.field1496 = var6; // L: 952 + var11.field1493 = var4; // L: 953 return var5; // L: 954 } - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIIIIILdx;II)I" ) - static int method2759(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.field1493 -= var5 * var13.field1504; // L: 958 + static int method2713(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.field1496 -= var5 * var13.field1492; // L: 958 if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } @@ -1459,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 984 - var13.field1493 += var13.field1504 * var5; // L: 985 + var13.field1496 += var13.field1492 * var5; // L: 985 var13.field1497 = var6; // L: 986 var13.field1498 = var7; // L: 987 - var13.field1506 = var4; // L: 988 + var13.field1493 = var4; // L: 988 return var5; // L: 989 } - @ObfuscatedName("bg") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIIILdx;II)I" ) - static int method2678(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.field1497 -= var11.field1505 * var5; // L: 993 - var11.field1498 -= var11.field1500 * var5; // L: 994 + static int method2772(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.field1497 -= var11.field1499 * var5; // L: 993 + var11.field1498 -= var11.field1505 * var5; // L: 994 if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } @@ -1499,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 1008 } - var11.field1497 += var11.field1505 * var5; // L: 1011 - var11.field1498 += var11.field1500 * var5; // L: 1012 - var11.field1493 = var6; // L: 1013 - var11.field1506 = var4; // L: 1014 + var11.field1497 += var11.field1499 * var5; // L: 1011 + var11.field1498 += var11.field1505 * var5; // L: 1012 + var11.field1496 = var6; // L: 1013 + var11.field1493 = var4; // L: 1014 return var5; // L: 1015 } - @ObfuscatedName("br") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILdm;II)I" + descriptor = "(II[B[IIIIIIIIIILdx;II)I" ) - static int method2679(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.field1493 -= var5 * var13.field1504; // L: 1019 + static int method2715(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.field1496 -= var5 * var13.field1492; // L: 1019 if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } @@ -1548,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 1044 - var13.field1493 += var13.field1504 * var5; // L: 1045 + var13.field1496 += var13.field1492 * var5; // L: 1045 var13.field1497 = var6; // L: 1046 var13.field1498 = var7; // L: 1047 - var13.field1506 = var4; // L: 1048 + var13.field1493 = var4; // L: 1048 return var5; // L: 1049 } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 77262f8c14..bcf0cd7773 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -1,18 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("do") +@Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("sampleRate") public int sampleRate; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("samples") public byte[] samples; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("start") public int start; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("end") int end; - @ObfuscatedName("i") - public boolean field1417; + @ObfuscatedName("z") + public boolean field1416; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; // L: 13 @@ -26,13 +33,14 @@ public class RawSound extends AbstractSound { this.samples = var2; // L: 21 this.start = var3; // L: 22 this.end = var4; // L: 23 - this.field1417 = var5; // L: 24 + this.field1416 = var5; // L: 24 } // L: 25 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ldf;)Lde;" + descriptor = "(Ldw;)Ldo;" ) + @Export("resample") public RawSound resample(Decimator var1) { this.samples = var1.resample(this.samples); // L: 28 this.sampleRate = var1.scaleRate(this.sampleRate); // L: 29 diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index bd294dfbd5..e3decaa088 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -1,77 +1,71 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dv") +@Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("aw") + @ObfuscatedName("rk") @ObfuscatedGetter( - intValue = 1592667411 + intValue = -556270823 ) static int field1364; - @ObfuscatedName("go") + @ObfuscatedName("fn") @ObfuscatedSignature( - descriptor = "[Lls;" + descriptor = "Lkq;" ) - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1209180911 - ) - int id; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -2142089503 - ) - int size; - @ObfuscatedName("s") - int[] operations; - @ObfuscatedName("t") - int[] creationErrors; - @ObfuscatedName("i") - Field[] fields; - @ObfuscatedName("o") + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("f") + @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("x") - Method[] methods; - @ObfuscatedName("w") + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -296860669 + ) + @Export("id") + int id; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 989914791 + ) + @Export("size") + int size; + @ObfuscatedName("m") + @Export("arguments") byte[][][] arguments; + @ObfuscatedName("z") + @Export("operations") + int[] operations; + @ObfuscatedName("q") + @Export("creationErrors") + int[] creationErrors; + @ObfuscatedName("k") + @Export("fields") + Field[] fields; + @ObfuscatedName("c") + @Export("methods") + Method[] methods; ReflectionCheck() { } // L: 17 - @ObfuscatedName("jn") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "947123708" + descriptor = "(IZZZS)Lid;", + garbageValue = "255" ) - static final void method2380() { - Client.field871 = Client.cycleCntr; // L: 10682 - class8.ClanChat_inClanChat = true; // L: 10683 - } // L: 10684 - - @ObfuscatedName("kp") - @ObfuscatedSignature( - descriptor = "(Lhq;I)Lhq;", - garbageValue = "-697509377" - ) - static Widget method2381(Widget var0) { - int var2 = WorldMapIcon_0.getWidgetFlags(var0); // L: 10718 - int var1 = var2 >> 17 & 7; // L: 10720 - int var3 = var1; // L: 10722 - if (var1 == 0) { // L: 10723 - return null; - } else { - for (int var4 = 0; var4 < var3; ++var4) { // L: 10724 - var0 = TileItem.getWidget(var0.parentId); // L: 10725 - if (var0 == null) { // L: 10726 - return null; - } - } - - return var0; // L: 10728 + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 2297 + if (JagexCache.JagexCache_dat2File != null) { // L: 2298 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); } + + return new Archive(var4, GrandExchangeOfferWorldComparator.masterDisk, var0, var1, var2, var3); // L: 2299 } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 9e7ac6227a..86bbc38b5b 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -1,90 +1,45 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gm") +@Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1047579843 + intValue = 963104289 ) + @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1846311175 + intValue = 1923677397 ) + @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1025962081 + intValue = 1292742065 ) + @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -881860999 + intValue = -1447501741 ) + @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { } // L: 9 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIILft;I)Z", - garbageValue = "-1274441547" + descriptor = "(IIILfh;I)Z", + garbageValue = "-1510519179" ) + @Export("hasArrived") protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;III)Lkr;", - garbageValue = "87805054" - ) - public static Font method3688(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - byte[] var5 = var0.takeFile(var2, var3); // L: 111 - boolean var4; - if (var5 == null) { // L: 112 - var4 = false; // L: 113 - } else { - Occluder.SpriteBuffer_decode(var5); // L: 116 - var4 = true; // L: 117 - } - - if (!var4) { // L: 119 - return null; - } else { - byte[] var6 = var1.takeFile(var2, var3); // L: 121 - Font var8; - if (var6 == null) { // L: 123 - var8 = null; // L: 124 - } else { - Font var7 = new Font(var6, Username.SpriteBuffer_xOffsets, class335.SpriteBuffer_yOffsets, class335.SpriteBuffer_spriteWidths, class335.SpriteBuffer_spriteHeights, TaskHandler.SpriteBuffer_spritePalette, class92.SpriteBuffer_pixels); // L: 127 - Username.SpriteBuffer_xOffsets = null; // L: 129 - class335.SpriteBuffer_yOffsets = null; // L: 130 - class335.SpriteBuffer_spriteWidths = null; // L: 131 - class335.SpriteBuffer_spriteHeights = null; // L: 132 - TaskHandler.SpriteBuffer_spritePalette = null; // L: 133 - class92.SpriteBuffer_pixels = null; // L: 134 - var8 = var7; // L: 136 - } - - return var8; // L: 138 - } - } - - @ObfuscatedName("fv") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1480468521" - ) - static final void playPcmPlayers() { - if (IntHashTable.pcmPlayer1 != null) { // L: 3254 - IntHashTable.pcmPlayer1.run(); - } - - if (WorldMapManager.pcmPlayer0 != null) { // L: 3255 - WorldMapManager.pcmPlayer0.run(); - } - - } // L: 3256 } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 5138049edc..0a861d9e59 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,15 +1,30 @@ import java.applet.Applet; +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; -@ObfuscatedName("me") +@ObfuscatedName("mp") +@Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("k") - public static String localPlayerName; - @ObfuscatedName("o") + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 303873541 + ) + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("c") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("z") + @Export("message") String message; - @ObfuscatedName("x") + @ObfuscatedName("q") + @Export("throwable") Throwable throwable; RunException(Throwable var1, String var2) { diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index f97d09a799..220ad8b799 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -1,139 +1,191 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("ef") +@Implements("Scene") public class Scene { - @ObfuscatedName("z") - public static boolean Scene_isLowDetail; - @ObfuscatedName("q") - static int tileUpdateCount; - @ObfuscatedName("c") - static int Scene_plane; @ObfuscatedName("f") - static int Scene_drawnCount; - @ObfuscatedName("y") - static int Scene_cameraXTileMin; - @ObfuscatedName("v") - static int Scene_cameraXTileMax; - @ObfuscatedName("j") - static int Scene_cameraYTileMin; - @ObfuscatedName("r") - static int Scene_cameraYTileMax; - @ObfuscatedName("u") - static int Scene_cameraXTile; + @Export("Scene_isLowDetail") + public static boolean Scene_isLowDetail; @ObfuscatedName("p") + @Export("tileUpdateCount") + static int tileUpdateCount; + @ObfuscatedName("r") + @Export("Scene_plane") + static int Scene_plane; + @ObfuscatedName("y") + @Export("Scene_drawnCount") + static int Scene_drawnCount; + @ObfuscatedName("s") + @Export("Scene_cameraXTileMin") + static int Scene_cameraXTileMin; + @ObfuscatedName("j") + @Export("Scene_cameraXTileMax") + static int Scene_cameraXTileMax; + @ObfuscatedName("w") + @Export("Scene_cameraYTileMin") + static int Scene_cameraYTileMin; + @ObfuscatedName("v") + @Export("Scene_cameraYTileMax") + static int Scene_cameraYTileMax; + @ObfuscatedName("d") + @Export("Scene_cameraXTile") + static int Scene_cameraXTile; + @ObfuscatedName("a") + @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("b") + @ObfuscatedName("g") + @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("l") + @ObfuscatedName("h") + @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("e") + @ObfuscatedName("i") + @Export("Scene_cameraZ") static int Scene_cameraZ; @ObfuscatedName("ab") + @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ag") + @ObfuscatedName("ac") + @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; @ObfuscatedName("ao") + @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ae") + @ObfuscatedName("af") + @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "[Lel;" + ) + @Export("gameObjects") + static GameObject[] gameObjects; + @ObfuscatedName("ar") + @Export("checkClick") + static boolean checkClick; + @ObfuscatedName("ay") + @Export("Scene_selectedPlane") + static int Scene_selectedPlane; + @ObfuscatedName("ah") + @Export("Scene_selectedScreenX") + static int Scene_selectedScreenX; + @ObfuscatedName("az") + @Export("Scene_selectedScreenY") + static int Scene_selectedScreenY; + @ObfuscatedName("ak") + @Export("Scene_selectedX") + public static int Scene_selectedX; + @ObfuscatedName("au") + @Export("Scene_selectedY") + public static int Scene_selectedY; + @ObfuscatedName("ai") + @Export("viewportWalking") + static boolean viewportWalking; + @ObfuscatedName("aq") + @Export("Scene_planesCount") + static int Scene_planesCount; + @ObfuscatedName("aw") + @Export("Scene_planeOccluderCounts") + static int[] Scene_planeOccluderCounts; @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "[[Led;" + ) + @Export("Scene_planeOccluders") + static Occluder[][] Scene_planeOccluders; + @ObfuscatedName("am") + @Export("Scene_currentOccludersCount") + static int Scene_currentOccludersCount; + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "[Led;" ) - static GameObject[] gameObjects; - @ObfuscatedName("am") - static boolean checkClick; - @ObfuscatedName("ap") - static int Scene_selectedPlane; - @ObfuscatedName("au") - static int Scene_selectedScreenX; - @ObfuscatedName("aa") - static int Scene_selectedScreenY; - @ObfuscatedName("ar") - public static int Scene_selectedX; - @ObfuscatedName("at") - public static int Scene_selectedY; - @ObfuscatedName("aq") - static boolean viewportWalking; - @ObfuscatedName("av") - static int Scene_planesCount; - @ObfuscatedName("ax") - static int[] Scene_planeOccluderCounts; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "[[Lew;" - ) - static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("az") - static int Scene_currentOccludersCount; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "[Lew;" - ) + @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ai") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lja;" ) + @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ay") + @ObfuscatedName("as") static final int[] field1874; @ObfuscatedName("aj") + static final int[] field1875; + @ObfuscatedName("ae") + static final int[] field1876; + @ObfuscatedName("al") static final int[] field1851; - @ObfuscatedName("aw") - static final int[] field1869; - @ObfuscatedName("af") - static final int[] field1881; - @ObfuscatedName("ak") - static final int[] field1882; - @ObfuscatedName("ac") - static final int[] field1883; - @ObfuscatedName("bl") - static final int[] field1884; - @ObfuscatedName("br") - static boolean[][][][] visibilityMap; - @ObfuscatedName("bp") - static boolean[][] visibleTiles; + @ObfuscatedName("ap") + static final int[] field1878; + @ObfuscatedName("ad") + static final int[] field1828; + @ObfuscatedName("bb") + static final int[] field1856; @ObfuscatedName("bn") - static int Scene_viewportXCenter; - @ObfuscatedName("bw") - static int Scene_viewportYCenter; + @Export("visibilityMap") + static boolean[][][][] visibilityMap; + @ObfuscatedName("bo") + @Export("visibleTiles") + static boolean[][] visibleTiles; @ObfuscatedName("be") - static int Scene_viewportXMin; - @ObfuscatedName("bu") - static int Scene_viewportYMin; + @Export("Scene_viewportXCenter") + static int Scene_viewportXCenter; @ObfuscatedName("ba") - static int Scene_viewportXMax; + @Export("Scene_viewportYCenter") + static int Scene_viewportYCenter; + @ObfuscatedName("bt") + @Export("Scene_viewportXMin") + static int Scene_viewportXMin; + @ObfuscatedName("bw") + @Export("Scene_viewportYMin") + static int Scene_viewportYMin; @ObfuscatedName("bm") + @Export("Scene_viewportXMax") + static int Scene_viewportXMax; + @ObfuscatedName("by") + @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("planes") int planes; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("xSize") int xSize; - @ObfuscatedName("t") - int ySize; - @ObfuscatedName("i") - int[][][] tileHeights; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "[[[Lek;" - ) - Tile[][][] tiles; - @ObfuscatedName("x") - int minPlane; - @ObfuscatedName("w") - int tempGameObjectsCount; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "[Led;" - ) - GameObject[] tempGameObjects; @ObfuscatedName("m") - int[][][] field1841; - @ObfuscatedName("bi") + @Export("ySize") + int ySize; + @ObfuscatedName("z") + @Export("tileHeights") + int[][][] tileHeights; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "[[[Leo;" + ) + @Export("tiles") + Tile[][][] tiles; + @ObfuscatedName("k") + @Export("minPlane") + int minPlane; + @ObfuscatedName("c") + @Export("tempGameObjectsCount") + int tempGameObjectsCount; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "[Lel;" + ) + @Export("tempGameObjects") + GameObject[] tempGameObjects; + @ObfuscatedName("t") + int[][][] field1837; + @ObfuscatedName("bj") + @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bg") + @ObfuscatedName("bl") + @Export("tileRotation2D") int[][] tileRotation2D; static { @@ -155,12 +207,12 @@ public class Scene { Scene_currentOccluders = new Occluder[500]; // L: 52 Scene_tilesDeque = new NodeDeque(); // L: 53 field1874 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field1851 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field1869 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field1881 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field1882 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field1883 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field1884 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + field1875 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field1876 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field1851 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field1878 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field1828 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field1856 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 visibilityMap = new boolean[8][32][51][51]; // L: 86 } @@ -174,12 +226,13 @@ public class Scene { this.xSize = var2; // L: 97 this.ySize = var3; // L: 98 this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field1841 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.field1837 = new int[var1][var2 + 1][var3 + 1]; // L: 100 this.tileHeights = var4; // L: 101 this.clear(); // L: 102 } // L: 103 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("clear") public void clear() { int var1; int var2; @@ -211,7 +264,8 @@ public class Scene { } // L: 120 - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -225,7 +279,8 @@ public class Scene { } // L: 129 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -236,45 +291,59 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 GameObject var7 = var5.gameObjects[var6]; // L: 138 - if (Tiles.method1191(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 + long var9 = var7.tag; // L: 140 + boolean var8 = KeyHandler.Entity_unpackSceneX(var9) == 2; // L: 142 + if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 144 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 143 + if (this.tiles[0][var1][var2] == null) { // L: 148 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144 - this.tiles[3][var1][var2] = null; // L: 145 - } // L: 146 + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 149 + this.tiles[3][var1][var2] = null; // L: 150 + } // L: 151 - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 165 - if (var5 != null) { // L: 166 - this.tiles[var1][var2][var3].minPlane = var4; // L: 167 + Tile var5 = this.tiles[var1][var2][var3]; // L: 170 + if (var5 != null) { // L: 171 + this.tiles[var1][var2][var3].minPlane = var4; // L: 172 } - } // L: 168 + } // L: 173 - @ObfuscatedName("o") + @ObfuscatedName("q") + @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; int var22; - if (var4 == 0) { // L: 171 - var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172 + if (var4 == 0) { // L: 176 + var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false); // L: 177 - for (var22 = var1; var22 >= 0; --var22) { // L: 173 + for (var22 = var1; var22 >= 0; --var22) { // L: 178 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 174 - } else if (var4 != 1) { // L: 177 - TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183 + this.tiles[var1][var2][var3].paint = var21; // L: 179 + } else if (var4 != 1) { // L: 182 + TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 188 + + for (var22 = var1; var22 >= 0; --var22) { // L: 189 + if (this.tiles[var22][var2][var3] == null) { + this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); + } + } + + this.tiles[var1][var2][var3].model = var23; // L: 190 + } else { + var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 183 for (var22 = var1; var22 >= 0; --var22) { // L: 184 if (this.tiles[var22][var2][var3] == null) { @@ -282,600 +351,614 @@ public class Scene { } } - this.tiles[var1][var2][var3].model = var23; // L: 185 - } else { - var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178 - - for (var22 = var1; var22 >= 0; --var22) { // L: 179 - if (this.tiles[var22][var2][var3] == null) { - this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); - } - } - - this.tiles[var1][var2][var3].paint = var21; // L: 180 + this.tiles[var1][var2][var3].paint = var21; // L: 185 } - } // L: 175 181 186 + } // L: 180 186 191 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIILez;JI)V" + descriptor = "(IIIILej;JI)V" ) + @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { - if (var5 != null) { // L: 189 - FloorDecoration var9 = new FloorDecoration(); // L: 190 - var9.entity = var5; // L: 191 - var9.x = var2 * 128 + 64; // L: 192 - var9.y = var3 * 128 + 64; // L: 193 - var9.tileHeight = var4; // L: 194 - var9.tag = var6; // L: 195 - var9.flags = var8; // L: 196 - if (this.tiles[var1][var2][var3] == null) { // L: 197 + if (var5 != null) { // L: 194 + FloorDecoration var9 = new FloorDecoration(); // L: 195 + var9.entity = var5; // L: 196 + var9.x = var2 * 128 + 64; // L: 197 + var9.y = var3 * 128 + 64; // L: 198 + var9.tileHeight = var4; // L: 199 + var9.tag = var6; // L: 200 + var9.flags = var8; // L: 201 + if (this.tiles[var1][var2][var3] == null) { // L: 202 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198 + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 203 } - } // L: 199 + } // L: 204 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIILez;JLez;Lez;)V" + descriptor = "(IIIILej;JLej;Lej;)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(); // L: 202 - var10.first = var5; // L: 203 - var10.x = var2 * 128 + 64; // L: 204 - var10.y = var3 * 128 + 64; // L: 205 - var10.tileHeight = var4; // L: 206 - var10.tag = var6; // L: 207 - var10.second = var8; // L: 208 - var10.third = var9; // L: 209 - int var11 = 0; // L: 210 - Tile var12 = this.tiles[var1][var2][var3]; // L: 211 - if (var12 != null) { // L: 212 - for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213 - if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { // L: 214 - Model var14 = (Model)var12.gameObjects[var13].entity; // L: 215 - var14.calculateBoundsCylinder(); // L: 216 - if (var14.height > var11) { // L: 217 + TileItemPile var10 = new TileItemPile(); // L: 207 + var10.first = var5; // L: 208 + var10.x = var2 * 128 + 64; // L: 209 + var10.y = var3 * 128 + 64; // L: 210 + var10.tileHeight = var4; // L: 211 + var10.tag = var6; // L: 212 + var10.second = var8; // L: 213 + var10.third = var9; // L: 214 + int var11 = 0; // L: 215 + Tile var12 = this.tiles[var1][var2][var3]; // L: 216 + if (var12 != null) { // L: 217 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 218 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { // L: 219 + Model var14 = (Model)var12.gameObjects[var13].entity; // L: 220 + var14.calculateBoundsCylinder(); // L: 221 + if (var14.height > var11) { // L: 222 var11 = var14.height; } } } } - var10.height = var11; // L: 221 + var10.height = var11; // L: 226 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 227 } - this.tiles[var1][var2][var3].tileItemPile = var10; // L: 223 - } // L: 224 + this.tiles[var1][var2][var3].tileItemPile = var10; // L: 228 + } // L: 229 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIILez;Lez;IIJI)V" + descriptor = "(IIIILej;Lej;IIJI)V" ) + @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { // L: 227 - BoundaryObject var12 = new BoundaryObject(); // L: 228 - var12.tag = var9; // L: 229 - var12.flags = var11; // L: 230 - var12.x = var2 * 128 + 64; // L: 231 - var12.y = var3 * 128 + 64; // L: 232 - var12.tileHeight = var4; // L: 233 - var12.entity1 = var5; // L: 234 - var12.entity2 = var6; // L: 235 - var12.orientationA = var7; // L: 236 - var12.orientationB = var8; // L: 237 + if (var5 != null || var6 != null) { // L: 232 + BoundaryObject var12 = new BoundaryObject(); // L: 233 + var12.tag = var9; // L: 234 + var12.flags = var11; // L: 235 + var12.x = var2 * 128 + 64; // L: 236 + var12.y = var3 * 128 + 64; // L: 237 + var12.tileHeight = var4; // L: 238 + var12.entity1 = var5; // L: 239 + var12.entity2 = var6; // L: 240 + var12.orientationA = var7; // L: 241 + var12.orientationB = var8; // L: 242 for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238 + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 243 } } - this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239 + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 244 } - } // L: 240 + } // L: 245 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIILez;Lez;IIIIJI)V" + descriptor = "(IIIILej;Lej;IIIIJI)V" ) + @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { // L: 243 - WallDecoration var14 = new WallDecoration(); // L: 244 - var14.tag = var11; // L: 245 - var14.flags = var13; // L: 246 - var14.x = var2 * 128 + 64; // L: 247 - var14.y = var3 * 128 + 64; // L: 248 - var14.tileHeight = var4; // L: 249 - var14.entity1 = var5; // L: 250 - var14.entity2 = var6; // L: 251 - var14.orientation = var7; // L: 252 - var14.orientation2 = var8; // L: 253 - var14.xOffset = var9; // L: 254 - var14.yOffset = var10; // L: 255 + if (var5 != null) { // L: 248 + WallDecoration var14 = new WallDecoration(); // L: 249 + var14.tag = var11; // L: 250 + var14.flags = var13; // L: 251 + var14.x = var2 * 128 + 64; // L: 252 + var14.y = var3 * 128 + 64; // L: 253 + var14.tileHeight = var4; // L: 254 + var14.entity1 = var5; // L: 255 + var14.entity2 = var6; // L: 256 + var14.orientation = var7; // L: 257 + var14.orientation2 = var8; // L: 258 + var14.xOffset = var9; // L: 259 + var14.yOffset = var10; // L: 260 for (int var15 = var1; var15 >= 0; --var15) { if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256 + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 261 } } - this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257 + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 262 } - } // L: 258 + } // L: 263 - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIIIILez;IJI)Z" + descriptor = "(IIIIIILej;IJI)Z" ) - public boolean method3263(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { - if (var7 == null) { // L: 261 + public boolean method3227(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 266 return true; } else { - int var12 = var5 * 64 + var2 * 128; // L: 262 - int var13 = var6 * 64 + var3 * 128; // L: 263 - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264 + int var12 = var5 * 64 + var2 * 128; // L: 267 + int var13 = var6 * 64 + var3 * 128; // L: 268 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 269 } } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIILez;IJZ)Z" + descriptor = "(IIIIILej;IJZ)Z" ) + @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { - if (var6 == null) { // L: 268 + if (var6 == null) { // L: 273 return true; } else { - int var11 = var2 - var5; // L: 269 - int var12 = var3 - var5; // L: 270 - int var13 = var5 + var2; // L: 271 - int var14 = var3 + var5; // L: 272 - if (var10) { // L: 273 - if (var7 > 640 && var7 < 1408) { // L: 274 + int var11 = var2 - var5; // L: 274 + int var12 = var3 - var5; // L: 275 + int var13 = var5 + var2; // L: 276 + int var14 = var3 + var5; // L: 277 + if (var10) { // L: 278 + if (var7 > 640 && var7 < 1408) { // L: 279 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 275 + if (var7 > 1152 && var7 < 1920) { // L: 280 var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 276 + if (var7 > 1664 || var7 < 384) { // L: 281 var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 277 + if (var7 > 128 && var7 < 896) { // L: 282 var11 -= 128; } } - var11 /= 128; // L: 279 - var12 /= 128; // L: 280 - var13 /= 128; // L: 281 - var14 /= 128; // L: 282 - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283 + var11 /= 128; // L: 284 + var12 /= 128; // L: 285 + var13 /= 128; // L: 286 + var14 /= 128; // L: 287 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 288 } } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIIILez;IJIIII)Z" + descriptor = "(IIIIILej;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); // L: 287 288 + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292 293 } - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIIIIIILez;IZJI)Z" + descriptor = "(IIIIIIIILej;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) { int var16; - for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292 - for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293 - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294 + for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 297 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 298 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 299 return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 295 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296 + Tile var23 = this.tiles[var1][var15][var16]; // L: 300 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 301 return false; } } } - GameObject var21 = new GameObject(); // L: 299 - var21.tag = var12; // L: 300 - var21.flags = var14; // L: 301 - var21.plane = var1; // L: 302 - var21.centerX = var6; // L: 303 - var21.centerY = var7; // L: 304 - var21.height = var8; // L: 305 - var21.entity = var9; // L: 306 - var21.orientation = var10; // L: 307 - var21.startX = var2; // L: 308 - var21.startY = var3; // L: 309 - var21.endX = var2 + var4 - 1; // L: 310 - var21.endY = var3 + var5 - 1; // L: 311 + GameObject var21 = new GameObject(); // L: 304 + var21.tag = var12; // L: 305 + var21.flags = var14; // L: 306 + var21.plane = var1; // L: 307 + var21.centerX = var6; // L: 308 + var21.centerY = var7; // L: 309 + var21.height = var8; // L: 310 + var21.entity = var9; // L: 311 + var21.orientation = var10; // L: 312 + var21.startX = var2; // L: 313 + var21.startY = var3; // L: 314 + var21.endX = var2 + var4 - 1; // L: 315 + var21.endY = var3 + var5 - 1; // L: 316 - for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312 - for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313 - int var18 = 0; // L: 314 - if (var16 > var2) { // L: 315 + for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 317 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 318 + int var18 = 0; // L: 319 + if (var16 > var2) { // L: 320 ++var18; } - if (var16 < var2 + var4 - 1) { // L: 316 + if (var16 < var2 + var4 - 1) { // L: 321 var18 += 4; } - if (var17 > var3) { // L: 317 + if (var17 > var3) { // L: 322 var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 318 + if (var17 < var3 + var5 - 1) { // L: 323 var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 324 } } - Tile var22 = this.tiles[var1][var16][var17]; // L: 320 - var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321 - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322 - var22.gameObjectsEdgeMask |= var18; // L: 324 - ++var22.gameObjectsCount; // L: 325 + Tile var22 = this.tiles[var1][var16][var17]; // L: 325 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 326 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 327 + var22.gameObjectsEdgeMask |= var18; // L: 329 + ++var22.gameObjectsCount; // L: 330 } } - if (var11) { // L: 328 + if (var11) { // L: 333 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 329 + return true; // L: 334 } - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 - GameObject var2 = this.tempGameObjects[var1]; // L: 334 - this.removeGameObject(var2); // L: 335 - this.tempGameObjects[var1] = null; // L: 336 + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 338 + GameObject var2 = this.tempGameObjects[var1]; // L: 339 + this.removeGameObject(var2); // L: 340 + this.tempGameObjects[var1] = null; // L: 341 } - this.tempGameObjectsCount = 0; // L: 338 - } // L: 339 + this.tempGameObjectsCount = 0; // L: 343 + } // L: 344 - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Led;)V" + descriptor = "(Lel;)V" ) + @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342 - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343 - Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344 - if (var4 != null) { // L: 345 + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 347 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 348 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 349 + if (var4 != null) { // L: 350 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346 - if (var4.gameObjects[var5] == var1) { // L: 347 - --var4.gameObjectsCount; // L: 348 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 351 + if (var4.gameObjects[var5] == var1) { // L: 352 + --var4.gameObjectsCount; // L: 353 - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349 - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350 - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351 + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 354 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 355 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 356 } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 353 + var4.gameObjects[var4.gameObjectsCount] = null; // L: 358 break; } } - var4.gameObjectsEdgeMask = 0; // L: 357 + var4.gameObjectsEdgeMask = 0; // L: 362 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 363 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 365 } } } } - } // L: 365 + } // L: 370 - @ObfuscatedName("j") - public void method3204(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 368 - if (var5 != null) { // L: 369 - WallDecoration var6 = var5.wallDecoration; // L: 370 - if (var6 != null) { // L: 371 - var6.xOffset = var4 * var6.xOffset / 16; // L: 372 - var6.yOffset = var4 * var6.yOffset / 16; // L: 373 + @ObfuscatedName("y") + public void method3233(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 373 + if (var5 != null) { // L: 374 + WallDecoration var6 = var5.wallDecoration; // L: 375 + if (var6 != null) { // L: 376 + var6.xOffset = var4 * var6.xOffset / 16; // L: 377 + var6.yOffset = var4 * var6.yOffset / 16; // L: 378 } } - } // L: 374 + } // L: 379 - @ObfuscatedName("r") + @ObfuscatedName("s") + @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 377 + Tile var4 = this.tiles[var1][var2][var3]; // L: 382 if (var4 != null) { - var4.boundaryObject = null; // L: 379 + var4.boundaryObject = null; // L: 384 } - } // L: 378 380 + } // L: 383 385 - @ObfuscatedName("u") + @ObfuscatedName("j") + @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 383 + Tile var4 = this.tiles[var1][var2][var3]; // L: 388 if (var4 != null) { - var4.wallDecoration = null; // L: 385 + var4.wallDecoration = null; // L: 390 } - } // L: 384 386 + } // L: 389 391 - @ObfuscatedName("p") + @ObfuscatedName("d") + @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 389 - if (var4 != null) { // L: 390 - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391 - GameObject var6 = var4.gameObjects[var5]; // L: 392 - if (Tiles.method1191(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 - this.removeGameObject(var6); // L: 394 - return; // L: 395 + Tile var4 = this.tiles[var1][var2][var3]; // L: 394 + if (var4 != null) { // L: 395 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 396 + GameObject var6 = var4.gameObjects[var5]; // L: 397 + long var8 = var6.tag; // L: 399 + boolean var7 = KeyHandler.Entity_unpackSceneX(var8) == 2; // L: 401 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 403 + this.removeGameObject(var6); // L: 404 + return; // L: 405 } } } - } // L: 398 + } // L: 408 - @ObfuscatedName("b") + @ObfuscatedName("a") + @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 401 + Tile var4 = this.tiles[var1][var2][var3]; // L: 411 if (var4 != null) { - var4.floorDecoration = null; // L: 403 + var4.floorDecoration = null; // L: 413 } - } // L: 402 404 + } // L: 412 414 - @ObfuscatedName("l") + @ObfuscatedName("g") + @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 407 + Tile var4 = this.tiles[var1][var2][var3]; // L: 417 if (var4 != null) { - var4.tileItemPile = null; // L: 409 + var4.tileItemPile = null; // L: 419 } - } // L: 408 410 + } // L: 418 420 - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)Leb;" + descriptor = "(III)Lem;" ) - public BoundaryObject method3276(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 413 - return var4 == null ? null : var4.boundaryObject; // L: 414 415 + public BoundaryObject method3277(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 423 + return var4 == null ? null : var4.boundaryObject; // L: 424 425 } @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)Lex;" + descriptor = "(III)Ley;" ) - public WallDecoration method3211(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 419 - return var4 == null ? null : var4.wallDecoration; // L: 420 421 + public WallDecoration method3276(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 429 + return var4 == null ? null : var4.wallDecoration; // L: 430 431 } - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(III)Led;" + descriptor = "(III)Lel;" ) - public GameObject method3197(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 425 - if (var4 == null) { // L: 426 + public GameObject method3241(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 435 + if (var4 == null) { // L: 436 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 - GameObject var6 = var4.gameObjects[var5]; // L: 428 - if (Tiles.method1191(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 437 + GameObject var6 = var4.gameObjects[var5]; // L: 438 + if (class1.method8(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 439 return var6; } } - return null; // L: 431 + return null; // L: 441 } } @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(III)Leu;" + descriptor = "(III)Lek;" ) + @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 435 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 + Tile var4 = this.tiles[var1][var2][var3]; // L: 445 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 446 447 } - @ObfuscatedName("ae") + @ObfuscatedName("af") + @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 441 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 + Tile var4 = this.tiles[var1][var2][var3]; // L: 451 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 452 453 } - @ObfuscatedName("ap") + @ObfuscatedName("av") + @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 447 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 + Tile var4 = this.tiles[var1][var2][var3]; // L: 457 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 458 459 } - @ObfuscatedName("au") + @ObfuscatedName("ar") + @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 453 - if (var4 == null) { // L: 454 + Tile var4 = this.tiles[var1][var2][var3]; // L: 463 + if (var4 == null) { // L: 464 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 - GameObject var6 = var4.gameObjects[var5]; // L: 456 - if (Tiles.method1191(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 465 + GameObject var6 = var4.gameObjects[var5]; // L: 466 + long var8 = var6.tag; // L: 468 + boolean var7 = KeyHandler.Entity_unpackSceneX(var8) == 2; // L: 470 + if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 472 return var6.tag; } } - return 0L; // L: 459 + return 0L; // L: 474 } } - @ObfuscatedName("aa") + @ObfuscatedName("ay") + @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 463 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 + Tile var4 = this.tiles[var1][var2][var3]; // L: 478 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 479 480 } - @ObfuscatedName("ar") + @ObfuscatedName("ah") + @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 469 - if (var6 == null) { // L: 470 + Tile var6 = this.tiles[var1][var2][var3]; // L: 484 + if (var6 == null) { // L: 485 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 486 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 487 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 488 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474 - if (var6.gameObjects[var7].tag == var4) { // L: 475 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 489 + if (var6.gameObjects[var7].tag == var4) { // L: 490 return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 477 + return -1; // L: 492 } } - @ObfuscatedName("at") - public void method3219(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481 - for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482 - for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483 - Tile var7 = this.tiles[var4][var5][var6]; // L: 484 - if (var7 != null) { // L: 485 - BoundaryObject var8 = var7.boundaryObject; // L: 486 + @ObfuscatedName("az") + public void method3248(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 496 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 497 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 498 + Tile var7 = this.tiles[var4][var5][var6]; // L: 499 + if (var7 != null) { // L: 500 + BoundaryObject var8 = var7.boundaryObject; // L: 501 ModelData var10; - if (var8 != null && var8.entity1 instanceof ModelData) { // L: 487 - ModelData var9 = (ModelData)var8.entity1; // L: 488 - this.method3221(var9, var4, var5, var6, 1, 1); // L: 489 - if (var8.entity2 instanceof ModelData) { // L: 490 - var10 = (ModelData)var8.entity2; // L: 491 - this.method3221(var10, var4, var5, var6, 1, 1); // L: 492 - ModelData.method2935(var9, var10, 0, 0, 0, false); // L: 493 - var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 + if (var8 != null && var8.entity1 instanceof ModelData) { // L: 502 + ModelData var9 = (ModelData)var8.entity1; // L: 503 + this.method3250(var9, var4, var5, var6, 1, 1); // L: 504 + if (var8.entity2 instanceof ModelData) { // L: 505 + var10 = (ModelData)var8.entity2; // L: 506 + this.method3250(var10, var4, var5, var6, 1, 1); // L: 507 + ModelData.method2929(var9, var10, 0, 0, 0, false); // L: 508 + var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 509 } - var8.entity1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496 + var8.entity1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 511 } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498 - GameObject var14 = var7.gameObjects[var12]; // L: 499 - if (var14 != null && var14.entity instanceof ModelData) { // L: 500 - ModelData var11 = (ModelData)var14.entity; // L: 501 - this.method3221(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502 - var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 513 + GameObject var14 = var7.gameObjects[var12]; // L: 514 + if (var14 != null && var14.entity instanceof ModelData) { // L: 515 + ModelData var11 = (ModelData)var14.entity; // L: 516 + this.method3250(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 517 + var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 518 } } - FloorDecoration var13 = var7.floorDecoration; // L: 506 - if (var13 != null && var13.entity instanceof ModelData) { // L: 507 - var10 = (ModelData)var13.entity; // L: 508 - this.method3220(var10, var4, var5, var6); // L: 509 - var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 + FloorDecoration var13 = var7.floorDecoration; // L: 521 + if (var13 != null && var13.entity instanceof ModelData) { // L: 522 + var10 = (ModelData)var13.entity; // L: 523 + this.method3249(var10, var4, var5, var6); // L: 524 + var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 525 } } } } } - } // L: 516 + } // L: 531 - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lee;III)V" + descriptor = "(Len;III)V" ) - void method3220(ModelData var1, int var2, int var3, int var4) { + void method3249(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { // L: 519 - var5 = this.tiles[var2][var3 + 1][var4]; // L: 520 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 521 - var6 = (ModelData)var5.floorDecoration.entity; // L: 522 - ModelData.method2935(var1, var6, 128, 0, 0, true); // L: 523 + if (var3 < this.xSize) { // L: 534 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 535 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 536 + var6 = (ModelData)var5.floorDecoration.entity; // L: 537 + ModelData.method2929(var1, var6, 128, 0, 0, true); // L: 538 } } - if (var4 < this.xSize) { // L: 526 - var5 = this.tiles[var2][var3][var4 + 1]; // L: 527 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 528 - var6 = (ModelData)var5.floorDecoration.entity; // L: 529 - ModelData.method2935(var1, var6, 0, 0, 128, true); // L: 530 + if (var4 < this.xSize) { // L: 541 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 542 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 543 + var6 = (ModelData)var5.floorDecoration.entity; // L: 544 + ModelData.method2929(var1, var6, 0, 0, 128, true); // L: 545 } } - if (var3 < this.xSize && var4 < this.ySize) { // L: 533 - var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 535 - var6 = (ModelData)var5.floorDecoration.entity; // L: 536 - ModelData.method2935(var1, var6, 128, 0, 128, true); // L: 537 + if (var3 < this.xSize && var4 < this.ySize) { // L: 548 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 549 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 550 + var6 = (ModelData)var5.floorDecoration.entity; // L: 551 + ModelData.method2929(var1, var6, 128, 0, 128, true); // L: 552 } } - if (var3 < this.xSize && var4 > 0) { // L: 540 - var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 542 - var6 = (ModelData)var5.floorDecoration.entity; // L: 543 - ModelData.method2935(var1, var6, 128, 0, -128, true); // L: 544 + if (var3 < this.xSize && var4 > 0) { // L: 555 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 556 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 557 + var6 = (ModelData)var5.floorDecoration.entity; // L: 558 + ModelData.method2929(var1, var6, 128, 0, -128, true); // L: 559 } } - } // L: 547 + } // L: 562 - @ObfuscatedName("al") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lee;IIIII)V" + descriptor = "(Len;IIIII)V" ) - void method3221(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 550 - int var8 = var3; // L: 551 - int var9 = var3 + var5; // L: 552 - int var10 = var4 - 1; // L: 553 - int var11 = var4 + var6; // L: 554 + void method3250(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 565 + int var8 = var3; // L: 566 + int var9 = var3 + var5; // L: 567 + int var10 = var4 - 1; // L: 568 + int var11 = var4 + var6; // L: 569 - for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555 - if (var12 != this.planes) { // L: 556 - for (int var13 = var8; var13 <= var9; ++var13) { // L: 557 - if (var13 >= 0 && var13 < this.xSize) { // L: 558 - for (int var14 = var10; var14 <= var11; ++var14) { // L: 559 - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561 - Tile var15 = this.tiles[var12][var13][var14]; // L: 562 - if (var15 != null) { // L: 563 - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564 - BoundaryObject var17 = var15.boundaryObject; // L: 565 - if (var17 != null) { // L: 566 + for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 570 + if (var12 != this.planes) { // L: 571 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 572 + if (var13 >= 0 && var13 < this.xSize) { // L: 573 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 574 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 575 576 + Tile var15 = this.tiles[var12][var13][var14]; // L: 577 + if (var15 != null) { // L: 578 + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 579 + BoundaryObject var17 = var15.boundaryObject; // L: 580 + if (var17 != null) { // L: 581 ModelData var18; - if (var17.entity1 instanceof ModelData) { // L: 567 - var18 = (ModelData)var17.entity1; // L: 568 - ModelData.method2935(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 + if (var17.entity1 instanceof ModelData) { // L: 582 + var18 = (ModelData)var17.entity1; // L: 583 + ModelData.method2929(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 584 } - if (var17.entity2 instanceof ModelData) { // L: 571 - var18 = (ModelData)var17.entity2; // L: 572 - ModelData.method2935(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 + if (var17.entity2 instanceof ModelData) { // L: 586 + var18 = (ModelData)var17.entity2; // L: 587 + ModelData.method2929(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 588 } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576 - GameObject var19 = var15.gameObjects[var23]; // L: 577 - if (var19 != null && var19.entity instanceof ModelData) { // L: 578 - ModelData var20 = (ModelData)var19.entity; // L: 579 - int var21 = var19.endX - var19.startX + 1; // L: 580 - int var22 = var19.endY - var19.startY + 1; // L: 581 - ModelData.method2935(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 591 + GameObject var19 = var15.gameObjects[var23]; // L: 592 + if (var19 != null && var19.entity instanceof ModelData) { // L: 593 + ModelData var20 = (ModelData)var19.entity; // L: 594 + int var21 = var19.endX - var19.startX + 1; // L: 595 + int var22 = var19.endY - var19.startY + 1; // L: 596 + ModelData.method2929(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 597 } } } @@ -884,175 +967,179 @@ public class Scene { } } - --var8; // L: 587 - var7 = false; // L: 588 + --var8; // L: 602 + var7 = false; // L: 603 } } - } // L: 590 + } // L: 605 - @ObfuscatedName("ah") + @ObfuscatedName("ai") + @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; // L: 593 - if (var7 != null) { // L: 594 - TilePaint var8 = var7.paint; // L: 595 + Tile var7 = this.tiles[var4][var5][var6]; // L: 608 + if (var7 != null) { // L: 609 + TilePaint var8 = var7.paint; // L: 610 int var10; - if (var8 != null) { // L: 596 - int var18 = var8.rgb; // L: 597 - if (var18 != 0) { // L: 598 - for (var10 = 0; var10 < 4; ++var10) { // L: 599 - var1[var2] = var18; // L: 600 - var1[var2 + 1] = var18; // L: 601 - var1[var2 + 2] = var18; // L: 602 - var1[var2 + 3] = var18; // L: 603 - var2 += var3; // L: 604 + if (var8 != null) { // L: 611 + int var18 = var8.rgb; // L: 612 + if (var18 != 0) { // L: 613 + for (var10 = 0; var10 < 4; ++var10) { // L: 614 + var1[var2] = var18; // L: 615 + var1[var2 + 1] = var18; // L: 616 + var1[var2 + 2] = var18; // L: 617 + var1[var2 + 3] = var18; // L: 618 + var2 += var3; // L: 619 } } } else { - TileModel var9 = var7.model; // L: 608 - if (var9 != null) { // L: 609 - var10 = var9.shape; // L: 610 - int var11 = var9.rotation; // L: 611 - int var12 = var9.underlayRgb; // L: 612 - int var13 = var9.overlayRgb; // L: 613 - int[] var14 = this.tileShape2D[var10]; // L: 614 - int[] var15 = this.tileRotation2D[var11]; // L: 615 - int var16 = 0; // L: 616 + TileModel var9 = var7.model; // L: 623 + if (var9 != null) { // L: 624 + var10 = var9.shape; // L: 625 + int var11 = var9.rotation; // L: 626 + int var12 = var9.underlayRgb; // L: 627 + int var13 = var9.overlayRgb; // L: 628 + int[] var14 = this.tileShape2D[var10]; // L: 629 + int[] var15 = this.tileRotation2D[var11]; // L: 630 + int var16 = 0; // L: 631 int var17; - if (var12 != 0) { // L: 617 - for (var17 = 0; var17 < 4; ++var17) { // L: 618 - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619 - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620 - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621 - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622 - var2 += var3; // L: 623 + if (var12 != 0) { // L: 632 + for (var17 = 0; var17 < 4; ++var17) { // L: 633 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 634 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 635 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 636 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 637 + var2 += var3; // L: 638 } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 627 - if (var14[var15[var16++]] != 0) { // L: 628 + for (var17 = 0; var17 < 4; ++var17) { // L: 642 + if (var14[var15[var16++]] != 0) { // L: 643 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 629 + if (var14[var15[var16++]] != 0) { // L: 644 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 630 + if (var14[var15[var16++]] != 0) { // L: 645 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 631 + if (var14[var15[var16++]] != 0) { // L: 646 var1[var2 + 3] = var13; } - var2 += var3; // L: 632 + var2 += var3; // L: 647 } } } } } - } // L: 606 635 + } // L: 621 650 - @ObfuscatedName("as") + @ObfuscatedName("aq") + @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { // L: 714 - checkClick = true; // L: 715 - viewportWalking = var4; // L: 716 - Scene_selectedPlane = var1; // L: 717 - Scene_selectedScreenX = var2; // L: 718 - Scene_selectedScreenY = var3; // L: 719 - Scene_selectedX = -1; // L: 720 - Scene_selectedY = -1; // L: 721 + if (!shouldSendWalk() || var4) { // L: 729 + checkClick = true; // L: 730 + viewportWalking = var4; // L: 731 + Scene_selectedPlane = var1; // L: 732 + Scene_selectedScreenX = var2; // L: 733 + Scene_selectedScreenY = var3; // L: 734 + Scene_selectedX = -1; // L: 735 + Scene_selectedY = -1; // L: 736 } - } // L: 722 + } // L: 737 - @ObfuscatedName("az") + @ObfuscatedName("aw") + @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 725 - } // L: 726 + viewportWalking = true; // L: 740 + } // L: 741 - @ObfuscatedName("ay") + @ObfuscatedName("aa") + @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 738 + if (var1 < 0) { // L: 753 var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 739 + } else if (var1 >= this.xSize * 128) { // L: 754 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 740 + if (var3 < 0) { // L: 755 var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 741 + } else if (var3 >= this.ySize * 128) { // L: 756 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 742 + if (var4 < 128) { // L: 757 var4 = 128; - } else if (var4 > 383) { // L: 743 + } else if (var4 > 383) { // L: 758 var4 = 383; } - ++Scene_drawnCount; // L: 744 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748 - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749 - Scene_cameraX = var1; // L: 750 - Scene_cameraY = var2; // L: 751 - Scene_cameraZ = var3; // L: 752 - Scene_cameraXTile = var1 / 128; // L: 753 - Scene_cameraYTile = var3 / 128; // L: 754 - Scene_plane = var6; // L: 755 - Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756 - if (Scene_cameraXTileMin < 0) { // L: 757 + ++Scene_drawnCount; // L: 759 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 760 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 761 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 762 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 763 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 764 + Scene_cameraX = var1; // L: 765 + Scene_cameraY = var2; // L: 766 + Scene_cameraZ = var3; // L: 767 + Scene_cameraXTile = var1 / 128; // L: 768 + Scene_cameraYTile = var3 / 128; // L: 769 + Scene_plane = var6; // L: 770 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 771 + if (Scene_cameraXTileMin < 0) { // L: 772 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758 - if (Scene_cameraYTileMin < 0) { // L: 759 + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 773 + if (Scene_cameraYTileMin < 0) { // L: 774 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760 - if (Scene_cameraXTileMax > this.xSize) { // L: 761 + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 775 + if (Scene_cameraXTileMax > this.xSize) { // L: 776 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762 - if (Scene_cameraYTileMax > this.ySize) { // L: 763 + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 777 + if (Scene_cameraYTileMax > this.ySize) { // L: 778 Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 764 - tileUpdateCount = 0; // L: 765 + this.occlude(); // L: 779 + tileUpdateCount = 0; // L: 780 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766 - var8 = this.tiles[var7]; // L: 767 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 781 + var8 = this.tiles[var7]; // L: 782 - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 768 - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 769 - Tile var16 = var8[var9][var10]; // L: 770 - if (var16 != null) { // L: 771 - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772 - var16.drawPrimary = true; // L: 778 - var16.drawSecondary = true; // L: 779 - if (var16.gameObjectsCount > 0) { // L: 780 - var16.drawGameObjects = true; + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 783 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 784 + Tile var16 = var8[var9][var10]; // L: 785 + if (var16 != null) { // L: 786 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 787 + var16.drawPrimary = true; // L: 793 + var16.drawSecondary = true; // L: 794 + if (var16.gameObjectsCount > 0) { + var16.drawGameObjects = true; // L: 795 } else { - var16.drawGameObjects = false; // L: 781 + var16.drawGameObjects = false; // L: 796 } - ++tileUpdateCount; // L: 782 + ++tileUpdateCount; // L: 797 } else { - var16.drawPrimary = false; // L: 773 - var16.drawSecondary = false; // L: 774 - var16.drawGameObjectEdges = 0; // L: 775 + var16.drawPrimary = false; // L: 788 + var16.drawSecondary = false; // L: 789 + var16.drawGameObjectEdges = 0; // L: 790 } } } @@ -1064,117 +1151,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788 - var8 = this.tiles[var7]; // L: 789 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 803 + var8 = this.tiles[var7]; // L: 804 - for (var9 = -25; var9 <= 0; ++var9) { // L: 790 - var10 = var9 + Scene_cameraXTile; // L: 791 - var11 = Scene_cameraXTile - var9; // L: 792 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 793 - for (var12 = -25; var12 <= 0; ++var12) { // L: 794 - var13 = var12 + Scene_cameraYTile; // L: 795 - var14 = Scene_cameraYTile - var12; // L: 796 - if (var10 >= Scene_cameraXTileMin) { // L: 797 - if (var13 >= Scene_cameraYTileMin) { // L: 798 - var15 = var8[var10][var13]; // L: 799 - if (var15 != null && var15.drawPrimary) { // L: 800 + for (var9 = -25; var9 <= 0; ++var9) { // L: 805 + var10 = var9 + Scene_cameraXTile; // L: 806 + var11 = Scene_cameraXTile - var9; // L: 807 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 808 + for (var12 = -25; var12 <= 0; ++var12) { // L: 809 + var13 = var12 + Scene_cameraYTile; // L: 810 + var14 = Scene_cameraYTile - var12; // L: 811 + if (var10 >= Scene_cameraXTileMin) { // L: 812 + if (var13 >= Scene_cameraYTileMin) { // L: 813 + var15 = var8[var10][var13]; // L: 814 + if (var15 != null && var15.drawPrimary) { // L: 815 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 802 - var15 = var8[var10][var14]; // L: 803 - if (var15 != null && var15.drawPrimary) { // L: 804 + if (var14 < Scene_cameraYTileMax) { // L: 817 + var15 = var8[var10][var14]; // L: 818 + if (var15 != null && var15.drawPrimary) { // L: 819 this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { // L: 807 - if (var13 >= Scene_cameraYTileMin) { // L: 808 - var15 = var8[var11][var13]; // L: 809 - if (var15 != null && var15.drawPrimary) { // L: 810 + if (var11 < Scene_cameraXTileMax) { // L: 822 + if (var13 >= Scene_cameraYTileMin) { // L: 823 + var15 = var8[var11][var13]; // L: 824 + if (var15 != null && var15.drawPrimary) { // L: 825 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 812 - var15 = var8[var11][var14]; // L: 813 - if (var15 != null && var15.drawPrimary) { // L: 814 + if (var14 < Scene_cameraYTileMax) { // L: 827 + var15 = var8[var11][var14]; // L: 828 + if (var15 != null && var15.drawPrimary) { // L: 829 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { // L: 817 - checkClick = false; // L: 818 - return; // L: 819 + if (tileUpdateCount == 0) { // L: 832 + checkClick = false; // L: 833 + return; // L: 834 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825 - var8 = this.tiles[var7]; // L: 826 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 840 + var8 = this.tiles[var7]; // L: 841 - for (var9 = -25; var9 <= 0; ++var9) { // L: 827 - var10 = var9 + Scene_cameraXTile; // L: 828 - var11 = Scene_cameraXTile - var9; // L: 829 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 830 - for (var12 = -25; var12 <= 0; ++var12) { // L: 831 - var13 = var12 + Scene_cameraYTile; // L: 832 - var14 = Scene_cameraYTile - var12; // L: 833 - if (var10 >= Scene_cameraXTileMin) { // L: 834 - if (var13 >= Scene_cameraYTileMin) { // L: 835 - var15 = var8[var10][var13]; // L: 836 - if (var15 != null && var15.drawPrimary) { // L: 837 + for (var9 = -25; var9 <= 0; ++var9) { // L: 842 + var10 = var9 + Scene_cameraXTile; // L: 843 + var11 = Scene_cameraXTile - var9; // L: 844 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 845 + for (var12 = -25; var12 <= 0; ++var12) { // L: 846 + var13 = var12 + Scene_cameraYTile; // L: 847 + var14 = Scene_cameraYTile - var12; // L: 848 + if (var10 >= Scene_cameraXTileMin) { // L: 849 + if (var13 >= Scene_cameraYTileMin) { // L: 850 + var15 = var8[var10][var13]; // L: 851 + if (var15 != null && var15.drawPrimary) { // L: 852 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { // L: 839 - var15 = var8[var10][var14]; // L: 840 - if (var15 != null && var15.drawPrimary) { // L: 841 + if (var14 < Scene_cameraYTileMax) { // L: 854 + var15 = var8[var10][var14]; // L: 855 + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); // L: 856 + } + } + } + + if (var11 < Scene_cameraXTileMax) { // L: 859 + if (var13 >= Scene_cameraYTileMin) { // L: 860 + var15 = var8[var11][var13]; // L: 861 + if (var15 != null && var15.drawPrimary) { // L: 862 + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { // L: 864 + var15 = var8[var11][var14]; // L: 865 + if (var15 != null && var15.drawPrimary) { // L: 866 this.drawTile(var15, false); } } } - if (var11 < Scene_cameraXTileMax) { // L: 844 - if (var13 >= Scene_cameraYTileMin) { // L: 845 - var15 = var8[var11][var13]; // L: 846 - if (var15 != null && var15.drawPrimary) { // L: 847 - this.drawTile(var15, false); - } - } - - if (var14 < Scene_cameraYTileMax) { // L: 849 - var15 = var8[var11][var14]; // L: 850 - if (var15 != null && var15.drawPrimary) { // L: 851 - this.drawTile(var15, false); - } - } - } - - if (tileUpdateCount == 0) { // L: 854 - checkClick = false; // L: 855 - return; // L: 856 + if (tileUpdateCount == 0) { // L: 869 + checkClick = false; // L: 870 + return; // L: 871 } } } } } - checkClick = false; // L: 862 - } // L: 863 + checkClick = false; // L: 877 + } // L: 878 - @ObfuscatedName("aj") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lek;Z)V" + descriptor = "(Leo;Z)V" ) + @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 866 + Scene_tilesDeque.addFirst(var1); // L: 881 while (true) { Tile var3; @@ -1206,227 +1294,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868 - if (var3 == null) { // L: 869 + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 883 + if (var3 == null) { // L: 884 return; } - } while(!var3.drawSecondary); // L: 870 + } while(!var3.drawSecondary); // L: 885 - var4 = var3.x; // L: 871 - var5 = var3.y; // L: 872 - var6 = var3.plane; // L: 873 - var7 = var3.originalPlane; // L: 874 - var8 = this.tiles[var6]; // L: 875 - if (!var3.drawPrimary) { // L: 876 + var4 = var3.x; // L: 886 + var5 = var3.y; // L: 887 + var6 = var3.plane; // L: 888 + var7 = var3.originalPlane; // L: 889 + var8 = this.tiles[var6]; // L: 890 + if (!var3.drawPrimary) { // L: 891 break; } - if (var2) { // L: 877 - if (var6 > 0) { // L: 878 - var9 = this.tiles[var6 - 1][var4][var5]; // L: 879 - if (var9 != null && var9.drawSecondary) { // L: 880 + if (var2) { // L: 892 + if (var6 > 0) { // L: 893 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 894 + if (var9 != null && var9.drawSecondary) { // L: 895 continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882 - var9 = var8[var4 - 1][var5]; // L: 883 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884 + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 897 + var9 = var8[var4 - 1][var5]; // L: 898 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 899 continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886 - var9 = var8[var4 + 1][var5]; // L: 887 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888 + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 901 + var9 = var8[var4 + 1][var5]; // L: 902 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 903 continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890 - var9 = var8[var4][var5 - 1]; // L: 891 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892 + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 905 + var9 = var8[var4][var5 - 1]; // L: 906 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 907 continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894 - var9 = var8[var4][var5 + 1]; // L: 895 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896 + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 909 + var9 = var8[var4][var5 + 1]; // L: 910 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 911 continue; } } } else { - var2 = true; // L: 899 + var2 = true; // L: 914 } - var3.drawPrimary = false; // L: 900 - if (var3.linkedBelowTile != null) { // L: 901 - var9 = var3.linkedBelowTile; // L: 902 - if (var9.paint != null) { // L: 903 - if (!this.method3236(0, var4, var5)) { // L: 904 + var3.drawPrimary = false; // L: 915 + if (var3.linkedBelowTile != null) { // L: 916 + var9 = var3.linkedBelowTile; // L: 917 + if (var9.paint != null) { // L: 918 + if (!this.method3265(0, var4, var5)) { // L: 919 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3236(0, var4, var5)) { // L: 906 907 + } else if (var9.model != null && !this.method3265(0, var4, var5)) { // L: 921 922 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 909 - if (var10 != null) { // L: 910 + var10 = var9.boundaryObject; // L: 924 + if (var10 != null) { // L: 925 var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911 - var12 = var9.gameObjects[var11]; // L: 912 - if (var12 != null) { // L: 913 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 926 + var12 = var9.gameObjects[var11]; // L: 927 + if (var12 != null) { // L: 928 var12.entity.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; // L: 916 - if (var3.paint != null) { // L: 917 - if (!this.method3236(var7, var4, var5)) { // L: 918 - var20 = true; // L: 919 - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 + var20 = false; // L: 931 + if (var3.paint != null) { // L: 932 + if (!this.method3265(var7, var4, var5)) { // L: 933 + var20 = true; // L: 934 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 935 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3236(var7, var4, var5)) { // L: 923 924 - var20 = true; // L: 925 - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926 + } else if (var3.model != null && !this.method3265(var7, var4, var5)) { // L: 938 939 + var20 = true; // L: 940 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 941 } - var21 = 0; // L: 929 - var11 = 0; // L: 930 - BoundaryObject var31 = var3.boundaryObject; // L: 931 - WallDecoration var13 = var3.wallDecoration; // L: 932 - if (var31 != null || var13 != null) { // L: 933 - if (var4 == Scene_cameraXTile) { // L: 934 + var21 = 0; // L: 944 + var11 = 0; // L: 945 + BoundaryObject var31 = var3.boundaryObject; // L: 946 + WallDecoration var13 = var3.wallDecoration; // L: 947 + if (var31 != null || var13 != null) { // L: 948 + if (var4 == Scene_cameraXTile) { // L: 949 ++var21; - } else if (Scene_cameraXTile < var4) { // L: 935 + } else if (Scene_cameraXTile < var4) { // L: 950 var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 936 + if (var5 == Scene_cameraYTile) { // L: 951 var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 937 + } else if (Scene_cameraYTile > var5) { // L: 952 var21 += 6; } - var11 = field1874[var21]; // L: 938 - var3.field1689 = field1869[var21]; // L: 939 + var11 = field1874[var21]; // L: 953 + var3.field1671 = field1876[var21]; // L: 954 } - if (var31 != null) { // L: 941 - if ((var31.orientationA & field1851[var21]) != 0) { // L: 942 - if (var31.orientationA == 16) { // L: 943 - var3.drawGameObjectEdges = 3; // L: 944 - var3.field1678 = field1881[var21]; // L: 945 - var3.field1687 = 3 - var3.field1678; // L: 946 - } else if (var31.orientationA == 32) { // L: 948 - var3.drawGameObjectEdges = 6; // L: 949 - var3.field1678 = field1882[var21]; // L: 950 - var3.field1687 = 6 - var3.field1678; // L: 951 - } else if (var31.orientationA == 64) { // L: 953 - var3.drawGameObjectEdges = 12; // L: 954 - var3.field1678 = field1883[var21]; // L: 955 - var3.field1687 = 12 - var3.field1678; // L: 956 + if (var31 != null) { // L: 956 + if ((var31.orientationA & field1875[var21]) != 0) { // L: 957 + if (var31.orientationA == 16) { // L: 958 + var3.drawGameObjectEdges = 3; // L: 959 + var3.field1690 = field1851[var21]; // L: 960 + var3.field1691 = 3 - var3.field1690; // L: 961 + } else if (var31.orientationA == 32) { // L: 963 + var3.drawGameObjectEdges = 6; // L: 964 + var3.field1690 = field1878[var21]; // L: 965 + var3.field1691 = 6 - var3.field1690; // L: 966 + } else if (var31.orientationA == 64) { // L: 968 + var3.drawGameObjectEdges = 12; // L: 969 + var3.field1690 = field1828[var21]; // L: 970 + var3.field1691 = 12 - var3.field1690; // L: 971 } else { - var3.drawGameObjectEdges = 9; // L: 959 - var3.field1678 = field1884[var21]; // L: 960 - var3.field1687 = 9 - var3.field1678; // L: 961 + var3.drawGameObjectEdges = 9; // L: 974 + var3.field1690 = field1856[var21]; // L: 975 + var3.field1691 = 9 - var3.field1690; // L: 976 } } else { - var3.drawGameObjectEdges = 0; // L: 964 + var3.drawGameObjectEdges = 0; // L: 979 } - if ((var31.orientationA & var11) != 0 && !this.method3208(var7, var4, var5, var31.orientationA)) { // L: 965 + if ((var31.orientationA & var11) != 0 && !this.method3346(var7, var4, var5, var31.orientationA)) { // L: 980 var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3208(var7, var4, var5, var31.orientationB)) { // L: 966 + if ((var31.orientationB & var11) != 0 && !this.method3346(var7, var4, var5, var31.orientationB)) { // L: 981 var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method3238(var7, var4, var5, var13.entity1.height)) { // L: 968 - if ((var13.orientation & var11) != 0) { // L: 969 - var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970 - } else if (var13.orientation == 256) { // L: 972 - var14 = var13.x - Scene_cameraX; // L: 973 - var15 = var13.tileHeight - Scene_cameraY; // L: 974 - var16 = var13.y - Scene_cameraZ; // L: 975 - var17 = var13.orientation2; // L: 976 - if (var17 != 1 && var17 != 2) { // L: 978 - var18 = var14; // L: 979 + if (var13 != null && !this.method3325(var7, var4, var5, var13.entity1.height)) { // L: 983 + if ((var13.orientation & var11) != 0) { // L: 984 + var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 985 + } else if (var13.orientation == 256) { // L: 987 + var14 = var13.x - Scene_cameraX; // L: 988 + var15 = var13.tileHeight - Scene_cameraY; // L: 989 + var16 = var13.y - Scene_cameraZ; // L: 990 + var17 = var13.orientation2; // L: 991 + if (var17 != 1 && var17 != 2) { // L: 993 + var18 = var14; // L: 994 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 981 - var19 = var16; // L: 982 + if (var17 != 2 && var17 != 3) { // L: 996 + var19 = var16; // L: 997 } else { var19 = -var16; } - if (var19 < var18) { // L: 983 - var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984 - } else if (var13.entity2 != null) { // L: 986 - var13.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987 + if (var19 < var18) { // L: 998 + var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 999 + } else if (var13.entity2 != null) { // L: 1001 + var13.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1002 } } } - if (var20) { // L: 991 - FloorDecoration var22 = var3.floorDecoration; // L: 992 - if (var22 != null) { // L: 993 + if (var20) { // L: 1006 + FloorDecoration var22 = var3.floorDecoration; // L: 1007 + if (var22 != null) { // L: 1008 var22.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - TileItemPile var23 = var3.tileItemPile; // L: 994 - if (var23 != null && var23.height == 0) { // L: 995 - if (var23.second != null) { // L: 996 + TileItemPile var23 = var3.tileItemPile; // L: 1009 + if (var23 != null && var23.height == 0) { // L: 1010 + if (var23.second != null) { // L: 1011 var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { // L: 997 + if (var23.third != null) { // L: 1012 var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { // L: 998 + if (var23.first != null) { // L: 1013 var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; // L: 1001 - if (var14 != 0) { // L: 1002 - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003 - var36 = var8[var4 + 1][var5]; // L: 1004 - if (var36 != null && var36.drawSecondary) { // L: 1005 + var14 = var3.gameObjectsEdgeMask; // L: 1016 + if (var14 != 0) { // L: 1017 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1018 + var36 = var8[var4 + 1][var5]; // L: 1019 + if (var36 != null && var36.drawSecondary) { // L: 1020 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007 - var36 = var8[var4][var5 + 1]; // L: 1008 - if (var36 != null && var36.drawSecondary) { // L: 1009 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1022 + var36 = var8[var4][var5 + 1]; // L: 1023 + if (var36 != null && var36.drawSecondary) { // L: 1024 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011 - var36 = var8[var4 - 1][var5]; // L: 1012 - if (var36 != null && var36.drawSecondary) { // L: 1013 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1026 + var36 = var8[var4 - 1][var5]; // L: 1027 + if (var36 != null && var36.drawSecondary) { // L: 1028 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015 - var36 = var8[var4][var5 - 1]; // L: 1016 - if (var36 != null && var36.drawSecondary) { // L: 1017 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1030 + var36 = var8[var4][var5 - 1]; // L: 1031 + if (var36 != null && var36.drawSecondary) { // L: 1032 Scene_tilesDeque.addFirst(var36); } } @@ -1434,371 +1522,372 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1021 - var20 = true; // L: 1022 + if (var3.drawGameObjectEdges != 0) { // L: 1036 + var20 = true; // L: 1037 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1678) { // L: 1024 - var20 = false; // L: 1025 - break; // L: 1026 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1038 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1690) { // L: 1039 + var20 = false; // L: 1040 + break; // L: 1041 } } - if (var20) { // L: 1029 - var10 = var3.boundaryObject; // L: 1030 - if (!this.method3208(var7, var4, var5, var10.orientationA)) { // L: 1031 + if (var20) { // L: 1044 + var10 = var3.boundaryObject; // L: 1045 + if (!this.method3346(var7, var4, var5, var10.orientationA)) { // L: 1046 var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1032 + var3.drawGameObjectEdges = 0; // L: 1047 } } - if (!var3.drawGameObjects) { // L: 1035 + if (!var3.drawGameObjects) { // L: 1050 break; } try { - int var34 = var3.gameObjectsCount; // L: 1037 - var3.drawGameObjects = false; // L: 1038 - var21 = 0; // L: 1039 + int var34 = var3.gameObjectsCount; // L: 1052 + var3.drawGameObjects = false; // L: 1053 + var21 = 0; // L: 1054 label563: - for (var11 = 0; var11 < var34; ++var11) { // L: 1040 - var12 = var3.gameObjects[var11]; // L: 1041 - if (var12.lastDrawn != Scene_drawnCount) { // L: 1042 - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043 - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044 - var36 = var8[var24][var14]; // L: 1045 - if (var36.drawPrimary) { // L: 1046 - var3.drawGameObjects = true; // L: 1047 - continue label563; // L: 1048 + for (var11 = 0; var11 < var34; ++var11) { // L: 1055 + var12 = var3.gameObjects[var11]; // L: 1056 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1057 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1058 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1059 + var36 = var8[var24][var14]; // L: 1060 + if (var36.drawPrimary) { // L: 1061 + var3.drawGameObjects = true; // L: 1062 + continue label563; // L: 1063 } - if (var36.drawGameObjectEdges != 0) { // L: 1050 - var16 = 0; // L: 1051 - if (var24 > var12.startX) { // L: 1052 + if (var36.drawGameObjectEdges != 0) { // L: 1065 + var16 = 0; // L: 1066 + if (var24 > var12.startX) { // L: 1067 ++var16; } - if (var24 < var12.endX) { // L: 1053 + if (var24 < var12.endX) { // L: 1068 var16 += 4; } - if (var14 > var12.startY) { // L: 1054 + if (var14 > var12.startY) { // L: 1069 var16 += 8; } - if (var14 < var12.endY) { // L: 1055 + if (var14 < var12.endY) { // L: 1070 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1687) { // L: 1056 - var3.drawGameObjects = true; // L: 1057 - continue label563; // L: 1058 + if ((var16 & var36.drawGameObjectEdges) == var3.field1691) { // L: 1071 + var3.drawGameObjects = true; // L: 1072 + continue label563; // L: 1073 } } } } - gameObjects[var21++] = var12; // L: 1063 - var24 = Scene_cameraXTile - var12.startX; // L: 1064 - var14 = var12.endX - Scene_cameraXTile; // L: 1065 - if (var14 > var24) { // L: 1066 + gameObjects[var21++] = var12; // L: 1078 + var24 = Scene_cameraXTile - var12.startX; // L: 1079 + var14 = var12.endX - Scene_cameraXTile; // L: 1080 + if (var14 > var24) { // L: 1081 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1067 - var16 = var12.endY - Scene_cameraYTile; // L: 1068 - if (var16 > var15) { // L: 1069 - var12.field1974 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1082 + var16 = var12.endY - Scene_cameraYTile; // L: 1083 + if (var16 > var15) { // L: 1084 + var12.field1962 = var24 + var16; } else { - var12.field1974 = var24 + var15; // L: 1070 + var12.field1962 = var24 + var15; // L: 1085 } } } - while (var21 > 0) { // L: 1073 - var11 = -50; // L: 1074 - var25 = -1; // L: 1075 + while (var21 > 0) { // L: 1088 + var11 = -50; // L: 1089 + var25 = -1; // L: 1090 - for (var24 = 0; var24 < var21; ++var24) { // L: 1076 - GameObject var35 = gameObjects[var24]; // L: 1077 - if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 - if (var35.field1974 > var11) { // L: 1079 - var11 = var35.field1974; // L: 1080 - var25 = var24; // L: 1081 - } else if (var11 == var35.field1974) { // L: 1083 - var15 = var35.centerX - Scene_cameraX; // L: 1084 - var16 = var35.centerY - Scene_cameraZ; // L: 1085 - var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086 - var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087 - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088 + for (var24 = 0; var24 < var21; ++var24) { // L: 1091 + GameObject var35 = gameObjects[var24]; // L: 1092 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1093 + if (var35.field1962 > var11) { // L: 1094 + var11 = var35.field1962; // L: 1095 + var25 = var24; // L: 1096 + } else if (var11 == var35.field1962) { // L: 1098 + var15 = var35.centerX - Scene_cameraX; // L: 1099 + var16 = var35.centerY - Scene_cameraZ; // L: 1100 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1101 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1102 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1103 var25 = var24; } } } } - if (var25 == -1) { // L: 1092 + if (var25 == -1) { // L: 1107 break; } - GameObject var33 = gameObjects[var25]; // L: 1093 - var33.lastDrawn = Scene_drawnCount; // L: 1094 - if (!this.method3297(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { // L: 1095 - 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); // L: 1096 + GameObject var33 = gameObjects[var25]; // L: 1108 + var33.lastDrawn = Scene_drawnCount; // L: 1109 + if (!this.method3343(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { // L: 1110 + 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); // L: 1111 } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098 - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099 - Tile var26 = var8[var14][var15]; // L: 1100 - if (var26.drawGameObjectEdges != 0) { // L: 1101 + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1113 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1114 + Tile var26 = var8[var14][var15]; // L: 1115 + if (var26.drawGameObjectEdges != 0) { // L: 1116 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1117 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1106 + if (!var3.drawGameObjects) { // L: 1121 break; } - } catch (Exception var28) { // L: 1108 - var3.drawGameObjects = false; // L: 1109 + } catch (Exception var28) { // L: 1123 + var3.drawGameObjects = false; // L: 1124 break; } } - } while(!var3.drawSecondary); // L: 1112 - } while(var3.drawGameObjectEdges != 0); // L: 1113 + } while(!var3.drawSecondary); // L: 1127 + } while(var3.drawGameObjectEdges != 0); // L: 1128 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1129 break; } - var9 = var8[var4 - 1][var5]; // L: 1115 - } while(var9 != null && var9.drawSecondary); // L: 1116 + var9 = var8[var4 - 1][var5]; // L: 1130 + } while(var9 != null && var9.drawSecondary); // L: 1131 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1133 break; } - var9 = var8[var4 + 1][var5]; // L: 1119 - } while(var9 != null && var9.drawSecondary); // L: 1120 + var9 = var8[var4 + 1][var5]; // L: 1134 + } while(var9 != null && var9.drawSecondary); // L: 1135 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1137 break; } - var9 = var8[var4][var5 - 1]; // L: 1123 - } while(var9 != null && var9.drawSecondary); // L: 1124 + var9 = var8[var4][var5 - 1]; // L: 1138 + } while(var9 != null && var9.drawSecondary); // L: 1139 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1141 break; } - var9 = var8[var4][var5 + 1]; // L: 1127 - } while(var9 != null && var9.drawSecondary); // L: 1128 + var9 = var8[var4][var5 + 1]; // L: 1142 + } while(var9 != null && var9.drawSecondary); // L: 1143 - var3.drawSecondary = false; // L: 1130 - --tileUpdateCount; // L: 1131 - TileItemPile var32 = var3.tileItemPile; // L: 1132 - if (var32 != null && var32.height != 0) { // L: 1133 - if (var32.second != null) { // L: 1134 + var3.drawSecondary = false; // L: 1145 + --tileUpdateCount; // L: 1146 + TileItemPile var32 = var3.tileItemPile; // L: 1147 + if (var32 != null && var32.height != 0) { // L: 1148 + if (var32.second != null) { // L: 1149 var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1135 + if (var32.third != null) { // L: 1150 var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1136 + if (var32.first != null) { // L: 1151 var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field1689 != 0) { // L: 1138 - WallDecoration var29 = var3.wallDecoration; // L: 1139 - if (var29 != null && !this.method3238(var7, var4, var5, var29.entity1.height)) { // L: 1140 - if ((var29.orientation & var3.field1689) != 0) { // L: 1141 - var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142 - } else if (var29.orientation == 256) { // L: 1144 - var11 = var29.x - Scene_cameraX; // L: 1145 - var25 = var29.tileHeight - Scene_cameraY; // L: 1146 - var24 = var29.y - Scene_cameraZ; // L: 1147 - var14 = var29.orientation2; // L: 1148 - if (var14 != 1 && var14 != 2) { // L: 1150 - var15 = var11; // L: 1151 + if (var3.field1671 != 0) { // L: 1153 + WallDecoration var29 = var3.wallDecoration; // L: 1154 + if (var29 != null && !this.method3325(var7, var4, var5, var29.entity1.height)) { // L: 1155 + if ((var29.orientation & var3.field1671) != 0) { // L: 1156 + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1157 + } else if (var29.orientation == 256) { // L: 1159 + var11 = var29.x - Scene_cameraX; // L: 1160 + var25 = var29.tileHeight - Scene_cameraY; // L: 1161 + var24 = var29.y - Scene_cameraZ; // L: 1162 + var14 = var29.orientation2; // L: 1163 + if (var14 != 1 && var14 != 2) { // L: 1165 + var15 = var11; // L: 1166 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1153 - var16 = var24; // L: 1154 + if (var14 != 2 && var14 != 3) { // L: 1168 + var16 = var24; // L: 1169 } else { var16 = -var24; } - if (var16 >= var15) { // L: 1155 - var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156 - } else if (var29.entity2 != null) { // L: 1158 - var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159 + if (var16 >= var15) { // L: 1170 + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1171 + } else if (var29.entity2 != null) { // L: 1173 + var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1174 } } } - BoundaryObject var27 = var3.boundaryObject; // L: 1163 - if (var27 != null) { // L: 1164 - if ((var27.orientationB & var3.field1689) != 0 && !this.method3208(var7, var4, var5, var27.orientationB)) { // L: 1165 + BoundaryObject var27 = var3.boundaryObject; // L: 1178 + if (var27 != null) { // L: 1179 + if ((var27.orientationB & var3.field1671) != 0 && !this.method3346(var7, var4, var5, var27.orientationB)) { // L: 1180 var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field1689) != 0 && !this.method3208(var7, var4, var5, var27.orientationA)) { // L: 1166 + if ((var27.orientationA & var3.field1671) != 0 && !this.method3346(var7, var4, var5, var27.orientationA)) { // L: 1181 var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { // L: 1169 - var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170 - if (var30 != null && var30.drawSecondary) { // L: 1171 + if (var6 < this.planes - 1) { // L: 1184 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1185 + if (var30 != null && var30.drawSecondary) { // L: 1186 Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { // L: 1173 - var30 = var8[var4 + 1][var5]; // L: 1174 - if (var30 != null && var30.drawSecondary) { // L: 1175 + if (var4 < Scene_cameraXTile) { // L: 1188 + var30 = var8[var4 + 1][var5]; // L: 1189 + if (var30 != null && var30.drawSecondary) { // L: 1190 Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { // L: 1177 - var30 = var8[var4][var5 + 1]; // L: 1178 - if (var30 != null && var30.drawSecondary) { // L: 1179 + if (var5 < Scene_cameraYTile) { // L: 1192 + var30 = var8[var4][var5 + 1]; // L: 1193 + if (var30 != null && var30.drawSecondary) { // L: 1194 Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { // L: 1181 - var30 = var8[var4 - 1][var5]; // L: 1182 - if (var30 != null && var30.drawSecondary) { // L: 1183 + if (var4 > Scene_cameraXTile) { // L: 1196 + var30 = var8[var4 - 1][var5]; // L: 1197 + if (var30 != null && var30.drawSecondary) { // L: 1198 Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { // L: 1185 - var30 = var8[var4][var5 - 1]; // L: 1186 - if (var30 != null && var30.drawSecondary) { // L: 1187 + if (var5 > Scene_cameraYTile) { // L: 1200 + var30 = var8[var4][var5 - 1]; // L: 1201 + if (var30 != null && var30.drawSecondary) { // L: 1202 Scene_tilesDeque.addFirst(var30); } } } } - @ObfuscatedName("aw") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Lem;IIIIIII)V" + descriptor = "(Leu;IIIIIII)V" ) + @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9; - int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195 + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1210 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1212 int var13; - int var14 = var13 = var10 + 128; // L: 1199 + int var14 = var13 = var10 + 128; // L: 1214 int var15; - int var16 = var15 = var12 + 128; // L: 1201 - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202 - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203 - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204 - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205 - int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206 - var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207 - var10 = var21; // L: 1208 - var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209 - var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210 - var17 = var21; // L: 1211 - if (var12 >= 50) { // L: 1212 - var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213 - var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214 - var14 = var21; // L: 1215 - var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216 - var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217 - var18 = var21; // L: 1218 - if (var11 >= 50) { // L: 1219 - var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220 - var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221 - var13 = var21; // L: 1222 - var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223 - var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224 - var19 = var21; // L: 1225 - if (var16 >= 50) { // L: 1226 - var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227 - var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228 - var9 = var21; // L: 1229 - var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230 - var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231 - if (var15 >= 50) { // L: 1233 - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234 - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235 - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236 - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237 - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238 - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239 - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240 - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242 + int var16 = var15 = var12 + 128; // L: 1216 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1217 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1218 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1219 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1220 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1221 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1222 + var10 = var21; // L: 1223 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1224 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1225 + var17 = var21; // L: 1226 + if (var12 >= 50) { // L: 1227 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1228 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1229 + var14 = var21; // L: 1230 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1231 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1232 + var18 = var21; // L: 1233 + if (var11 >= 50) { // L: 1234 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1235 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1236 + var13 = var21; // L: 1237 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1238 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1239 + var19 = var21; // L: 1240 + if (var16 >= 50) { // L: 1241 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1242 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1243 + var9 = var21; // L: 1244 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1245 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1246 + if (var15 >= 50) { // L: 1248 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1249 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1250 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1251 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1252 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1253 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1254 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1255 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1256 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1257 int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 - Rasterizer3D.field1791 = false; // L: 1244 - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245 - Rasterizer3D.field1791 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1258 + Rasterizer3D.field1800 = false; // L: 1259 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1260 + Rasterizer3D.field1800 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246 - Scene_selectedX = var7; // L: 1247 - Scene_selectedY = var8; // L: 1248 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1261 + Scene_selectedX = var7; // L: 1262 + Scene_selectedY = var8; // L: 1263 } - if (var1.texture == -1) { // L: 1250 - if (var1.neColor != 12345678) { // L: 1251 - Rasterizer3D.method3117(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { // L: 1265 + if (var1.neColor != 12345678) { // L: 1266 + Rasterizer3D.method3155(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1253 - if (var1.isFlat) { // L: 1254 + } else if (!Scene_isLowDetail) { // L: 1268 + if (var1.isFlat) { // L: 1269 Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255 + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1270 } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 - Rasterizer3D.method3117(var27, var29, var25, var26, var28, var24, method3355(var30, var1.neColor), method3355(var30, var1.nwColor), method3355(var30, var1.seColor)); // L: 1259 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1273 + Rasterizer3D.method3155(var27, var29, var25, var26, var28, var24, method3262(var30, var1.neColor), method3262(var30, var1.nwColor), method3262(var30, var1.seColor)); // L: 1274 } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 - Rasterizer3D.field1791 = false; // L: 1263 - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264 - Rasterizer3D.field1791 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1277 + Rasterizer3D.field1800 = false; // L: 1278 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1279 + Rasterizer3D.field1800 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265 - Scene_selectedX = var7; // L: 1266 - Scene_selectedY = var8; // L: 1267 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1280 + Scene_selectedX = var7; // L: 1281 + Scene_selectedY = var8; // L: 1282 } - if (var1.texture == -1) { // L: 1269 - if (var1.swColor != 12345678) { // L: 1270 - Rasterizer3D.method3117(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { // L: 1284 + if (var1.swColor != 12345678) { // L: 1285 + Rasterizer3D.method3155(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { // L: 1272 - 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); // L: 1273 + } else if (!Scene_isLowDetail) { // L: 1287 + 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); // L: 1288 } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 - Rasterizer3D.method3117(var23, var25, var29, var22, var24, var28, method3355(var30, var1.swColor), method3355(var30, var1.seColor), method3355(var30, var1.nwColor)); // L: 1277 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1291 + Rasterizer3D.method3155(var23, var25, var29, var22, var24, var28, method3262(var30, var1.swColor), method3262(var30, var1.seColor), method3262(var30, var1.nwColor)); // L: 1292 } } @@ -1806,562 +1895,566 @@ public class Scene { } } } - } // L: 1280 + } // L: 1295 - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Len;IIIIII)V" + descriptor = "(Leq;IIIIII)V" ) + @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; // L: 1283 + int var8 = var1.vertexX.length; // L: 1298 int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { // L: 1284 - var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285 - var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286 - var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287 - var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288 - var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289 - var10 = var13; // L: 1290 - var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291 - var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292 - if (var12 < 50) { // L: 1294 + for (var9 = 0; var9 < var8; ++var9) { // L: 1299 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1300 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1301 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1302 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1303 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1304 + var10 = var13; // L: 1305 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1306 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1307 + if (var12 < 50) { // L: 1309 return; } - if (var1.triangleTextureId != null) { // L: 1295 - TileModel.field1628[var9] = var10; // L: 1296 - TileModel.field1624[var9] = var13; // L: 1297 - TileModel.field1630[var9] = var12; // L: 1298 + if (var1.triangleTextureId != null) { // L: 1310 + TileModel.field1630[var9] = var10; // L: 1311 + TileModel.field1627[var9] = var13; // L: 1312 + TileModel.field1632[var9] = var12; // L: 1313 } - TileModel.field1626[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 - TileModel.field1627[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 + TileModel.field1628[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1315 + TileModel.field1634[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1316 } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 - var8 = var1.faceX.length; // L: 1304 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1318 + var8 = var1.faceX.length; // L: 1319 - for (var9 = 0; var9 < var8; ++var9) { // L: 1305 - var10 = var1.faceX[var9]; // L: 1306 - var11 = var1.faceY[var9]; // L: 1307 - var12 = var1.faceZ[var9]; // L: 1308 - var13 = TileModel.field1626[var10]; // L: 1309 - int var14 = TileModel.field1626[var11]; // L: 1310 - int var15 = TileModel.field1626[var12]; // L: 1311 - int var16 = TileModel.field1627[var10]; // L: 1312 - int var17 = TileModel.field1627[var11]; // L: 1313 - int var18 = TileModel.field1627[var12]; // L: 1314 - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 - Rasterizer3D.field1791 = false; // L: 1316 - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317 - Rasterizer3D.field1791 = true; + for (var9 = 0; var9 < var8; ++var9) { // L: 1320 + var10 = var1.faceX[var9]; // L: 1321 + var11 = var1.faceY[var9]; // L: 1322 + var12 = var1.faceZ[var9]; // L: 1323 + var13 = TileModel.field1628[var10]; // L: 1324 + int var14 = TileModel.field1628[var11]; // L: 1325 + int var15 = TileModel.field1628[var12]; // L: 1326 + int var16 = TileModel.field1634[var10]; // L: 1327 + int var17 = TileModel.field1634[var11]; // L: 1328 + int var18 = TileModel.field1634[var12]; // L: 1329 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1330 + Rasterizer3D.field1800 = false; // L: 1331 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1332 + Rasterizer3D.field1800 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318 - Scene_selectedX = var6; // L: 1319 - Scene_selectedY = var7; // L: 1320 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1333 + Scene_selectedX = var6; // L: 1334 + Scene_selectedY = var7; // L: 1335 } - if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322 - if (!Scene_isLowDetail) { // L: 1326 - if (var1.isFlat) { // L: 1327 - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1628[0], TileModel.field1628[1], TileModel.field1628[3], TileModel.field1624[0], TileModel.field1624[1], TileModel.field1624[3], TileModel.field1630[0], TileModel.field1630[1], TileModel.field1630[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1337 + if (!Scene_isLowDetail) { // L: 1341 + if (var1.isFlat) { // L: 1342 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1630[0], TileModel.field1630[1], TileModel.field1630[3], TileModel.field1627[0], TileModel.field1627[1], TileModel.field1627[3], TileModel.field1632[0], TileModel.field1632[1], TileModel.field1632[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1628[var10], TileModel.field1628[var11], TileModel.field1628[var12], TileModel.field1624[var10], TileModel.field1624[var11], TileModel.field1624[var12], TileModel.field1630[var10], TileModel.field1630[var11], TileModel.field1630[var12], var1.triangleTextureId[var9]); // L: 1328 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1630[var10], TileModel.field1630[var11], TileModel.field1630[var12], TileModel.field1627[var10], TileModel.field1627[var11], TileModel.field1627[var12], TileModel.field1632[var10], TileModel.field1632[var11], TileModel.field1632[var12], var1.triangleTextureId[var9]); // L: 1343 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 - Rasterizer3D.method3117(var16, var17, var18, var13, var14, var15, method3355(var19, var1.triangleColorA[var9]), method3355(var19, var1.triangleColorB[var9]), method3355(var19, var1.triangleColorC[var9])); // L: 1332 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1346 + Rasterizer3D.method3155(var16, var17, var18, var13, var14, var15, method3262(var19, var1.triangleColorA[var9]), method3262(var19, var1.triangleColorB[var9]), method3262(var19, var1.triangleColorC[var9])); // L: 1347 } - } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 - Rasterizer3D.method3117(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1338 + Rasterizer3D.method3155(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1337 + } // L: 1352 - @ObfuscatedName("bl") + @ObfuscatedName("ap") + @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 - Scene_currentOccludersCount = 0; // L: 1366 + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1379 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1380 + Scene_currentOccludersCount = 0; // L: 1381 - for (int var3 = 0; var3 < var1; ++var3) { // L: 1367 - Occluder var4 = var2[var3]; // L: 1368 + for (int var3 = 0; var3 < var1; ++var3) { // L: 1382 + Occluder var4 = var2[var3]; // L: 1383 int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { // L: 1369 - var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370 - if (var5 >= 0 && var5 <= 50) { // L: 1371 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372 - if (var6 < 0) { // L: 1373 + if (var4.type == 1) { // L: 1384 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1385 + if (var5 >= 0 && var5 <= 50) { // L: 1386 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1387 + if (var6 < 0) { // L: 1388 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374 - if (var7 > 50) { // L: 1375 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1389 + if (var7 > 50) { // L: 1390 var7 = 50; } - var13 = false; // L: 1376 + var13 = false; // L: 1391 - while (var6 <= var7) { // L: 1377 - if (visibleTiles[var5][var6++]) { // L: 1378 - var13 = true; // L: 1379 + while (var6 <= var7) { // L: 1392 + if (visibleTiles[var5][var6++]) { // L: 1393 + var13 = true; // L: 1394 break; } } - if (var13) { // L: 1383 - var9 = Scene_cameraX - var4.minX; // L: 1384 - if (var9 > 32) { // L: 1385 - var4.field1941 = 1; + if (var13) { // L: 1398 + var9 = Scene_cameraX - var4.minX; // L: 1399 + if (var9 > 32) { // L: 1400 + var4.field1931 = 1; } else { - if (var9 >= -32) { // L: 1386 + if (var9 >= -32) { // L: 1401 continue; } - var4.field1941 = 2; // L: 1387 - var9 = -var9; // L: 1388 + var4.field1931 = 2; // L: 1402 + var9 = -var9; // L: 1403 } - var4.field1944 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 - var4.field1945 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 - var4.field1930 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 - var4.field1947 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 + var4.field1920 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1406 + var4.field1932 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1407 + var4.field1936 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1408 + var4.field1937 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1409 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1410 } } - } else if (var4.type == 2) { // L: 1398 - var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399 - if (var5 >= 0 && var5 <= 50) { // L: 1400 - var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401 - if (var6 < 0) { // L: 1402 + } else if (var4.type == 2) { // L: 1413 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1414 + if (var5 >= 0 && var5 <= 50) { // L: 1415 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1416 + if (var6 < 0) { // L: 1417 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403 - if (var7 > 50) { // L: 1404 + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1418 + if (var7 > 50) { // L: 1419 var7 = 50; } - var13 = false; // L: 1405 + var13 = false; // L: 1420 - while (var6 <= var7) { // L: 1406 - if (visibleTiles[var6++][var5]) { // L: 1407 - var13 = true; // L: 1408 + while (var6 <= var7) { // L: 1421 + if (visibleTiles[var6++][var5]) { // L: 1422 + var13 = true; // L: 1423 break; } } - if (var13) { // L: 1412 - var9 = Scene_cameraZ - var4.minZ; // L: 1413 - if (var9 > 32) { // L: 1414 - var4.field1941 = 3; + if (var13) { // L: 1427 + var9 = Scene_cameraZ - var4.minZ; // L: 1428 + if (var9 > 32) { // L: 1429 + var4.field1931 = 3; } else { - if (var9 >= -32) { // L: 1415 + if (var9 >= -32) { // L: 1430 continue; } - var4.field1941 = 4; // L: 1416 - var9 = -var9; // L: 1417 + var4.field1931 = 4; // L: 1431 + var9 = -var9; // L: 1432 } - var4.field1946 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 - var4.field1943 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 - var4.field1930 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 - var4.field1947 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 + var4.field1925 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1435 + var4.field1933 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1436 + var4.field1936 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1437 + var4.field1937 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1438 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1439 } } - } else if (var4.type == 4) { // L: 1427 - var5 = var4.minY - Scene_cameraY; // L: 1428 - if (var5 > 128) { // L: 1429 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430 - if (var6 < 0) { // L: 1431 + } else if (var4.type == 4) { // L: 1442 + var5 = var4.minY - Scene_cameraY; // L: 1443 + if (var5 > 128) { // L: 1444 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1445 + if (var6 < 0) { // L: 1446 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432 - if (var7 > 50) { // L: 1433 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1447 + if (var7 > 50) { // L: 1448 var7 = 50; } - if (var6 <= var7) { // L: 1434 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435 - if (var8 < 0) { // L: 1436 + if (var6 <= var7) { // L: 1449 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1450 + if (var8 < 0) { // L: 1451 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437 - if (var9 > 50) { // L: 1438 + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1452 + if (var9 > 50) { // L: 1453 var9 = 50; } - boolean var10 = false; // L: 1439 + boolean var10 = false; // L: 1454 label148: - for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440 - for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441 - if (visibleTiles[var11][var12]) { // L: 1442 - var10 = true; // L: 1443 + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1455 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1456 + if (visibleTiles[var11][var12]) { // L: 1457 + var10 = true; // L: 1458 break label148; } } } - if (var10) { // L: 1448 - var4.field1941 = 5; // L: 1449 - var4.field1946 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 - var4.field1943 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 - var4.field1944 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 - var4.field1945 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 + if (var10) { // L: 1463 + var4.field1931 = 5; // L: 1464 + var4.field1925 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1465 + var4.field1933 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1466 + var4.field1920 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1467 + var4.field1932 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1468 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1469 } } } } } - } // L: 1458 + } // L: 1473 - @ObfuscatedName("bc") - boolean method3236(int var1, int var2, int var3) { - int var4 = this.field1841[var1][var2][var3]; // L: 1461 - if (var4 == -Scene_drawnCount) { // L: 1462 + @ObfuscatedName("ad") + boolean method3265(int var1, int var2, int var3) { + int var4 = this.field1837[var1][var2][var3]; // L: 1476 + if (var4 == -Scene_drawnCount) { // L: 1477 return false; - } else if (var4 == Scene_drawnCount) { // L: 1463 + } else if (var4 == Scene_drawnCount) { // L: 1478 return true; } else { - int var5 = var2 << 7; // L: 1464 - int var6 = var3 << 7; // L: 1465 - if (this.method3188(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 - this.field1841[var1][var2][var3] = Scene_drawnCount; // L: 1467 - return true; // L: 1468 + int var5 = var2 << 7; // L: 1479 + int var6 = var3 << 7; // L: 1480 + if (this.method3269(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3269(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3269(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3269(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1481 + this.field1837[var1][var2][var3] = Scene_drawnCount; // L: 1482 + return true; // L: 1483 } else { - this.field1841[var1][var2][var3] = -Scene_drawnCount; // L: 1471 - return false; // L: 1472 + this.field1837[var1][var2][var3] = -Scene_drawnCount; // L: 1486 + return false; // L: 1487 } } } - @ObfuscatedName("bz") - boolean method3208(int var1, int var2, int var3, int var4) { - if (!this.method3236(var1, var2, var3)) { // L: 1477 + @ObfuscatedName("bb") + boolean method3346(int var1, int var2, int var3, int var4) { + if (!this.method3265(var1, var2, var3)) { // L: 1492 return false; } else { - int var5 = var2 << 7; // L: 1478 - int var6 = var3 << 7; // L: 1479 - int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1480 - int var8 = var7 - 120; // L: 1481 - int var9 = var7 - 230; // L: 1482 - int var10 = var7 - 238; // L: 1483 - if (var4 < 16) { // L: 1484 - if (var4 == 1) { // L: 1485 - if (var5 > Scene_cameraX) { // L: 1486 - if (!this.method3188(var5, var7, var6)) { // L: 1487 + int var5 = var2 << 7; // L: 1493 + int var6 = var3 << 7; // L: 1494 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1495 + int var8 = var7 - 120; // L: 1496 + int var9 = var7 - 230; // L: 1497 + int var10 = var7 - 238; // L: 1498 + if (var4 < 16) { // L: 1499 + if (var4 == 1) { // L: 1500 + if (var5 > Scene_cameraX) { // L: 1501 + if (!this.method3269(var5, var7, var6)) { // L: 1502 return false; } - if (!this.method3188(var5, var7, var6 + 128)) { // L: 1488 + if (!this.method3269(var5, var7, var6 + 128)) { // L: 1503 return false; } } - if (var1 > 0) { // L: 1490 - if (!this.method3188(var5, var8, var6)) { // L: 1491 + if (var1 > 0) { // L: 1505 + if (!this.method3269(var5, var8, var6)) { // L: 1506 return false; } - if (!this.method3188(var5, var8, var6 + 128)) { // L: 1492 + if (!this.method3269(var5, var8, var6 + 128)) { // L: 1507 return false; } } - if (!this.method3188(var5, var9, var6)) { // L: 1494 + if (!this.method3269(var5, var9, var6)) { // L: 1509 return false; } - if (!this.method3188(var5, var9, var6 + 128)) { // L: 1495 + if (!this.method3269(var5, var9, var6 + 128)) { // L: 1510 return false; } - return true; // L: 1496 + return true; // L: 1511 } - if (var4 == 2) { // L: 1498 - if (var6 < Scene_cameraZ) { // L: 1499 - if (!this.method3188(var5, var7, var6 + 128)) { // L: 1500 + if (var4 == 2) { // L: 1513 + if (var6 < Scene_cameraZ) { // L: 1514 + if (!this.method3269(var5, var7, var6 + 128)) { // L: 1515 return false; } - if (!this.method3188(var5 + 128, var7, var6 + 128)) { // L: 1501 + if (!this.method3269(var5 + 128, var7, var6 + 128)) { // L: 1516 return false; } } - if (var1 > 0) { // L: 1503 - if (!this.method3188(var5, var8, var6 + 128)) { // L: 1504 + if (var1 > 0) { // L: 1518 + if (!this.method3269(var5, var8, var6 + 128)) { // L: 1519 return false; } - if (!this.method3188(var5 + 128, var8, var6 + 128)) { // L: 1505 + if (!this.method3269(var5 + 128, var8, var6 + 128)) { // L: 1520 return false; } } - if (!this.method3188(var5, var9, var6 + 128)) { // L: 1507 + if (!this.method3269(var5, var9, var6 + 128)) { // L: 1522 return false; } - if (!this.method3188(var5 + 128, var9, var6 + 128)) { // L: 1508 + if (!this.method3269(var5 + 128, var9, var6 + 128)) { // L: 1523 return false; } - return true; // L: 1509 + return true; // L: 1524 } - if (var4 == 4) { // L: 1511 - if (var5 < Scene_cameraX) { // L: 1512 - if (!this.method3188(var5 + 128, var7, var6)) { // L: 1513 + if (var4 == 4) { // L: 1526 + if (var5 < Scene_cameraX) { // L: 1527 + if (!this.method3269(var5 + 128, var7, var6)) { // L: 1528 return false; } - if (!this.method3188(var5 + 128, var7, var6 + 128)) { // L: 1514 + if (!this.method3269(var5 + 128, var7, var6 + 128)) { // L: 1529 return false; } } - if (var1 > 0) { // L: 1516 - if (!this.method3188(var5 + 128, var8, var6)) { // L: 1517 + if (var1 > 0) { // L: 1531 + if (!this.method3269(var5 + 128, var8, var6)) { // L: 1532 return false; } - if (!this.method3188(var5 + 128, var8, var6 + 128)) { // L: 1518 + if (!this.method3269(var5 + 128, var8, var6 + 128)) { // L: 1533 return false; } } - if (!this.method3188(var5 + 128, var9, var6)) { // L: 1520 + if (!this.method3269(var5 + 128, var9, var6)) { // L: 1535 return false; } - if (!this.method3188(var5 + 128, var9, var6 + 128)) { // L: 1521 + if (!this.method3269(var5 + 128, var9, var6 + 128)) { // L: 1536 return false; } - return true; // L: 1522 + return true; // L: 1537 } - if (var4 == 8) { // L: 1524 - if (var6 > Scene_cameraZ) { // L: 1525 - if (!this.method3188(var5, var7, var6)) { // L: 1526 + if (var4 == 8) { // L: 1539 + if (var6 > Scene_cameraZ) { // L: 1540 + if (!this.method3269(var5, var7, var6)) { // L: 1541 return false; } - if (!this.method3188(var5 + 128, var7, var6)) { // L: 1527 + if (!this.method3269(var5 + 128, var7, var6)) { // L: 1542 return false; } } - if (var1 > 0) { // L: 1529 - if (!this.method3188(var5, var8, var6)) { // L: 1530 + if (var1 > 0) { // L: 1544 + if (!this.method3269(var5, var8, var6)) { // L: 1545 return false; } - if (!this.method3188(var5 + 128, var8, var6)) { // L: 1531 + if (!this.method3269(var5 + 128, var8, var6)) { // L: 1546 return false; } } - if (!this.method3188(var5, var9, var6)) { // L: 1533 + if (!this.method3269(var5, var9, var6)) { // L: 1548 return false; } - if (!this.method3188(var5 + 128, var9, var6)) { // L: 1534 + if (!this.method3269(var5 + 128, var9, var6)) { // L: 1549 return false; } - return true; // L: 1535 + return true; // L: 1550 } } - if (!this.method3188(var5 + 64, var10, var6 + 64)) { // L: 1538 + if (!this.method3269(var5 + 64, var10, var6 + 64)) { // L: 1553 return false; - } else if (var4 == 16) { // L: 1539 - return this.method3188(var5, var9, var6 + 128); // L: 1540 - } else if (var4 == 32) { // L: 1543 - return this.method3188(var5 + 128, var9, var6 + 128); // L: 1544 - } else if (var4 == 64) { // L: 1547 - return this.method3188(var5 + 128, var9, var6); // L: 1548 - } else if (var4 == 128) { // L: 1551 - return this.method3188(var5, var9, var6); // L: 1552 + } else if (var4 == 16) { // L: 1554 + return this.method3269(var5, var9, var6 + 128); // L: 1555 + } else if (var4 == 32) { // L: 1558 + return this.method3269(var5 + 128, var9, var6 + 128); // L: 1559 + } else if (var4 == 64) { // L: 1562 + return this.method3269(var5 + 128, var9, var6); // L: 1563 + } else if (var4 == 128) { // L: 1566 + return this.method3269(var5, var9, var6); // L: 1567 } else { - return true; // L: 1555 + return true; // L: 1570 } } } - @ObfuscatedName("bj") - boolean method3238(int var1, int var2, int var3, int var4) { - if (!this.method3236(var1, var2, var3)) { // L: 1559 + @ObfuscatedName("bf") + boolean method3325(int var1, int var2, int var3, int var4) { + if (!this.method3265(var1, var2, var3)) { // L: 1574 return false; } else { - int var5 = var2 << 7; // L: 1560 - int var6 = var3 << 7; // L: 1561 - return this.method3188(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 + int var5 = var2 << 7; // L: 1575 + int var6 = var3 << 7; // L: 1576 + return this.method3269(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3269(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3269(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3269(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1577 } } - @ObfuscatedName("bh") - boolean method3297(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bp") + boolean method3343(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1567 - if (!this.method3236(var1, var2, var4)) { // L: 1568 + if (var3 == var2 && var5 == var4) { // L: 1582 + if (!this.method3265(var1, var2, var4)) { // L: 1583 return false; } else { - var7 = var2 << 7; // L: 1569 - var8 = var4 << 7; // L: 1570 - return this.method3188(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3188(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 + var7 = var2 << 7; // L: 1584 + var8 = var4 << 7; // L: 1585 + return this.method3269(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3269(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3269(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3269(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1586 } } else { - for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 - for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 - if (this.field1841[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 + for (var7 = var2; var7 <= var3; ++var7) { // L: 1589 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1590 + if (this.field1837[var1][var7][var8] == -Scene_drawnCount) { // L: 1591 return false; } } } - var7 = (var2 << 7) + 1; // L: 1579 - var8 = (var4 << 7) + 2; // L: 1580 - int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 - if (!this.method3188(var7, var9, var8)) { // L: 1582 + var7 = (var2 << 7) + 1; // L: 1594 + var8 = (var4 << 7) + 2; // L: 1595 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1596 + if (!this.method3269(var7, var9, var8)) { // L: 1597 return false; } else { - int var10 = (var3 << 7) - 1; // L: 1583 - if (!this.method3188(var10, var9, var8)) { // L: 1584 + int var10 = (var3 << 7) - 1; // L: 1598 + if (!this.method3269(var10, var9, var8)) { // L: 1599 return false; } else { - int var11 = (var5 << 7) - 1; // L: 1585 - if (!this.method3188(var7, var9, var11)) { // L: 1586 + int var11 = (var5 << 7) - 1; // L: 1600 + if (!this.method3269(var7, var9, var11)) { // L: 1601 return false; - } else if (!this.method3188(var10, var9, var11)) { // L: 1587 + } else if (!this.method3269(var10, var9, var11)) { // L: 1602 return false; } else { - return true; // L: 1588 + return true; // L: 1603 } } } } } - @ObfuscatedName("bi") - boolean method3188(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 - Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 + @ObfuscatedName("bg") + boolean method3269(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1607 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1608 int var6; int var7; int var8; int var9; int var10; - if (var5.field1941 == 1) { // L: 1594 - var6 = var5.minX - var1; // L: 1595 - if (var6 > 0) { // L: 1596 - var7 = (var6 * var5.field1944 >> 8) + var5.minZ; // L: 1597 - var8 = (var6 * var5.field1945 >> 8) + var5.maxZ; // L: 1598 - var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1599 - var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1600 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 + if (var5.field1931 == 1) { // L: 1609 + var6 = var5.minX - var1; // L: 1610 + if (var6 > 0) { // L: 1611 + var7 = (var6 * var5.field1920 >> 8) + var5.minZ; // L: 1612 + var8 = (var6 * var5.field1932 >> 8) + var5.maxZ; // L: 1613 + var9 = (var6 * var5.field1936 >> 8) + var5.minY; // L: 1614 + var10 = (var6 * var5.field1937 >> 8) + var5.maxY; // L: 1615 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1616 return true; } } - } else if (var5.field1941 == 2) { // L: 1605 - var6 = var1 - var5.minX; // L: 1606 - if (var6 > 0) { // L: 1607 - var7 = (var6 * var5.field1944 >> 8) + var5.minZ; // L: 1608 - var8 = (var6 * var5.field1945 >> 8) + var5.maxZ; // L: 1609 - var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1610 - var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1611 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 + } else if (var5.field1931 == 2) { // L: 1620 + var6 = var1 - var5.minX; // L: 1621 + if (var6 > 0) { // L: 1622 + var7 = (var6 * var5.field1920 >> 8) + var5.minZ; // L: 1623 + var8 = (var6 * var5.field1932 >> 8) + var5.maxZ; // L: 1624 + var9 = (var6 * var5.field1936 >> 8) + var5.minY; // L: 1625 + var10 = (var6 * var5.field1937 >> 8) + var5.maxY; // L: 1626 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1627 return true; } } - } else if (var5.field1941 == 3) { // L: 1616 - var6 = var5.minZ - var3; // L: 1617 - if (var6 > 0) { // L: 1618 - var7 = (var6 * var5.field1946 >> 8) + var5.minX; // L: 1619 - var8 = (var6 * var5.field1943 >> 8) + var5.maxX; // L: 1620 - var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1621 - var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1622 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 + } else if (var5.field1931 == 3) { // L: 1631 + var6 = var5.minZ - var3; // L: 1632 + if (var6 > 0) { // L: 1633 + var7 = (var6 * var5.field1925 >> 8) + var5.minX; // L: 1634 + var8 = (var6 * var5.field1933 >> 8) + var5.maxX; // L: 1635 + var9 = (var6 * var5.field1936 >> 8) + var5.minY; // L: 1636 + var10 = (var6 * var5.field1937 >> 8) + var5.maxY; // L: 1637 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1638 return true; } } - } else if (var5.field1941 == 4) { // L: 1627 - var6 = var3 - var5.minZ; // L: 1628 - if (var6 > 0) { // L: 1629 - var7 = (var6 * var5.field1946 >> 8) + var5.minX; // L: 1630 - var8 = (var6 * var5.field1943 >> 8) + var5.maxX; // L: 1631 - var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1632 - var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1633 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 + } else if (var5.field1931 == 4) { // L: 1642 + var6 = var3 - var5.minZ; // L: 1643 + if (var6 > 0) { // L: 1644 + var7 = (var6 * var5.field1925 >> 8) + var5.minX; // L: 1645 + var8 = (var6 * var5.field1933 >> 8) + var5.maxX; // L: 1646 + var9 = (var6 * var5.field1936 >> 8) + var5.minY; // L: 1647 + var10 = (var6 * var5.field1937 >> 8) + var5.maxY; // L: 1648 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1649 return true; } } - } else if (var5.field1941 == 5) { // L: 1638 - var6 = var2 - var5.minY; // L: 1639 - if (var6 > 0) { // L: 1640 - var7 = (var6 * var5.field1946 >> 8) + var5.minX; // L: 1641 - var8 = (var6 * var5.field1943 >> 8) + var5.maxX; // L: 1642 - var9 = (var6 * var5.field1944 >> 8) + var5.minZ; // L: 1643 - var10 = (var6 * var5.field1945 >> 8) + var5.maxZ; // L: 1644 - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 + } else if (var5.field1931 == 5) { // L: 1653 + var6 = var2 - var5.minY; // L: 1654 + if (var6 > 0) { // L: 1655 + var7 = (var6 * var5.field1925 >> 8) + var5.minX; // L: 1656 + var8 = (var6 * var5.field1933 >> 8) + var5.maxX; // L: 1657 + var9 = (var6 * var5.field1920 >> 8) + var5.minZ; // L: 1658 + var10 = (var6 * var5.field1932 >> 8) + var5.maxZ; // L: 1659 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1660 return true; } } } } - return false; // L: 1650 + return false; // L: 1665 } - @ObfuscatedName("t") + @ObfuscatedName("m") + @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(); // L: 149 - var8.minTileX = var2 / 128; // L: 150 - var8.maxTileX = var3 / 128; // L: 151 - var8.minTileY = var4 / 128; // L: 152 - var8.maxTileY = var5 / 128; // L: 153 - var8.type = var1; // L: 154 - var8.minX = var2; // L: 155 - var8.maxX = var3; // L: 156 - var8.minZ = var4; // L: 157 - var8.maxZ = var5; // L: 158 - var8.minY = var6; // L: 159 - var8.maxY = var7; // L: 160 - Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161 - } // L: 162 + Occluder var8 = new Occluder(); // L: 154 + var8.minTileX = var2 / 128; // L: 155 + var8.maxTileX = var3 / 128; // L: 156 + var8.minTileY = var4 / 128; // L: 157 + var8.maxTileY = var5 / 128; // L: 158 + var8.type = var1; // L: 159 + var8.minX = var2; // L: 160 + var8.maxX = var3; // L: 161 + var8.minZ = var4; // L: 162 + var8.maxZ = var5; // L: 163 + var8.minY = var6; // L: 164 + var8.maxY = var7; // L: 165 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 166 + } // L: 167 - @ObfuscatedName("av") + @ObfuscatedName("ax") + @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; // L: 638 - Scene_viewportYMin = 0; // L: 639 - Scene_viewportXMax = var3; // L: 640 - Scene_viewportYMax = var4; // L: 641 - Scene_viewportXCenter = var3 / 2; // L: 642 - Scene_viewportYCenter = var4 / 2; // L: 643 - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644 + Scene_viewportXMin = 0; // L: 653 + Scene_viewportYMin = 0; // L: 654 + Scene_viewportXMax = var3; // L: 655 + Scene_viewportYMax = var4; // L: 656 + Scene_viewportXCenter = var3 / 2; // L: 657 + Scene_viewportYCenter = var4 / 2; // L: 658 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 659 int var6; int var7; @@ -2369,133 +2462,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645 - for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650 - var8 = (var6 - 128) / 32; // L: 651 - var9 = var7 / 64; // L: 652 + for (var6 = 128; var6 <= 383; var6 += 32) { // L: 660 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 661 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 662 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 663 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 664 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 665 + var8 = (var6 - 128) / 32; // L: 666 + var9 = var7 / 64; // L: 667 - for (int var10 = -26; var10 < 26; ++var10) { // L: 653 - for (var11 = -26; var11 < 26; ++var11) { // L: 654 - var12 = var10 * 128; // L: 655 - int var13 = var11 * 128; // L: 656 - boolean var14 = false; // L: 657 + for (int var10 = -26; var10 < 26; ++var10) { // L: 668 + for (var11 = -26; var11 < 26; ++var11) { // L: 669 + var12 = var10 * 128; // L: 670 + int var13 = var11 * 128; // L: 671 + boolean var14 = false; // L: 672 - for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 - if (method3229(var12, var0[var8] + var15, var13)) { // L: 659 - var14 = true; // L: 660 + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 673 + if (method3309(var12, var0[var8] + var15, var13)) { // L: 674 + var14 = true; // L: 675 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 679 } } } } - for (var6 = 0; var6 < 8; ++var6) { // L: 669 - for (var7 = 0; var7 < 32; ++var7) { // L: 670 - for (var8 = -25; var8 < 25; ++var8) { // L: 671 - for (var9 = -25; var9 < 25; ++var9) { // L: 672 - boolean var16 = false; // L: 673 + for (var6 = 0; var6 < 8; ++var6) { // L: 684 + for (var7 = 0; var7 < 32; ++var7) { // L: 685 + for (var8 = -25; var8 < 25; ++var8) { // L: 686 + for (var9 = -25; var9 < 25; ++var9) { // L: 687 + boolean var16 = false; // L: 688 - label85: - for (var11 = -1; var11 <= 1; ++var11) { // L: 674 - for (var12 = -1; var12 <= 1; ++var12) { // L: 675 - if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676 - var16 = true; // L: 677 - break label85; + label83: + for (var11 = -1; var11 <= 1; ++var11) { // L: 689 + for (var12 = -1; var12 <= 1; ++var12) { // L: 690 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 691 + var16 = true; // L: 692 + break label83; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680 - var16 = true; // L: 681 - break label85; // L: 682 + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 695 + var16 = true; // L: 696 + break label83; // L: 697 } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684 - var16 = true; // L: 685 - break label85; // L: 686 + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 699 + var16 = true; // L: 700 + break label83; // L: 701 } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688 - var16 = true; // L: 689 - break label85; // L: 690 + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 703 + var16 = true; // L: 704 + break label83; // L: 705 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 709 } } } } - } // L: 699 + } // L: 714 - @ObfuscatedName("ax") - static boolean method3229(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702 - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703 - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704 - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 705 - if (var5 >= 50 && var5 <= 3500) { // L: 706 - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 707 - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 708 - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 709 + @ObfuscatedName("ag") + static boolean method3309(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 717 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 718 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 719 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 720 + if (var5 >= 50 && var5 <= 3500) { // L: 721 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 722 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 723 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 724 } else { - return false; // L: 710 + return false; // L: 725 } } - @ObfuscatedName("ad") + @ObfuscatedName("an") + @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 729 + return viewportWalking && Scene_selectedX != -1; // L: 744 } - @ObfuscatedName("ai") - public static void method3360() { - Scene_selectedX = -1; // L: 733 - viewportWalking = false; // L: 734 - } // L: 735 + @ObfuscatedName("am") + public static void method3253() { + Scene_selectedX = -1; // L: 748 + viewportWalking = false; // L: 749 + } // L: 750 - @ObfuscatedName("ak") - static final int method3355(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1340 - if (var1 < 2) { // L: 1341 + @ObfuscatedName("ae") + static final int method3262(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1355 + if (var1 < 2) { // L: 1356 var1 = 2; - } else if (var1 > 126) { // L: 1342 + } else if (var1 > 126) { // L: 1357 var1 = 126; } - return (var0 & 65408) + var1; // L: 1343 + return (var0 & 65408) + var1; // L: 1358 } - @ObfuscatedName("ac") + @ObfuscatedName("al") + @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) { // L: 1347 + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1362 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1363 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1364 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1365 return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351 - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352 - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353 - if (var8 == 0) { // L: 1354 - if (var9 != 0) { // L: 1357 - return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358 + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1366 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1367 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1368 + if (var8 == 0) { // L: 1369 + if (var9 != 0) { // L: 1372 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1373 } else { - return true; // L: 1360 + return true; // L: 1375 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1370 } } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 3c533cd205..45166922ea 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -1,186 +1,182 @@ +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("cy") +@ObfuscatedName("co") +@Implements("Script") public class Script extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) + @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = 1391677451 - ) - static int selectedItemId; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("opcodes") int[] opcodes; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("intOperands") int[] intOperands; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1204485325 + intValue = -289623255 ) + @Export("localIntCount") int localIntCount; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1685131019 + intValue = -1416487067 ) + @Export("localStringCount") int localStringCount; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1488258005 + intValue = -1408552327 ) + @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 395196509 + intValue = 1198237171 ) + @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "[Llq;" + descriptor = "[Lll;" ) + @Export("switches") IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); // L: 12 + Script_cached = new EvictingDualNodeHashTable(128); } Script() { - } + } // L: 22 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)[Llq;", - garbageValue = "-502401324" + descriptor = "(II)[Lll;", + garbageValue = "20409592" ) + @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 153 + return new IterableNodeHashTable[var1]; // L: 125 } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lby;B)V", - garbageValue = "-76" - ) - public static void runScriptEvent(ScriptEvent var0) { - class280.runScript(var0, 500000); // L: 97 + @ObfuscatedName("f") + static double method2356(double var0, double var2, double var4) { + double var8 = (var0 - var2) / var4; // L: 10 + double var6 = Math.exp(var8 * -var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12 + return var6 / var4; // L: 14 } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IB)Lib;", - garbageValue = "-77" + descriptor = "(ILco;ZI)I", + garbageValue = "1422774584" ) - public static VarcInt method2324(int var0) { - VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 17 - if (var1 != null) { // L: 18 - return var1; - } else { - byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); - var1 = new VarcInt(); - if (var2 != null) { // L: 21 - var1.method4488(new Buffer(var2)); - } - - VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 22 - return var1; // L: 23 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "-1494987066" - ) - public static void method2325(AbstractArchive var0) { - StructDefinition.StructDefinition_archive = var0; // L: 19 - } // L: 20 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZB)[B", - garbageValue = "15" - ) - public static byte[] method2323(Object var0, boolean var1) { - if (var0 == null) { // L: 30 - return null; - } else if (var0 instanceof byte[]) { // L: 31 - byte[] var6 = (byte[])((byte[])var0); // L: 32 - if (var1) { // L: 33 - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; + static int method2355(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 430 + MilliClock.Interpreter_intStackSize -= 3; // L: 431 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 432 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 433 + int var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 434 + if (var4 == 0) { // L: 435 + throw new RuntimeException(); // L: 436 } else { - return var6; // L: 43 - } - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 45 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 46 - return var2.get(); // L: 47 - } else { - throw new IllegalArgumentException(); // L: 49 - } - } + Widget var6 = UserComparator4.getWidget(var9); // L: 438 + if (var6.children == null) { // L: 439 + var6.children = new Widget[var11 + 1]; + } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lic;IIIZI)V", - garbageValue = "1897584620" - ) - public static void method2322(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class206.musicPlayerStatus = 1; // L: 34 - class204.musicTrackArchive = var0; // L: 35 - BuddyRankComparator.musicTrackGroupId = var1; // L: 36 - class206.musicTrackFileId = var2; // L: 37 - Tiles.musicTrackVolume = var3; // L: 38 - class206.musicTrackBoolean = var4; // L: 39 - FaceNormal.pcmSampleLength = 10000; // L: 40 - } // L: 41 + if (var6.children.length <= var11) { // L: 440 + Widget[] var7 = new Widget[var11 + 1]; // L: 441 - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "934802837" - ) - public static boolean method2326() { - try { - if (class206.musicPlayerStatus == 2) { // L: 93 - if (class206.musicTrack == null) { // L: 94 - class206.musicTrack = MusicTrack.readTrack(class204.musicTrackArchive, BuddyRankComparator.musicTrackGroupId, class206.musicTrackFileId); // L: 95 - if (class206.musicTrack == null) { // L: 96 - return false; + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 442 + var7[var8] = var6.children[var8]; } + + var6.children = var7; // L: 443 } - if (class39.soundCache == null) { // L: 98 - class39.soundCache = new SoundCache(ModelData0.soundEffectsArchive, class206.musicSamplesArchive); - } + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 445 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 446 + var12.type = var4; // L: 447 + var12.parentId = var12.id = var6.id; // L: 448 + var12.childIndex = var11; // L: 449 + var12.isIf3 = true; // L: 450 + var6.children[var11] = var12; // L: 451 + if (var2) { // L: 452 + MouseRecorder.field621 = var12; + } else { + Interpreter.field1122 = var12; // L: 453 + } - if (class206.midiPcmStream.loadMusicTrack(class206.musicTrack, class206.musicPatchesArchive, class39.soundCache, 22050)) { // L: 99 - class206.midiPcmStream.clearAll(); // L: 100 - class206.midiPcmStream.setPcmStreamVolume(Tiles.musicTrackVolume); // L: 101 - class206.midiPcmStream.setMusicTrack(class206.musicTrack, class206.musicTrackBoolean); // L: 102 - class206.musicPlayerStatus = 0; // L: 103 - class206.musicTrack = null; // L: 104 - class39.soundCache = null; // L: 105 - class204.musicTrackArchive = null; // L: 106 - return true; // L: 107 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var6); // L: 454 + return 1; // L: 455 } } - } catch (Exception var1) { // L: 111 - var1.printStackTrace(); // L: 112 - class206.midiPcmStream.clear(); // L: 113 - class206.musicPlayerStatus = 0; // L: 114 - class206.musicTrack = null; // L: 115 - class39.soundCache = null; // L: 116 - class204.musicTrackArchive = null; // L: 117 - } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 457 + var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 458 + Widget var10 = UserComparator4.getWidget(var3.id); // L: 459 + var10.children[var3.childIndex] = null; // L: 460 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); // L: 461 + return 1; // L: 462 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 464 + var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 465 + var3.children = null; // L: 466 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 467 + return 1; // L: 468 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 470 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 483 + var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 484 + if (var3 != null) { // L: 485 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; // L: 486 + if (var2) { // L: 487 + MouseRecorder.field621 = var3; + } else { + Interpreter.field1122 = var3; // L: 488 + } + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 490 + } - return false; // L: 119 + return 1; // L: 491 + } else { + return 2; // L: 493 + } + } else { + MilliClock.Interpreter_intStackSize -= 2; // L: 471 + var9 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 472 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 473 + Widget var5 = ItemContainer.getWidgetChild(var9, var4); // L: 474 + if (var5 != null && var4 != -1) { // L: 475 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; // L: 476 + if (var2) { // L: 477 + MouseRecorder.field621 = var5; + } else { + Interpreter.field1122 = var5; // L: 478 + } + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 480 + } + + return 1; // L: 481 + } + } } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index d2b5182e42..01a304896b 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -1,141 +1,174 @@ +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("by") +@ObfuscatedName("bd") +@Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("sz") - @ObfuscatedGetter( - intValue = 1903848297 - ) - static int foundItemIndex; - @ObfuscatedName("h") + @ObfuscatedName("hk") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "[Llc;" ) - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("dq") - static boolean mouseCam; - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "Lec;" - ) - static Scene scene; - @ObfuscatedName("gy") - @ObfuscatedGetter( - intValue = -1883417759 - ) - static int field597; - @ObfuscatedName("z") + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; + @ObfuscatedName("f") + @Export("args") Object[] args; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lht;" ) + @Export("widget") Widget widget; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2100516553 + intValue = -2101178453 ) + @Export("mouseX") int mouseX; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1832434813 + intValue = 405456203 ) + @Export("mouseY") int mouseY; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 88513801 + ) + @Export("opIndex") + int opIndex; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("dragTarget") + Widget dragTarget; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 303757317 + ) + @Export("keyTyped") + int keyTyped; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -844549747 + ) + @Export("keyPressed") + int keyPressed; + @ObfuscatedName("t") + @Export("targetName") + String targetName; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1420605637 + ) + int field600; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -720675073 - ) - int opIndex; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - Widget dragTarget; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1621651451 - ) - int keyTyped; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -582654831 - ) - int keyPressed; - @ObfuscatedName("m") - String targetName; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -735061669 - ) - int field593; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 926169729 + intValue = -1188452695 ) + @Export("type") int type; public ScriptEvent() { this.type = 76; // L: 19 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "-1399912972" + descriptor = "([Ljava/lang/Object;S)V", + garbageValue = "31204" ) + @Export("setArgs") public void setArgs(Object[] var1) { - this.args = var1; // L: 22 - } // L: 23 + this.args = var1; + } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-802645814" + garbageValue = "-370918947" ) + @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;B)Ljava/lang/String;", - garbageValue = "-64" + descriptor = "(IB)Lje;", + garbageValue = "-32" ) - public static String method1235(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); // L: 25 - if (var2 > 32767) { // L: 26 - var2 = 32767; + @Export("getObjectDefinition") + public static ObjectDefinition getObjectDefinition(int var0) { + ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); // L: 72 + if (var1 != null) { // L: 73 + return var1; + } else { + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); // L: 74 + var1 = new ObjectDefinition(); // L: 75 + var1.id = var0; // L: 76 + if (var2 != null) { // L: 77 + var1.decode(new Buffer(var2)); } - byte[] var3 = new byte[var2]; // L: 27 - var0.offset += class219.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 28 - String var4 = SpotAnimationDefinition.decodeStringCp1252(var3, 0, var2); // L: 29 - var1 = var4; // L: 30 - } catch (Exception var6) { // L: 32 - var1 = "Cabbage"; // L: 33 - } + var1.postDecode(); // L: 78 + if (var1.isSolid) { // L: 79 + var1.interactType = 0; // L: 80 + var1.boolean1 = false; // L: 81 + } - return var1; // L: 36 + ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); // L: 83 + return var1; // L: 84 + } } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(CII)Ljava/lang/String;", - garbageValue = "-1474859384" + descriptor = "(I)[Lir;", + garbageValue = "2092789749" ) - static String method1236(char var0, int var1) { - char[] var2 = new char[var1]; // L: 173 + static VerticalAlignment[] method1279() { + return new VerticalAlignment[]{VerticalAlignment.field3223, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3226}; // L: 14 + } - for (int var3 = 0; var3 < var1; ++var3) { // L: 174 - var2[var3] = var0; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Lit;", + garbageValue = "2033153348" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 + var1 = new InvDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } + } + + @ObfuscatedName("kn") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-6" + ) + static void method1282() { + if (Client.oculusOrbState == 1) { // L: 11669 + Client.field725 = true; // L: 11670 } - return new String(var2); // L: 175 - } + } // L: 11672 } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index c12e87012d..1514e07315 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -1,82 +1,133 @@ -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("ba") +@ObfuscatedName("bm") +@Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lcy;" - ) - Script script; - @ObfuscatedName("k") + @ObfuscatedName("ea") @ObfuscatedGetter( - intValue = 394588123 + intValue = 1760304111 ) + static int field552; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lco;" + ) + @Export("script") + Script script; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1649848391 + ) + @Export("pc") int pc; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("intLocals") int[] intLocals; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("stringLocals") String[] stringLocals; ScriptFrame() { this.pc = -1; // L: 5 } // L: 9 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1817871528" + descriptor = "(Liw;I)V", + garbageValue = "181624025" ) - static boolean loadWorlds() { - try { - if (WorldMapScaleHandler.World_request == null) { // L: 31 - WorldMapScaleHandler.World_request = UserComparator4.urlRequester.request(new URL(BZip2State.worldListURL)); - } else if (WorldMapScaleHandler.World_request.isDone()) { // L: 33 - byte[] var0 = WorldMapScaleHandler.World_request.getResponse(); // L: 34 - Buffer var1 = new Buffer(var0); // L: 35 - var1.readInt(); // L: 36 - World.World_count = var1.readUnsignedShort(); // L: 37 - AbstractByteArrayCopier.World_worlds = new World[World.World_count]; // L: 38 + public static void method1224(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 21 + } // L: 22 - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 - var3 = AbstractByteArrayCopier.World_worlds[var2] = new World(); // L: 40 - var3.id = var1.readUnsignedShort(); // L: 41 - var3.properties = var1.readInt(); // L: 42 - var3.host = var1.readStringCp1252NullTerminated(); // L: 43 - var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 - var3.location = var1.readUnsignedByte(); // L: 45 - var3.population = var1.readShort(); // L: 46 - } - - FloorDecoration.sortWorlds(AbstractByteArrayCopier.World_worlds, 0, AbstractByteArrayCopier.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - WorldMapScaleHandler.World_request = null; // L: 50 - return true; // L: 51 - } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - WorldMapScaleHandler.World_request = null; // L: 57 - } - - return false; // L: 59 + @ObfuscatedName("l") + public static int method1228(long var0) { + return (int)(var0 >>> 0 & 127L); // L: 52 } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "75" + descriptor = "(II)Z", + garbageValue = "-1190180925" ) - static void method1192() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 217 - if (Tile.clientPreferences.rememberedUsername != null) { // L: 218 - Login.Login_username = Tile.clientPreferences.rememberedUsername; // L: 219 - Client.Login_isUsernameRemembered = true; // L: 220 + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Widget.Widget_loadedInterfaces[var0]) { // L: 212 + return true; + } else if (!Decimator.Widget_archive.tryLoadGroup(var0)) { // L: 213 + return false; + } else { + int var1 = Decimator.Widget_archive.getGroupFileCount(var0); // L: 214 + if (var1 == 0) { // L: 215 + Widget.Widget_loadedInterfaces[var0] = true; // L: 216 + return true; // L: 217 } else { - Client.Login_isUsernameRemembered = false; // L: 222 - } + if (Widget.Widget_interfaceComponents[var0] == null) { // L: 219 + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } + for (int var2 = 0; var2 < var1; ++var2) { // L: 220 + if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 221 + byte[] var3 = Decimator.Widget_archive.takeFile(var0, var2); // L: 222 + if (var3 != null) { // L: 223 + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 224 + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 225 + if (var3[0] == -1) { // L: 226 + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 227 + } + } + } + } + + Widget.Widget_loadedInterfaces[var0] = true; // L: 231 + return true; // L: 232 + } } - } // L: 223 + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-398927315" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 3836 + if (loadInterface(var0)) { // L: 3837 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 3838 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 3839 + Widget var3 = var1[var2]; // L: 3840 + if (var3.onLoad != null) { // L: 3841 + ScriptEvent var4 = new ScriptEvent(); // L: 3842 + var4.widget = var3; // L: 3843 + var4.args = var3.onLoad; // L: 3844 + class58.runScript(var4, 5000000); // L: 3845 + } + } + + } + } + } // L: 3848 + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-3110189" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (DevicePcmPlayerProvider.clanChat != null) { // L: 11494 + PacketBufferNode var1 = class4.getPacketBufferNode(ClientPacket.field2333, Client.packetWriter.isaacCipher); // L: 11495 + var1.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var0)); // L: 11496 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11497 + Client.packetWriter.addNode(var1); // L: 11498 + } + } // L: 11499 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 1c6295e837..bbca859b80 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,961 +1,165 @@ +import java.io.File; +import java.io.IOException; 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("bm") +@ObfuscatedName("by") +@Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 2147326651 + ) + static int field553; + @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = 417708035 + ) + public static int field555; + SecureRandomCallable() { } // L: 36 public Object call() { - return BoundaryObject.method3387(); // L: 45 + return ServerPacket.method3740(); // L: 45 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIB)Lhq;", - garbageValue = "105" + descriptor = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "-2079268292" ) - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = TileItem.getWidget(var0); // L: 196 - if (var1 == -1) { // L: 197 - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 198 199 - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2101058473" - ) - static void method1204(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 306 - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 307 - if (var4 != null) { // L: 308 - NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 309 - } - } // L: 310 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "207665946" - ) - static int method1200(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 945 - var0 -= 1000; // L: 946 - var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 947 - } else { - var3 = var2 ? Canvas.field438 : class3.field12; // L: 949 - } - - String var4 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 950 - int[] var5 = null; // L: 951 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 952 - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 953 - if (var6 > 0) { // L: 954 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { // L: 955 956 - } + static void method1237(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(class277.JagexCache_locationFile, "rw", 10000L); // L: 237 + Buffer var3 = new Buffer(500); // L: 238 + var3.writeByte(3); // L: 239 + var3.writeByte(var1 != null ? 1 : 0); // L: 240 + var3.writeCESU8(var0.getPath()); // L: 241 + if (var1 != null) { + var3.writeCESU8(""); // L: 242 } - var4 = var4.substring(0, var4.length() - 1); // L: 958 + var2.write(var3.array, 0, var3.offset); // L: 243 + var2.close(); // L: 244 + } catch (IOException var4) { // L: 246 + var4.printStackTrace(); // L: 247 } - Object[] var8 = new Object[var4.length() + 1]; // L: 960 + } // L: 249 - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 961 - if (var4.charAt(var7 - 1) == 's') { // L: 962 - var8[var7] = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 963 - } - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 965 - if (var7 != -1) { // L: 966 - var8[0] = new Integer(var7); - } else { - var8 = null; // L: 967 - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 968 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 969 - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 970 - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 971 - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 972 - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 973 - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 974 - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 975 - var3.onVarTransmit = var8; // L: 976 - var3.varTransmitTriggers = var5; // L: 977 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 979 - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 980 - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 981 - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 982 - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 983 - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 984 - var3.onInvTransmit = var8; // L: 985 - var3.invTransmitTriggers = var5; // L: 986 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 988 - var3.onStatTransmit = var8; // L: 989 - var3.statTransmitTriggers = var5; // L: 990 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; // L: 992 - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 993 - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 994 - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 995 - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 996 - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 997 - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 998 - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 999 - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1000 - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1001 - var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1002 - var3.field2722 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { // L: 1003 - return 2; // L: 1004 - } - - var3.onResize = var8; - } - - var3.hasListener = true; // L: 1005 - return 1; // L: 1006 - } - - @ObfuscatedName("q") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "19136770" + descriptor = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "-1129917502" ) - public static void method1203() { - Widget.Widget_cachedSprites.clear(); // L: 688 - Widget.Widget_cachedModels.clear(); // L: 689 - Widget.Widget_cachedFonts.clear(); // L: 690 - Widget.Widget_cachedSpriteMasks.clear(); // L: 691 - } // L: 692 + @Export("parseIntCustomRadix") + public static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 80 + boolean var3 = false; // L: 81 + boolean var4 = false; // L: 82 + int var5 = 0; // L: 83 + int var6 = var0.length(); - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "-990196444" - ) - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { // L: 7255 - var2 -= 2000; - } + for (int var7 = 0; var7 < var6; ++var7) { + char var8 = var0.charAt(var7); // L: 86 + if (var7 == 0) { // L: 87 + if (var8 == '-') { // L: 88 + var3 = true; // L: 89 + continue; + } - PacketBufferNode var8; - if (var2 == 1) { // L: 7256 - Client.mouseCrossX = var6; // L: 7676 - Client.mouseCrossY = var7; // L: 7677 - Client.mouseCrossColor = 2; // L: 7678 - Client.mouseCrossState = 0; // L: 7679 - Client.destinationX = var0; // L: 7680 - Client.destinationY = var1; // L: 7681 - var8 = Client.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); // L: 7683 - var8.packetBuffer.writeShort(var3); // L: 7684 - var8.packetBuffer.method5665(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7685 - var8.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7686 - var8.packetBuffer.writeShort(WorldMapLabel.baseY + var1); // L: 7687 - var8.packetBuffer.method5663(class105.selectedItemWidget); // L: 7688 - var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7689 - var8.packetBuffer.method5665(Script.selectedItemId); // L: 7690 - Client.packetWriter.addNode(var8); // L: 7691 - } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 7311 - Client.mouseCrossY = var7; // L: 7312 - Client.mouseCrossColor = 2; // L: 7313 - Client.mouseCrossState = 0; // L: 7314 - Client.destinationX = var0; // L: 7315 - Client.destinationY = var1; // L: 7316 - var8 = Client.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); // L: 7318 - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7319 - var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7320 - var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7321 - var8.packetBuffer.method5654(var3); // L: 7322 - var8.packetBuffer.method5663(class232.selectedSpellWidget); // L: 7323 - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 7324 - Client.packetWriter.addNode(var8); // L: 7325 - } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 7650 - Client.mouseCrossY = var7; // L: 7651 - Client.mouseCrossColor = 2; // L: 7652 - Client.mouseCrossState = 0; // L: 7653 - Client.destinationX = var0; // L: 7654 - Client.destinationY = var1; // L: 7655 - var8 = Client.getPacketBufferNode(ClientPacket.field2328, Client.packetWriter.isaacCipher); // L: 7657 - var8.packetBuffer.writeShort(WorldMapLabel.baseY + var1); // L: 7658 - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7659 - var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7660 - var8.packetBuffer.method5653(var3); // L: 7661 - Client.packetWriter.addNode(var8); // L: 7662 - } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 7388 - Client.mouseCrossY = var7; // L: 7389 - Client.mouseCrossColor = 2; // L: 7390 - Client.mouseCrossState = 0; // L: 7391 - Client.destinationX = var0; // L: 7392 - Client.destinationY = var1; // L: 7393 - var8 = Client.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); // L: 7395 - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7396 - var8.packetBuffer.method5654(var3); // L: 7397 - var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7398 - var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7399 - Client.packetWriter.addNode(var8); // L: 7400 - } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 7744 - Client.mouseCrossY = var7; // L: 7745 - Client.mouseCrossColor = 2; // L: 7746 - Client.mouseCrossState = 0; // L: 7747 - Client.destinationX = var0; // L: 7748 - Client.destinationY = var1; // L: 7749 - var8 = Client.getPacketBufferNode(ClientPacket.field2323, Client.packetWriter.isaacCipher); // L: 7751 - var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7752 - var8.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7753 - var8.packetBuffer.method5653(var3); // L: 7754 - var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7755 - Client.packetWriter.addNode(var8); // L: 7756 - } else if (var2 == 6) { - Client.mouseCrossX = var6; // L: 8007 - Client.mouseCrossY = var7; // L: 8008 - Client.mouseCrossColor = 2; // L: 8009 - Client.mouseCrossState = 0; // L: 8010 - Client.destinationX = var0; // L: 8011 - Client.destinationY = var1; // L: 8012 - var8 = Client.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); // L: 8014 - var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 8015 - var8.packetBuffer.method5665(var3); // L: 8016 - var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 8017 - var8.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8018 - Client.packetWriter.addNode(var8); // L: 8019 - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 7537 - if (var13 != null) { // L: 7538 - Client.mouseCrossX = var6; // L: 7539 - Client.mouseCrossY = var7; // L: 7540 - Client.mouseCrossColor = 2; // L: 7541 - Client.mouseCrossState = 0; // L: 7542 - Client.destinationX = var0; // L: 7543 - Client.destinationY = var1; // L: 7544 - var9 = Client.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); // L: 7546 - var9.packetBuffer.writeShort(var3); // L: 7547 - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7548 - var9.packetBuffer.writeInt(class105.selectedItemWidget); // L: 7549 - var9.packetBuffer.writeShort(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7550 - var9.packetBuffer.writeShort(Script.selectedItemId); // L: 7551 - Client.packetWriter.addNode(var9); // L: 7552 - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 7778 - if (var13 != null) { // L: 7779 - Client.mouseCrossX = var6; // L: 7780 - Client.mouseCrossY = var7; // L: 7781 - Client.mouseCrossColor = 2; // L: 7782 - Client.mouseCrossState = 0; // L: 7783 - Client.destinationX = var0; // L: 7784 - Client.destinationY = var1; // L: 7785 - var9 = Client.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); // L: 7787 - var9.packetBuffer.writeShortLE(class232.selectedSpellWidget); // L: 7788 - var9.packetBuffer.writeShort(var3); // L: 7789 - var9.packetBuffer.method5653(Client.selectedSpellChildIndex); // L: 7790 - var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7791 - Client.packetWriter.addNode(var9); // L: 7792 - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 7372 - if (var13 != null) { // L: 7373 - Client.mouseCrossX = var6; // L: 7374 - Client.mouseCrossY = var7; // L: 7375 - Client.mouseCrossColor = 2; // L: 7376 - Client.mouseCrossState = 0; // L: 7377 - Client.destinationX = var0; // L: 7378 - Client.destinationY = var1; // L: 7379 - var9 = Client.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); // L: 7381 - var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7382 - var9.packetBuffer.method5653(var3); // L: 7383 - Client.packetWriter.addNode(var9); // L: 7384 - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 7981 - if (var13 != null) { // L: 7982 - Client.mouseCrossX = var6; // L: 7983 - Client.mouseCrossY = var7; // L: 7984 - Client.mouseCrossColor = 2; // L: 7985 - Client.mouseCrossState = 0; // L: 7986 - Client.destinationX = var0; // L: 7987 - Client.destinationY = var1; // L: 7988 - var9 = Client.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); // L: 7990 - var9.packetBuffer.writeShort(var3); // L: 7991 - var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7992 - Client.packetWriter.addNode(var9); // L: 7993 - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 7728 - if (var13 != null) { // L: 7729 - Client.mouseCrossX = var6; // L: 7730 - Client.mouseCrossY = var7; // L: 7731 - Client.mouseCrossColor = 2; // L: 7732 - Client.mouseCrossState = 0; // L: 7733 - Client.destinationX = var0; // L: 7734 - Client.destinationY = var1; // L: 7735 - var9 = Client.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); // L: 7737 - var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7738 - var9.packetBuffer.method5654(var3); // L: 7739 - Client.packetWriter.addNode(var9); // L: 7740 - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 7419 - if (var13 != null) { // L: 7420 - Client.mouseCrossX = var6; // L: 7421 - Client.mouseCrossY = var7; // L: 7422 - Client.mouseCrossColor = 2; // L: 7423 - Client.mouseCrossState = 0; // L: 7424 - Client.destinationX = var0; // L: 7425 - Client.destinationY = var1; // L: 7426 - var9 = Client.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); // L: 7428 - var9.packetBuffer.method5665(var3); // L: 7429 - var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7430 - Client.packetWriter.addNode(var9); // L: 7431 - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 7712 - if (var13 != null) { // L: 7713 - Client.mouseCrossX = var6; // L: 7714 - Client.mouseCrossY = var7; // L: 7715 - Client.mouseCrossColor = 2; // L: 7716 - Client.mouseCrossState = 0; // L: 7717 - Client.destinationX = var0; // L: 7718 - Client.destinationY = var1; // L: 7719 - var9 = Client.getPacketBufferNode(ClientPacket.field2347, Client.packetWriter.isaacCipher); // L: 7721 - var9.packetBuffer.method5665(var3); // L: 7722 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7723 - Client.packetWriter.addNode(var9); // L: 7724 - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; // L: 7759 - if (var15 != null) { // L: 7760 - Client.mouseCrossX = var6; // L: 7761 - Client.mouseCrossY = var7; // L: 7762 - Client.mouseCrossColor = 2; // L: 7763 - Client.mouseCrossState = 0; // L: 7764 - Client.destinationX = var0; // L: 7765 - Client.destinationY = var1; // L: 7766 - var9 = Client.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); // L: 7768 - var9.packetBuffer.method5653(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7769 - var9.packetBuffer.writeShort(Script.selectedItemId); // L: 7770 - var9.packetBuffer.method5654(var3); // L: 7771 - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7772 - var9.packetBuffer.writeInt(class105.selectedItemWidget); // L: 7773 - Client.packetWriter.addNode(var9); // L: 7774 - } - } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 7694 - if (var15 != null) { // L: 7695 - Client.mouseCrossX = var6; // L: 7696 - Client.mouseCrossY = var7; // L: 7697 - Client.mouseCrossColor = 2; // L: 7698 - Client.mouseCrossState = 0; // L: 7699 - Client.destinationX = var0; // L: 7700 - Client.destinationY = var1; // L: 7701 - var9 = Client.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); // L: 7703 - var9.packetBuffer.method5663(class232.selectedSpellWidget); // L: 7704 - var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7705 - var9.packetBuffer.method5654(var3); // L: 7706 - var9.packetBuffer.method5654(Client.selectedSpellChildIndex); // L: 7707 - Client.packetWriter.addNode(var9); // L: 7708 - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 7838 - Client.mouseCrossY = var7; // L: 7839 - Client.mouseCrossColor = 2; // L: 7840 - Client.mouseCrossState = 0; // L: 7841 - Client.destinationX = var0; // L: 7842 - Client.destinationY = var1; // L: 7843 - var8 = Client.getPacketBufferNode(ClientPacket.field2348, Client.packetWriter.isaacCipher); // L: 7845 - var8.packetBuffer.writeShort(WorldMapLabel.baseY + var1); // L: 7846 - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7847 - var8.packetBuffer.method5653(Script.selectedItemId); // L: 7848 - var8.packetBuffer.writeShort(var3); // L: 7849 - var8.packetBuffer.method5654(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7850 - var8.packetBuffer.writeInt(class105.selectedItemWidget); // L: 7851 - var8.packetBuffer.writeShort(var0 + WorldMapManager.baseX); // L: 7852 - Client.packetWriter.addNode(var8); // L: 7853 - } else if (var2 == 17) { - Client.mouseCrossX = var6; // L: 7593 - Client.mouseCrossY = var7; // L: 7594 - Client.mouseCrossColor = 2; // L: 7595 - Client.mouseCrossState = 0; // L: 7596 - Client.destinationX = var0; // L: 7597 - Client.destinationY = var1; // L: 7598 - var8 = Client.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); // L: 7600 - var8.packetBuffer.writeShortLE(class232.selectedSpellWidget); // L: 7601 - var8.packetBuffer.method5653(WorldMapLabel.baseY + var1); // L: 7602 - var8.packetBuffer.method5665(Client.selectedSpellChildIndex); // L: 7603 - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7604 - var8.packetBuffer.writeShort(var3); // L: 7605 - var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7606 - Client.packetWriter.addNode(var8); // L: 7607 - } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 7918 - Client.mouseCrossY = var7; // L: 7919 - Client.mouseCrossColor = 2; // L: 7920 - Client.mouseCrossState = 0; // L: 7921 - Client.destinationX = var0; // L: 7922 - Client.destinationY = var1; // L: 7923 - var8 = Client.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 7925 - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7926 - var8.packetBuffer.method5653(var3); // L: 7927 - var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7928 - var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7929 - Client.packetWriter.addNode(var8); // L: 7930 - } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 7903 - Client.mouseCrossY = var7; // L: 7904 - Client.mouseCrossColor = 2; // L: 7905 - Client.mouseCrossState = 0; // L: 7906 - Client.destinationX = var0; // L: 7907 - Client.destinationY = var1; // L: 7908 - var8 = Client.getPacketBufferNode(ClientPacket.field2346, Client.packetWriter.isaacCipher); // L: 7910 - var8.packetBuffer.writeShort(var3); // L: 7911 - var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7912 - var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7913 - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7914 - Client.packetWriter.addNode(var8); // L: 7915 - } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 7328 - Client.mouseCrossY = var7; // L: 7329 - Client.mouseCrossColor = 2; // L: 7330 - Client.mouseCrossState = 0; // L: 7331 - Client.destinationX = var0; // L: 7332 - Client.destinationY = var1; // L: 7333 - var8 = Client.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); // L: 7335 - var8.packetBuffer.method5654(var3); // L: 7336 - var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7337 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7338 - var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7339 - Client.packetWriter.addNode(var8); // L: 7340 - } else if (var2 == 21) { - Client.mouseCrossX = var6; // L: 7888 - Client.mouseCrossY = var7; // L: 7889 - Client.mouseCrossColor = 2; // L: 7890 - Client.mouseCrossState = 0; // L: 7891 - Client.destinationX = var0; // L: 7892 - Client.destinationY = var1; // L: 7893 - var8 = Client.getPacketBufferNode(ClientPacket.field2310, Client.packetWriter.isaacCipher); // L: 7895 - var8.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7896 - var8.packetBuffer.method5654(var3); // L: 7897 - var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7898 - var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7899 - Client.packetWriter.addNode(var8); // L: 7900 - } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 7268 - Client.mouseCrossY = var7; // L: 7269 - Client.mouseCrossColor = 2; // L: 7270 - Client.mouseCrossState = 0; // L: 7271 - Client.destinationX = var0; // L: 7272 - Client.destinationY = var1; // L: 7273 - var8 = Client.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); // L: 7275 - var8.packetBuffer.method5653(var3); // L: 7276 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7277 - var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7278 - var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7279 - Client.packetWriter.addNode(var8); // L: 7280 - } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 7486 - ScriptEvent.scene.setViewportWalking(); // L: 7487 - } else { - ScriptEvent.scene.menuOpen(Huffman.Client_plane, var0, var1, true); // L: 7490 + if (var8 == '+') { // L: 92 + continue; } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 94 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 95 + var10 = var8 - '7'; } else { - PacketBufferNode var11; - Widget var16; - if (var2 == 24) { - var16 = TileItem.getWidget(var1); // L: 7665 - boolean var12 = true; // L: 7666 - if (var16.contentType > 0) { // L: 7667 - var12 = class4.method60(var16); - } - - if (var12) { // L: 7668 - var11 = Client.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); // L: 7670 - var11.packetBuffer.writeInt(var1); // L: 7671 - Client.packetWriter.addNode(var11); // L: 7672 - } - } else { - if (var2 == 25) { - var16 = getWidgetChild(var1, var0); // L: 7570 - if (var16 != null) { // L: 7571 - class22.Widget_runOnTargetLeave(); // L: 7572 - User.selectSpell(var1, var0, GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var16)), var16.itemId); // L: 7573 - Client.isItemSelected = 0; // L: 7574 - Client.selectedSpellActionName = SpriteMask.Widget_getSpellActionName(var16); // L: 7575 - if (Client.selectedSpellActionName == null) { // L: 7576 - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { // L: 7577 - Client.selectedSpellName = var16.dataText + WorldMapAreaData.colorStartTag(16777215); - } else { - Client.selectedSpellName = WorldMapAreaData.colorStartTag(65280) + var16.spellName + WorldMapAreaData.colorStartTag(16777215); // L: 7578 - } - } - - return; // L: 7580 - } - - if (var2 == 26) { - ItemContainer.method1213(); // L: 7308 - } else { - int var10; - Widget var14; - if (var2 == 28) { - var8 = Client.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); // L: 7447 - var8.packetBuffer.writeInt(var1); // L: 7448 - Client.packetWriter.addNode(var8); // L: 7449 - var14 = TileItem.getWidget(var1); // L: 7450 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 7451 - var10 = var14.cs1Instructions[0][1]; // L: 7452 - Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 7453 - Clock.changeGameOptions(var10); // L: 7454 - } - } else if (var2 == 29) { - var8 = Client.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); // L: 7825 - var8.packetBuffer.writeInt(var1); // L: 7826 - Client.packetWriter.addNode(var8); // L: 7827 - var14 = TileItem.getWidget(var1); // L: 7828 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 7829 - var10 = var14.cs1Instructions[0][1]; // L: 7830 - if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 7831 - Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 7832 - Clock.changeGameOptions(var10); // L: 7833 - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 7610 - AbstractSocket.resumePauseWidget(var1, var0); // L: 7611 - Client.meslayerContinueWidget = getWidgetChild(var1, var0); // L: 7612 - class52.invalidateWidget(Client.meslayerContinueWidget); // L: 7613 - } - } else if (var2 == 31) { - var8 = Client.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); // L: 7295 - var8.packetBuffer.method5654(var3); // L: 7296 - var8.packetBuffer.writeShortLE(class105.selectedItemWidget); // L: 7297 - var8.packetBuffer.method5665(var0); // L: 7298 - var8.packetBuffer.method5665(Script.selectedItemId); // L: 7299 - var8.packetBuffer.writeShortLE(var1); // L: 7300 - var8.packetBuffer.writeShort(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7301 - Client.packetWriter.addNode(var8); // L: 7302 - Client.field782 = 0; // L: 7303 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7304 - Client.field944 = var0; // L: 7305 - } else if (var2 == 32) { - var8 = Client.getPacketBufferNode(ClientPacket.field2335, Client.packetWriter.isaacCipher); // L: 7934 - var8.packetBuffer.method5653(var3); // L: 7935 - var8.packetBuffer.writeShortLE(class232.selectedSpellWidget); // L: 7936 - var8.packetBuffer.method5653(Client.selectedSpellChildIndex); // L: 7937 - var8.packetBuffer.writeInt(var1); // L: 7938 - var8.packetBuffer.writeShort(var0); // L: 7939 - Client.packetWriter.addNode(var8); // L: 7940 - Client.field782 = 0; // L: 7941 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7942 - Client.field944 = var0; // L: 7943 - } else if (var2 == 33) { - var8 = Client.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); // L: 7857 - var8.packetBuffer.method5665(var0); // L: 7858 - var8.packetBuffer.method5653(var3); // L: 7859 - var8.packetBuffer.writeShortLE(var1); // L: 7860 - Client.packetWriter.addNode(var8); // L: 7861 - Client.field782 = 0; // L: 7862 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7863 - Client.field944 = var0; // L: 7864 - } else if (var2 == 34) { - var8 = Client.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); // L: 7258 - var8.packetBuffer.method5662(var1); // L: 7259 - var8.packetBuffer.method5653(var0); // L: 7260 - var8.packetBuffer.method5654(var3); // L: 7261 - Client.packetWriter.addNode(var8); // L: 7262 - Client.field782 = 0; // L: 7263 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7264 - Client.field944 = var0; // L: 7265 - } else if (var2 == 35) { - var8 = Client.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); // L: 7476 - var8.packetBuffer.method5654(var3); // L: 7477 - var8.packetBuffer.writeShortLE(var1); // L: 7478 - var8.packetBuffer.method5653(var0); // L: 7479 - Client.packetWriter.addNode(var8); // L: 7480 - Client.field782 = 0; // L: 7481 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7482 - Client.field944 = var0; // L: 7483 - } else if (var2 == 36) { - var8 = Client.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); // L: 8023 - var8.packetBuffer.writeShort(var0); // L: 8024 - var8.packetBuffer.writeShort(var3); // L: 8025 - var8.packetBuffer.method5663(var1); // L: 8026 - Client.packetWriter.addNode(var8); // L: 8027 - Client.field782 = 0; // L: 8028 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 8029 - Client.field944 = var0; // L: 8030 - } else if (var2 == 37) { - var8 = Client.getPacketBufferNode(ClientPacket.field2331, Client.packetWriter.isaacCipher); // L: 7436 - var8.packetBuffer.method5653(var3); // L: 7437 - var8.packetBuffer.writeShort(var0); // L: 7438 - var8.packetBuffer.writeShortLE(var1); // L: 7439 - Client.packetWriter.addNode(var8); // L: 7440 - Client.field782 = 0; // L: 7441 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7442 - Client.field944 = var0; // L: 7443 - } else { - if (var2 == 38) { - class22.Widget_runOnTargetLeave(); // L: 7812 - var16 = TileItem.getWidget(var1); // L: 7813 - Client.isItemSelected = 1; // L: 7814 - GrandExchangeOfferUnitPriceComparator.selectedItemSlot = var0; // L: 7815 - class105.selectedItemWidget = var1; // L: 7816 - Script.selectedItemId = var3; // L: 7817 - class52.invalidateWidget(var16); // L: 7818 - Client.selectedItemName = WorldMapAreaData.colorStartTag(16748608) + GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).name + WorldMapAreaData.colorStartTag(16777215); // L: 7819 - if (Client.selectedItemName == null) { // L: 7820 - Client.selectedItemName = "null"; - } - - return; // L: 7821 - } - - if (var2 == 39) { - var8 = Client.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); // L: 7284 - var8.packetBuffer.writeInt(var1); // L: 7285 - var8.packetBuffer.method5654(var0); // L: 7286 - var8.packetBuffer.method5654(var3); // L: 7287 - Client.packetWriter.addNode(var8); // L: 7288 - Client.field782 = 0; // L: 7289 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7290 - Client.field944 = var0; // L: 7291 - } else if (var2 == 40) { - var8 = Client.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); // L: 7618 - var8.packetBuffer.method5653(var0); // L: 7619 - var8.packetBuffer.method5653(var3); // L: 7620 - var8.packetBuffer.method5663(var1); // L: 7621 - Client.packetWriter.addNode(var8); // L: 7622 - Client.field782 = 0; // L: 7623 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7624 - Client.field944 = var0; // L: 7625 - } else if (var2 == 41) { - var8 = Client.getPacketBufferNode(ClientPacket.field2340, Client.packetWriter.isaacCipher); // L: 7640 - var8.packetBuffer.writeShortLE(var1); // L: 7641 - var8.packetBuffer.writeShort(var3); // L: 7642 - var8.packetBuffer.writeShort(var0); // L: 7643 - Client.packetWriter.addNode(var8); // L: 7644 - Client.field782 = 0; // L: 7645 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7646 - Client.field944 = var0; // L: 7647 - } else if (var2 == 42) { - var8 = Client.getPacketBufferNode(ClientPacket.field2337, Client.packetWriter.isaacCipher); // L: 7629 - var8.packetBuffer.method5665(var3); // L: 7630 - var8.packetBuffer.writeShort(var0); // L: 7631 - var8.packetBuffer.method5662(var1); // L: 7632 - Client.packetWriter.addNode(var8); // L: 7633 - Client.field782 = 0; // L: 7634 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7635 - Client.field944 = var0; // L: 7636 - } else if (var2 == 43) { - var8 = Client.getPacketBufferNode(ClientPacket.field2314, Client.packetWriter.isaacCipher); // L: 7527 - var8.packetBuffer.method5653(var0); // L: 7528 - var8.packetBuffer.method5654(var3); // L: 7529 - var8.packetBuffer.method5663(var1); // L: 7530 - Client.packetWriter.addNode(var8); // L: 7531 - Client.field782 = 0; // L: 7532 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7533 - Client.field944 = var0; // L: 7534 - } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 7965 - if (var15 != null) { // L: 7966 - Client.mouseCrossX = var6; // L: 7967 - Client.mouseCrossY = var7; // L: 7968 - Client.mouseCrossColor = 2; // L: 7969 - Client.mouseCrossState = 0; // L: 7970 - Client.destinationX = var0; // L: 7971 - Client.destinationY = var1; // L: 7972 - var9 = Client.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher); // L: 7974 - var9.packetBuffer.method5665(var3); // L: 7975 - var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7976 - Client.packetWriter.addNode(var9); // L: 7977 - } - } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 7796 - if (var15 != null) { // L: 7797 - Client.mouseCrossX = var6; // L: 7798 - Client.mouseCrossY = var7; // L: 7799 - Client.mouseCrossColor = 2; // L: 7800 - Client.mouseCrossState = 0; // L: 7801 - Client.destinationX = var0; // L: 7802 - Client.destinationY = var1; // L: 7803 - var9 = Client.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); // L: 7805 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7806 - var9.packetBuffer.method5665(var3); // L: 7807 - Client.packetWriter.addNode(var9); // L: 7808 - } - } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 7510 - if (var15 != null) { // L: 7511 - Client.mouseCrossX = var6; // L: 7512 - Client.mouseCrossY = var7; // L: 7513 - Client.mouseCrossColor = 2; // L: 7514 - Client.mouseCrossState = 0; // L: 7515 - Client.destinationX = var0; // L: 7516 - Client.destinationY = var1; // L: 7517 - var9 = Client.getPacketBufferNode(ClientPacket.field2333, Client.packetWriter.isaacCipher); // L: 7519 - var9.packetBuffer.method5654(var3); // L: 7520 - var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7521 - Client.packetWriter.addNode(var9); // L: 7522 - } - } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 8033 - if (var15 != null) { // L: 8034 - Client.mouseCrossX = var6; // L: 8035 - Client.mouseCrossY = var7; // L: 8036 - Client.mouseCrossColor = 2; // L: 8037 - Client.mouseCrossState = 0; // L: 8038 - Client.destinationX = var0; // L: 8039 - Client.destinationY = var1; // L: 8040 - var9 = Client.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8042 - var9.packetBuffer.method5653(var3); // L: 8043 - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8044 - Client.packetWriter.addNode(var9); // L: 8045 - } - } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 7946 - if (var15 != null) { // L: 7947 - Client.mouseCrossX = var6; // L: 7948 - Client.mouseCrossY = var7; // L: 7949 - Client.mouseCrossColor = 2; // L: 7950 - Client.mouseCrossState = 0; // L: 7951 - Client.destinationX = var0; // L: 7952 - Client.destinationY = var1; // L: 7953 - var9 = Client.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); // L: 7955 - var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7956 - var9.packetBuffer.method5665(var3); // L: 7957 - Client.packetWriter.addNode(var9); // L: 7958 - } - } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 7343 - if (var15 != null) { // L: 7344 - Client.mouseCrossX = var6; // L: 7345 - Client.mouseCrossY = var7; // L: 7346 - Client.mouseCrossColor = 2; // L: 7347 - Client.mouseCrossState = 0; // L: 7348 - Client.destinationX = var0; // L: 7349 - Client.destinationY = var1; // L: 7350 - var9 = Client.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); // L: 7352 - var9.packetBuffer.method5665(var3); // L: 7353 - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7354 - Client.packetWriter.addNode(var9); // L: 7355 - } - } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 7494 - if (var15 != null) { // L: 7495 - Client.mouseCrossX = var6; // L: 7496 - Client.mouseCrossY = var7; // L: 7497 - Client.mouseCrossColor = 2; // L: 7498 - Client.mouseCrossState = 0; // L: 7499 - Client.destinationX = var0; // L: 7500 - Client.destinationY = var1; // L: 7501 - var9 = Client.getPacketBufferNode(ClientPacket.field2343, Client.packetWriter.isaacCipher); // L: 7503 - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7504 - var9.packetBuffer.method5654(var3); // L: 7505 - Client.packetWriter.addNode(var9); // L: 7506 - } - } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 7403 - if (var15 != null) { // L: 7404 - Client.mouseCrossX = var6; // L: 7405 - Client.mouseCrossY = var7; // L: 7406 - Client.mouseCrossColor = 2; // L: 7407 - Client.mouseCrossState = 0; // L: 7408 - Client.destinationX = var0; // L: 7409 - Client.destinationY = var1; // L: 7410 - var9 = Client.getPacketBufferNode(ClientPacket.field2321, Client.packetWriter.isaacCipher); // L: 7412 - var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7413 - var9.packetBuffer.writeShort(var3); // L: 7414 - Client.packetWriter.addNode(var9); // L: 7415 - } - } else { - label642: { - if (var2 != 57) { - if (var2 == 58) { - var16 = getWidgetChild(var1, var0); // L: 7556 - if (var16 != null) { // L: 7557 - var9 = Client.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); // L: 7559 - var9.packetBuffer.method5662(class232.selectedSpellWidget); // L: 7560 - var9.packetBuffer.method5665(Client.selectedSpellChildIndex); // L: 7561 - var9.packetBuffer.method5654(var16.itemId); // L: 7562 - var9.packetBuffer.writeShortLE(var1); // L: 7563 - var9.packetBuffer.method5665(Client.field834); // L: 7564 - var9.packetBuffer.method5653(var0); // L: 7565 - Client.packetWriter.addNode(var9); // L: 7566 - } - break label642; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 7867 - Client.mouseCrossY = var7; // L: 7868 - Client.mouseCrossColor = 2; // L: 7869 - Client.mouseCrossState = 0; // L: 7870 - Client.destinationX = var0; // L: 7871 - Client.destinationY = var1; // L: 7872 - var8 = Client.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); // L: 7874 - var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7875 - var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7876 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7877 - var8.packetBuffer.method5665(var3); // L: 7878 - Client.packetWriter.addNode(var8); // L: 7879 - break label642; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 7997 - Client.mouseCrossY = var7; // L: 7998 - Client.mouseCrossColor = 2; // L: 7999 - Client.mouseCrossState = 0; // L: 8000 - var8 = Client.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); // L: 8002 - var8.packetBuffer.method5653(var3); // L: 8003 - Client.packetWriter.addNode(var8); // L: 8004 - break label642; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 7458 - Client.mouseCrossY = var7; // L: 7459 - Client.mouseCrossColor = 2; // L: 7460 - Client.mouseCrossState = 0; // L: 7461 - var13 = Client.npcs[var3]; // L: 7462 - if (var13 != null) { // L: 7463 - NPCDefinition var17 = var13.definition; // L: 7464 - if (var17.transforms != null) { // L: 7465 - var17 = var17.transform(); - } - - if (var17 != null) { // L: 7466 - var11 = Client.getPacketBufferNode(ClientPacket.field2311, Client.packetWriter.isaacCipher); // L: 7468 - var11.packetBuffer.method5654(var17.id); // L: 7469 - Client.packetWriter.addNode(var11); // L: 7470 - } - } - break label642; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 7583 - Client.mouseCrossY = var7; // L: 7584 - Client.mouseCrossColor = 2; // L: 7585 - Client.mouseCrossState = 0; // L: 7586 - var8 = Client.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); // L: 7588 - var8.packetBuffer.method5654(var3); // L: 7589 - Client.packetWriter.addNode(var8); // L: 7590 - break label642; - } - - if (var2 == 1005) { - var16 = TileItem.getWidget(var1); // L: 7359 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 7360 - WorldMapRectangle.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).name); - } else { - var9 = Client.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); // L: 7363 - var9.packetBuffer.method5654(var3); // L: 7364 - Client.packetWriter.addNode(var9); // L: 7365 - } - - Client.field782 = 0; // L: 7367 - GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7368 - Client.field944 = var0; // L: 7369 - break label642; - } - - if (var2 != 1007) { - if (var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1012) { - Message.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 7962 - } - break label642; - } - } - - var16 = getWidgetChild(var1, var0); // L: 7882 - if (var16 != null) { // L: 7883 - UserComparator8.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 7884 - } - } - } - } - } + if (var8 < 'a' || var8 > 'z') { // L: 96 + throw new NumberFormatException(); // L: 97 } + + var10 = var8 - 'W'; } + + if (var10 >= var1) { // L: 98 + throw new NumberFormatException(); + } + + if (var3) { // L: 99 + var10 = -var10; + } + + int var9 = var5 * var1 + var10; // L: 100 + if (var9 / var1 != var5) { // L: 101 + throw new NumberFormatException(); + } + + var5 = var9; // L: 102 + var4 = true; // L: 103 } - } - if (Client.isItemSelected != 0) { // L: 8048 - Client.isItemSelected = 0; // L: 8049 - class52.invalidateWidget(TileItem.getWidget(class105.selectedItemWidget)); // L: 8050 - } - - if (Client.isSpellSelected) { // L: 8052 - class22.Widget_runOnTargetLeave(); - } - - if (GrandExchangeEvent.field79 != null && Client.field782 == 0) { // L: 8053 - class52.invalidateWidget(GrandExchangeEvent.field79); - } - - } // L: 8054 - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "460315375" - ) - static String method1202(String var0) { - PlayerType[] var1 = ApproximateRouteStrategy.PlayerType_values(); // L: 10887 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 10888 - PlayerType var3 = var1[var2]; // L: 10889 - if (var3.modIcon != -1 && var0.startsWith(WorldMapScaleHandler.method824(var3.modIcon))) { // L: 10891 10892 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 10893 - break; + if (!var4) { // L: 105 + throw new NumberFormatException(); + } else { + return var5; // L: 106 } + } else { + throw new IllegalArgumentException("" + var1); } - - return var0; // L: 10900 } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1149121" + ) + public static int method1238(int var0, int var1) { + int var2 = var0 >>> 31; // L: 84 + return (var0 + var2) / var1 - var2; // L: 85 + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(Lht;Ljk;IIZI)V", + garbageValue = "-59300685" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 10094 + byte var6 = -1; // L: 10095 + String var7 = null; // L: 10096 + if (var5 != null && var5[var3] != null) { // L: 10097 + if (var3 == 0) { // L: 10098 + var6 = 33; + } else if (var3 == 1) { // L: 10099 + var6 = 34; + } else if (var3 == 2) { + var6 = 35; // L: 10100 + } else if (var3 == 3) { // L: 10101 + var6 = 36; + } else { + var6 = 37; // L: 10102 + } + + var7 = var5[var3]; // L: 10103 + } else if (var3 == 4) { // L: 10106 + var6 = 37; // L: 10107 + var7 = "Drop"; // L: 10108 + } + + if (var6 != -1 && var7 != null) { // L: 10111 + KeyHandler.insertMenuItem(var7, Client.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10112 + } + + } // L: 10114 } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index e5bb528911..c41fc5b616 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -2,14 +2,25 @@ import java.security.SecureRandom; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("ct") +@Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("z") + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("f") + @Export("executor") ExecutorService executor; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("future") Future future; SecureRandomFuture() { @@ -17,87 +28,86 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 } // L: 15 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1936171902" + descriptor = "(B)V", + garbageValue = "22" ) + @Export("shutdown") void shutdown() { this.executor.shutdown(); // L: 18 this.executor = null; // L: 19 } // L: 20 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "11" + garbageValue = "19" ) + @Export("isDone") boolean isDone() { return this.future.isDone(); // L: 23 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(S)Ljava/security/SecureRandom;", - garbageValue = "2000" + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "-2492664" ) + @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); // L: 28 } catch (Exception var2) { // L: 30 - return BoundaryObject.method3387(); // L: 31 + return ServerPacket.method3740(); // L: 31 } } - @ObfuscatedName("t") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-531384694" + descriptor = "(III)I", + garbageValue = "-623024875" ) - public static void method2225(int var0) { - if (var0 != -1) { // L: 227 - if (Bounds.Widget_loadedInterfaces[var0]) { // L: 228 - Widget.Widget_archive.clearFilesGroup(var0); // L: 229 - if (Widget.Widget_interfaceComponents[var0] != null) { // L: 230 - boolean var1 = true; // L: 231 + static final int method2252(int var0, int var1) { + int var2 = var1 * 57 + var0; // L: 462 + var2 ^= var2 << 13; // L: 463 + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; // L: 464 + return var3 >> 19 & 255; // L: 465 + } - for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 232 - if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 233 - if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 234 - Widget.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; // L: 235 - } - } - } + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "([Lht;IIIZI)V", + garbageValue = "1783989616" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9890 + Widget var6 = var0[var5]; // L: 9891 + if (var6 != null && var6.parentId == var1) { // L: 9892 9893 + WorldMapIcon_0.alignWidgetSize(var6, var2, var3, var4); // L: 9894 + FileSystem.alignWidgetPosition(var6, var2, var3); // L: 9895 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9896 + var6.scrollX = var6.scrollWidth - var6.width; + } - if (var1) { - Widget.Widget_interfaceComponents[var0] = null; // L: 238 - } + if (var6.scrollX < 0) { // L: 9897 + var6.scrollX = 0; + } - Bounds.Widget_loadedInterfaces[var0] = false; // L: 239 + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; // L: 9898 + } + + if (var6.scrollY < 0) { // L: 9899 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 9900 + UserComparator9.revalidateWidgetScroll(var0, var6, var4); } } } - } // L: 240 - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "116037374" - ) - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 - return var1 == null ? 0 : var1.size(); // L: 45 46 - } - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1418698978" - ) - static void method2211(int var0, int var1) { - class2.method39(TaskHandler.tempMenuAction, var0, var1); // L: 10254 - TaskHandler.tempMenuAction = null; // L: 10255 - } // L: 10256 + } // L: 9902 } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index e704c08dbd..c7d87e127d 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -1,81 +1,95 @@ +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("jm") +@ObfuscatedName("jg") +@Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("SequenceDefinition_animationsArchive") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("SequenceDefinition_cached") + public static EvictingDualNodeHashTable SequenceDefinition_cached; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lic;" - ) - public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) + @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("o") - public int[] frameIds; - @ObfuscatedName("x") - int[] chatFrameIds; - @ObfuscatedName("w") - public int[] frameLengths; - @ObfuscatedName("g") - public int[] soundEffects; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 742845073 - ) - public int frameCount; - @ObfuscatedName("n") - int[] field3550; - @ObfuscatedName("d") - public boolean field3544; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1230100641 - ) - public int field3537; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1046570775 - ) - public int shield; @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 435585977 - ) - public int weapon; + @Export("frameIds") + public int[] frameIds; + @ObfuscatedName("k") + @Export("chatFrameIds") + int[] chatFrameIds; @ObfuscatedName("c") + @Export("frameLengths") + public int[] frameLengths; + @ObfuscatedName("u") + @Export("soundEffects") + public int[] soundEffects; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 391767143 + intValue = 1610785433 ) - public int field3548; - @ObfuscatedName("f") + @Export("frameCount") + public int frameCount; + @ObfuscatedName("e") + int[] field3543; + @ObfuscatedName("o") + public boolean field3544; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1813190021 + intValue = -780702177 ) - public int field3549; + public int field3545; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -825305281 + ) + @Export("shield") + public int shield; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1577634901 + ) + @Export("weapon") + public int weapon; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 508955331 + ) + public int field3547; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1744120745 + intValue = -370859363 ) - public int field3541; - @ObfuscatedName("v") + public int field3549; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1460748063 + intValue = -190010935 ) - public int field3535; + public int field3550; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 758592065 + ) + public int field3551; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 15 @@ -85,20 +99,21 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; // L: 21 this.field3544 = false; // L: 23 - this.field3537 = 5; // L: 24 + this.field3545 = 5; // L: 24 this.shield = -1; // L: 25 this.weapon = -1; // L: 26 - this.field3548 = 99; // L: 27 + this.field3547 = 99; // L: 27 this.field3549 = -1; // L: 28 - this.field3541 = -1; // L: 29 - this.field3535 = 2; // L: 30 + this.field3550 = -1; // L: 29 + this.field3551 = 2; // L: 30 } // L: 32 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "892270610" + descriptor = "(Lkb;I)V", + garbageValue = "1755425441" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 47 @@ -110,11 +125,12 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "322225834" + descriptor = "(Lkb;II)V", + garbageValue = "-1461293345" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; @@ -137,31 +153,31 @@ public class SequenceDefinition extends DualNode { } } else if (var2 == 2) { // L: 62 this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { - var3 = var1.readUnsignedByte(); - this.field3550 = new int[var3 + 1]; + } else if (var2 == 3) { // L: 63 + var3 = var1.readUnsignedByte(); // L: 64 + this.field3543 = new int[var3 + 1]; // L: 65 - for (var4 = 0; var4 < var3; ++var4) { - this.field3550[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { // L: 66 + this.field3543[var4] = var1.readUnsignedByte(); } - this.field3550[var3] = 9999999; - } else if (var2 == 4) { + this.field3543[var3] = 9999999; // L: 67 + } else if (var2 == 4) { // L: 69 this.field3544 = true; } else if (var2 == 5) { // L: 70 - this.field3537 = var1.readUnsignedByte(); + this.field3545 = var1.readUnsignedByte(); } else if (var2 == 6) { // L: 71 this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { // L: 72 this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { // L: 73 - this.field3548 = var1.readUnsignedByte(); + this.field3547 = var1.readUnsignedByte(); } else if (var2 == 9) { // L: 74 this.field3549 = var1.readUnsignedByte(); } else if (var2 == 10) { // L: 75 - this.field3541 = var1.readUnsignedByte(); + this.field3550 = var1.readUnsignedByte(); } else if (var2 == 11) { // L: 76 - this.field3535 = var1.readUnsignedByte(); + this.field3551 = var1.readUnsignedByte(); } else if (var2 == 12) { // L: 77 var3 = var1.readUnsignedByte(); // L: 78 this.chatFrameIds = new int[var3]; // L: 79 @@ -184,38 +200,40 @@ public class SequenceDefinition extends DualNode { } // L: 89 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-125" + descriptor = "(I)V", + garbageValue = "498097204" ) + @Export("postDecode") void postDecode() { if (this.field3549 == -1) { // L: 92 - if (this.field3550 != null) { // L: 93 + if (this.field3543 != null) { // L: 93 this.field3549 = 2; } else { this.field3549 = 0; // L: 94 } } - if (this.field3541 == -1) { // L: 96 - if (this.field3550 != null) { // L: 97 - this.field3541 = 2; + if (this.field3550 == -1) { // L: 96 + if (this.field3543 != null) { // L: 97 + this.field3550 = 2; } else { - this.field3541 = 0; // L: 98 + this.field3550 = 0; // L: 98 } } } // L: 100 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ler;II)Ler;", - garbageValue = "-1365991470" + descriptor = "(Leh;II)Leh;", + garbageValue = "311789628" ) + @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 103 - Frames var3 = UrlRequester.getFrames(var2 >> 16); // L: 104 + Frames var3 = LoginPacket.getFrames(var2 >> 16); // L: 104 var2 &= 65535; // L: 105 if (var3 == null) { return var1.toSharedSequenceModel(true); // L: 106 @@ -226,14 +244,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ler;III)Ler;", - garbageValue = "2144819244" + descriptor = "(Leh;III)Leh;", + garbageValue = "-1889831767" ) + @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; // L: 113 - Frames var4 = UrlRequester.getFrames(var2 >> 16); // L: 114 + Frames var4 = LoginPacket.getFrames(var2 >> 16); // L: 114 var2 &= 65535; // L: 115 if (var4 == null) { // L: 116 return var1.toSharedSequenceModel(true); @@ -261,14 +280,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ler;II)Ler;", - garbageValue = "2009150039" + descriptor = "(Leh;II)Leh;", + garbageValue = "-52965568" ) + @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; // L: 130 - Frames var3 = UrlRequester.getFrames(var2 >> 16); // L: 131 + Frames var3 = LoginPacket.getFrames(var2 >> 16); // L: 131 var2 &= 65535; // L: 132 if (var3 == null) { return var1.toSharedSpotAnimationModel(true); // L: 133 @@ -279,20 +299,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ler;ILjm;IB)Ler;", - garbageValue = "-2" + descriptor = "(Leh;ILjg;II)Leh;", + garbageValue = "-1275419577" ) + @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; // L: 140 - Frames var5 = UrlRequester.getFrames(var2 >> 16); // L: 141 + Frames var5 = LoginPacket.getFrames(var2 >> 16); // L: 141 var2 &= 65535; // L: 142 if (var5 == null) { // L: 143 return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; // L: 144 - Frames var6 = UrlRequester.getFrames(var4 >> 16); // L: 145 + Frames var6 = LoginPacket.getFrames(var4 >> 16); // L: 145 var4 &= 65535; // L: 146 Model var7; if (var6 == null) { // L: 147 @@ -301,20 +322,21 @@ public class SequenceDefinition extends DualNode { return var7; // L: 150 } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152 - var7.animate2(var5, var2, var6, var4, this.field3550); // L: 153 + var7.animate2(var5, var2, var6, var4, this.field3543); // L: 153 return var7; // L: 154 } } } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ler;II)Ler;", - garbageValue = "1789593927" + descriptor = "(Leh;II)Leh;", + garbageValue = "211879185" ) + @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; // L: 158 - Frames var4 = UrlRequester.getFrames(var3 >> 16); // L: 159 + Frames var4 = LoginPacket.getFrames(var3 >> 16); // L: 159 var3 &= 65535; // L: 160 if (var4 == null) { // L: 161 return var1.toSharedSequenceModel(true); @@ -323,7 +345,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; // L: 163 if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 164 var6 = this.chatFrameIds[var2]; // L: 165 - var5 = UrlRequester.getFrames(var6 >> 16); // L: 166 + var5 = LoginPacket.getFrames(var6 >> 16); // L: 166 var6 &= 65535; // L: 167 } @@ -340,20 +362,4 @@ public class SequenceDefinition extends DualNode { } } } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2006270151" - ) - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 - if (var1 != null) { // L: 64 - for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 - var1.ids[var2] = -1; // L: 66 - var1.quantities[var2] = 0; // L: 67 - } - - } - } // L: 69 } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 6b319a2af3..dd080cbd42 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -1,546 +1,578 @@ +import java.security.SecureRandom; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("gw") +@Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2164; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2185; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2200; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2160; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2161; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2243; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2163; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2178; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2189; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2244; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2167; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2168; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2169; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2171; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2242; @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2173; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) public static final ServerPacket field2215; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2175; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2176; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2177; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2179; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2180; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2219; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2182; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2197; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2190; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2166; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2186; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2187; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2217; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2195; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2158; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2191; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2196; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2193; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2194; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2214; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2165; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2204; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2213; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2199; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2224; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2201; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) public static final ServerPacket field2202; - @ObfuscatedName("ay") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2203; - @ObfuscatedName("aj") + public static final ServerPacket field2175; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2239; - @ObfuscatedName("aw") + public static final ServerPacket field2145; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2205; - @ObfuscatedName("af") + public static final ServerPacket field2146; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2206; - @ObfuscatedName("ak") + public static final ServerPacket field2147; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2207; - @ObfuscatedName("ac") + public static final ServerPacket field2148; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2208; - @ObfuscatedName("bl") + public static final ServerPacket field2142; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2209; - @ObfuscatedName("bc") + public static final ServerPacket field2150; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2210; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2211; - @ObfuscatedName("bj") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2212; - @ObfuscatedName("bh") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2229; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2174; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2222; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2162; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2172; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) public static final ServerPacket field2218; - @ObfuscatedName("bw") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2227; - @ObfuscatedName("be") + public static final ServerPacket field2152; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2220; - @ObfuscatedName("bu") + public static final ServerPacket field2178; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2221; - @ObfuscatedName("ba") + public static final ServerPacket field2154; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" + ) + public static final ServerPacket field2155; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2156; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2170; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2158; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2159; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2160; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2161; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2162; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2163; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2149; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2186; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2166; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2153; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2168; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2197; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2144; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2171; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2172; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2173; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2174; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2165; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2176; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2177; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2200; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2179; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2180; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lgw;" ) public static final ServerPacket field2181; - @ObfuscatedName("bm") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2223; - @ObfuscatedName("bd") + public static final ServerPacket field2182; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2232; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lga;" - ) - public static final ServerPacket field2225; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) public static final ServerPacket field2183; - @ObfuscatedName("bq") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2184; - @ObfuscatedName("by") + public static final ServerPacket field2227; + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2228; - @ObfuscatedName("bo") + public static final ServerPacket field2185; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2234; - @ObfuscatedName("bk") + public static final ServerPacket field2221; + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2230; - @ObfuscatedName("bv") + public static final ServerPacket field2190; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2231; + public static final ServerPacket field2167; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2199; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2211; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2191; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2187; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2193; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2194; @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2226; - @ObfuscatedName("bt") + public static final ServerPacket field2195; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2233; - @ObfuscatedName("bs") + public static final ServerPacket field2196; + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" + ) + public static final ServerPacket field2220; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2198; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2219; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2143; + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2201; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lgw;" ) public static final ServerPacket field2216; - @ObfuscatedName("cg") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2235; - @ObfuscatedName("ca") + public static final ServerPacket field2203; + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2236; - @ObfuscatedName("ct") + public static final ServerPacket field2204; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2237; - @ObfuscatedName("cv") + public static final ServerPacket field2205; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2238; - @ObfuscatedName("ce") + public static final ServerPacket field2206; + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" + ) + public static final ServerPacket field2207; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lgw;" ) public static final ServerPacket field2188; - @ObfuscatedName("cr") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2240; - @ObfuscatedName("cn") + public static final ServerPacket field2209; + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" ) - public static final ServerPacket field2241; - @ObfuscatedName("ci") + public static final ServerPacket field2210; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lgw;" + ) + public static final ServerPacket field2230; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2212; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2213; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2214; + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2189; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2151; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2217; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lgw;" ) public static final ServerPacket field2192; - @ObfuscatedName("hq") - @ObfuscatedGetter( - intValue = 281094069 + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lgw;" ) - static int cameraYaw; - @ObfuscatedName("cm") - @ObfuscatedGetter( - intValue = -317415457 + public static final ServerPacket field2157; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lgw;" ) + public static final ServerPacket field2164; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2184; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2222; + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2223; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2169; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2225; + @ObfuscatedName("cl") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2226; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lgw;" + ) + public static final ServerPacket field2224; + @ObfuscatedName("lt") + @ObfuscatedGetter( + intValue = 271502915 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("cy") + @ObfuscatedGetter( + intValue = 1695854657 + ) + @Export("id") public final int id; - @ObfuscatedName("cu") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -811501627 + intValue = -2114394893 ) + @Export("length") public final int length; static { - field2164 = new ServerPacket(0, 4); // L: 5 - field2185 = new ServerPacket(1, 4); // L: 6 - field2200 = new ServerPacket(2, -2); // L: 7 - field2160 = new ServerPacket(3, 3); // L: 8 - field2161 = new ServerPacket(4, 0); // L: 9 - field2243 = new ServerPacket(5, -2); // L: 10 - field2163 = new ServerPacket(6, 0); // L: 11 - field2178 = new ServerPacket(7, -1); // L: 12 - field2189 = new ServerPacket(8, 6); // L: 13 - field2244 = new ServerPacket(9, 6); // L: 14 - field2167 = new ServerPacket(10, 0); // L: 15 - field2168 = new ServerPacket(11, -2); // L: 16 - field2169 = new ServerPacket(12, -2); // L: 17 - field2170 = new ServerPacket(13, 1); // L: 18 - field2171 = new ServerPacket(14, -1); // L: 19 - field2242 = new ServerPacket(15, 2); // L: 20 - field2173 = new ServerPacket(16, 7); // L: 21 - field2215 = new ServerPacket(17, 5); // L: 22 - field2175 = new ServerPacket(18, 4); // L: 23 - field2176 = new ServerPacket(19, -2); // L: 24 - field2177 = new ServerPacket(20, -2); // L: 25 - field2159 = new ServerPacket(21, 14); // L: 26 - field2179 = new ServerPacket(22, -2); // L: 27 - field2180 = new ServerPacket(23, -2); // L: 28 - field2219 = new ServerPacket(24, 3); // L: 29 - field2182 = new ServerPacket(25, 4); // L: 30 - field2197 = new ServerPacket(26, -2); // L: 31 - field2190 = new ServerPacket(27, -2); // L: 32 - field2166 = new ServerPacket(28, 7); // L: 33 - field2186 = new ServerPacket(29, -1); // L: 34 - field2187 = new ServerPacket(30, 1); // L: 35 - field2217 = new ServerPacket(31, 20); // L: 36 - field2195 = new ServerPacket(32, 0); // L: 37 - field2158 = new ServerPacket(33, 6); // L: 38 - field2191 = new ServerPacket(34, -2); // L: 39 - field2196 = new ServerPacket(35, 4); // L: 40 - field2193 = new ServerPacket(36, 2); // L: 41 - field2194 = new ServerPacket(37, 10); // L: 42 - field2214 = new ServerPacket(38, -2); // L: 43 - field2165 = new ServerPacket(39, -2); // L: 44 - field2204 = new ServerPacket(40, 6); // L: 45 - field2213 = new ServerPacket(41, 6); // L: 46 - field2199 = new ServerPacket(42, 28); // L: 47 - field2224 = new ServerPacket(43, -2); // L: 48 - field2201 = new ServerPacket(44, 8); // L: 49 - field2202 = new ServerPacket(45, 5); // L: 50 - field2203 = new ServerPacket(46, 2); // L: 51 - field2239 = new ServerPacket(47, -2); // L: 52 - field2205 = new ServerPacket(48, 2); // L: 53 - field2206 = new ServerPacket(49, 2); // L: 54 - field2207 = new ServerPacket(50, 8); // L: 55 - field2208 = new ServerPacket(51, 2); // L: 56 - field2209 = new ServerPacket(52, 8); // L: 57 - field2210 = new ServerPacket(53, 8); // L: 58 - field2211 = new ServerPacket(54, 6); // L: 59 - field2212 = new ServerPacket(55, 10); // L: 60 - field2229 = new ServerPacket(56, 0); // L: 61 - field2174 = new ServerPacket(57, 6); // L: 62 - field2222 = new ServerPacket(58, -1); // L: 63 - field2162 = new ServerPacket(59, 1); // L: 64 - field2172 = new ServerPacket(60, -2); // L: 65 - field2218 = new ServerPacket(61, -2); // L: 66 - field2227 = new ServerPacket(62, 5); // L: 67 - field2220 = new ServerPacket(63, 1); // L: 68 - field2221 = new ServerPacket(64, 1); // L: 69 - field2181 = new ServerPacket(65, 2); // L: 70 - field2223 = new ServerPacket(66, 12); // L: 71 - field2232 = new ServerPacket(67, 1); // L: 72 - field2225 = new ServerPacket(68, 2); // L: 73 - field2183 = new ServerPacket(69, 2); // L: 74 - field2184 = new ServerPacket(70, -2); // L: 75 - field2228 = new ServerPacket(71, 15); // L: 76 - field2234 = new ServerPacket(72, 0); // L: 77 - field2230 = new ServerPacket(73, 0); // L: 78 - field2231 = new ServerPacket(74, 6); // L: 79 - field2226 = new ServerPacket(75, -1); // L: 80 - field2233 = new ServerPacket(76, 4); // L: 81 - field2216 = new ServerPacket(77, 2); // L: 82 - field2235 = new ServerPacket(78, 6); // L: 83 - field2236 = new ServerPacket(79, -1); // L: 84 - field2237 = new ServerPacket(80, 5); // L: 85 - field2238 = new ServerPacket(81, 5); // L: 86 - field2188 = new ServerPacket(82, -2); // L: 87 - field2240 = new ServerPacket(83, 4); // L: 88 - field2241 = new ServerPacket(84, 6); // L: 89 - field2192 = new ServerPacket(85, 6); // L: 90 + field2215 = new ServerPacket(0, 5); // L: 5 + field2202 = new ServerPacket(1, 0); // L: 6 + field2175 = new ServerPacket(2, 14); // L: 7 + field2145 = new ServerPacket(3, 1); // L: 8 + field2146 = new ServerPacket(4, 6); + field2147 = new ServerPacket(5, 6); // L: 10 + field2148 = new ServerPacket(6, -2); // L: 11 + field2142 = new ServerPacket(7, 4); + field2150 = new ServerPacket(8, 6); // L: 13 + field2218 = new ServerPacket(9, 4); // L: 14 + field2152 = new ServerPacket(10, 2); // L: 15 + field2178 = new ServerPacket(11, 5); + field2154 = new ServerPacket(12, 0); // L: 17 + field2155 = new ServerPacket(13, 2); // L: 18 + field2156 = new ServerPacket(14, 1); // L: 19 + field2170 = new ServerPacket(15, 5); // L: 20 + field2158 = new ServerPacket(16, -2); // L: 21 + field2159 = new ServerPacket(17, 2); // L: 22 + field2160 = new ServerPacket(18, 2); // L: 23 + field2161 = new ServerPacket(19, 0); // L: 24 + field2162 = new ServerPacket(20, 8); // L: 25 + field2163 = new ServerPacket(21, -2); // L: 26 + field2149 = new ServerPacket(22, 4); // L: 27 + field2186 = new ServerPacket(23, 2); // L: 28 + field2166 = new ServerPacket(24, 0); // L: 29 + field2153 = new ServerPacket(25, -1); // L: 30 + field2168 = new ServerPacket(26, -2); // L: 31 + field2197 = new ServerPacket(27, 8); // L: 32 + field2144 = new ServerPacket(28, 20); // L: 33 + field2171 = new ServerPacket(29, 6); // L: 34 + field2172 = new ServerPacket(30, 4); // L: 35 + field2173 = new ServerPacket(31, -2); // L: 36 + field2174 = new ServerPacket(32, 3); // L: 37 + field2165 = new ServerPacket(33, 6); // L: 38 + field2176 = new ServerPacket(34, -2); + field2177 = new ServerPacket(35, -2); + field2200 = new ServerPacket(36, -1); + field2179 = new ServerPacket(37, 6); // L: 42 + field2180 = new ServerPacket(38, -2); // L: 43 + field2181 = new ServerPacket(39, -1); // L: 44 + field2182 = new ServerPacket(40, -2); // L: 45 + field2183 = new ServerPacket(41, -2); // L: 46 + field2227 = new ServerPacket(42, 4); // L: 47 + field2185 = new ServerPacket(43, -2); // L: 48 + field2221 = new ServerPacket(44, 3); // L: 49 + field2190 = new ServerPacket(45, 6); // L: 50 + field2167 = new ServerPacket(46, 1); // L: 51 + field2199 = new ServerPacket(47, 28); // L: 52 + field2211 = new ServerPacket(48, 2); // L: 53 + field2191 = new ServerPacket(49, 15); // L: 54 + field2187 = new ServerPacket(50, 1); // L: 55 + field2193 = new ServerPacket(51, 2); // L: 56 + field2194 = new ServerPacket(52, 2); // L: 57 + field2195 = new ServerPacket(53, -2); // L: 58 + field2196 = new ServerPacket(54, 12); // L: 59 + field2220 = new ServerPacket(55, 4); // L: 60 + field2198 = new ServerPacket(56, 0); // L: 61 + field2219 = new ServerPacket(57, 10); // L: 62 + field2143 = new ServerPacket(58, 6); // L: 63 + field2201 = new ServerPacket(59, 8); // L: 64 + field2216 = new ServerPacket(60, 1); // L: 65 + field2203 = new ServerPacket(61, 2); // L: 66 + field2204 = new ServerPacket(62, -2); // L: 67 + field2205 = new ServerPacket(63, 5); // L: 68 + field2206 = new ServerPacket(64, 8); // L: 69 + field2207 = new ServerPacket(65, 7); // L: 70 + field2188 = new ServerPacket(66, 10); // L: 71 + field2209 = new ServerPacket(67, -2); // L: 72 + field2210 = new ServerPacket(68, 0); // L: 73 + field2230 = new ServerPacket(69, 6); // L: 74 + field2212 = new ServerPacket(70, -2); // L: 75 + field2213 = new ServerPacket(71, 4); // L: 76 + field2214 = new ServerPacket(72, -1); // L: 77 + field2189 = new ServerPacket(73, -1); // L: 78 + field2151 = new ServerPacket(74, 0); // L: 79 + field2217 = new ServerPacket(75, 7); // L: 80 + field2192 = new ServerPacket(76, 1); // L: 81 + field2157 = new ServerPacket(77, -1); // L: 82 + field2164 = new ServerPacket(78, -2); // L: 83 + field2184 = new ServerPacket(79, 5); // L: 84 + field2222 = new ServerPacket(80, -2); // L: 85 + field2223 = new ServerPacket(81, 6); // L: 86 + field2169 = new ServerPacket(82, -2); // L: 87 + field2225 = new ServerPacket(83, 6); // L: 88 + field2226 = new ServerPacket(84, 2); // L: 89 + field2224 = new ServerPacket(85, -2); // L: 90 } ServerPacket(int var1, int var2) { this.id = var1; // L: 99 this.length = var2; // L: 100 } // L: 101 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lc;I)Ln;", + garbageValue = "-1940204105" + ) + public static class12 method3742(class7 var0) { + switch(var0.field23) { // L: 9 + case 0: + return new class5(); // L: 16 + default: + throw new IllegalArgumentException(); // L: 12 + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "-85" + ) + static SecureRandom method3740() { + SecureRandom var0 = new SecureRandom(); // L: 39 + var0.nextInt(); // L: 40 + return var0; // L: 41 + } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 5c2a93319b..6a3202e687 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -1,29 +1,32 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("ei") +@Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("sw") - @ObfuscatedSignature( - descriptor = "Llz;" - ) - static ArchiveDisk masterDisk; - @ObfuscatedName("gf") - static int[] regionLandArchiveIds; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -891561701 + intValue = -1443412059 ) + @Export("id") int id; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 178139825 + intValue = 815931901 ) + @Export("count") int count; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("labels") int[][] labels; Skeleton(int var1, byte[] var2) { @@ -48,28 +51,80 @@ public class Skeleton extends Node { } } - } // L: 23 + } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)Ljx;", - garbageValue = "29" + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "-1635350138" ) - public static NPCDefinition getNpcDefinition(int var0) { - NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); // L: 57 - if (var1 != null) { // L: 58 - return var1; - } else { - byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); // L: 59 - var1 = new NPCDefinition(); // L: 60 - var1.id = var0; // L: 61 - if (var2 != null) { // L: 62 - var1.decode(new Buffer(var2)); + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + if (var1) { // L: 23 + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 26 + return; // L: 47 + } catch (Exception var4) { // L: 29 + } } - var1.postDecode(); // L: 63 - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); // L: 64 - return var1; // L: 65 + if (class60.field453.startsWith("win")) { // L: 31 + MouseHandler.method1176(var0, 0); // L: 33 + } else if (class60.field453.startsWith("mac")) { // L: 37 + WorldMapManager.method735(var0, 1, "openjs"); // L: 38 + } else { + MouseHandler.method1176(var0, 2); // L: 41 + } + } else { + MouseHandler.method1176(var0, 3); // L: 44 + } + + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Liw;IIS)Lle;", + garbageValue = "8416" + ) + static IndexedSprite method3215(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 64 + boolean var3; + if (var4 == null) { // L: 65 + var3 = false; // L: 66 + } else { + class217.SpriteBuffer_decode(var4); // L: 69 + var3 = true; // L: 70 + } + + if (!var3) { // L: 72 + return null; + } else { + IndexedSprite var5 = new IndexedSprite(); // L: 75 + var5.width = class336.SpriteBuffer_spriteWidth; // L: 76 + var5.height = class336.SpriteBuffer_spriteHeight; // L: 77 + var5.xOffset = class336.SpriteBuffer_xOffsets[0]; // L: 78 + var5.yOffset = class225.SpriteBuffer_yOffsets[0]; // L: 79 + var5.subWidth = class336.SpriteBuffer_spriteWidths[0]; // L: 80 + var5.subHeight = class336.SpriteBuffer_spriteHeights[0]; // L: 81 + var5.palette = WorldMapID.SpriteBuffer_spritePalette; // L: 82 + var5.pixels = class13.SpriteBuffer_pixels[0]; // L: 83 + class336.SpriteBuffer_xOffsets = null; // L: 85 + class225.SpriteBuffer_yOffsets = null; // L: 86 + class336.SpriteBuffer_spriteWidths = null; // L: 87 + class336.SpriteBuffer_spriteHeights = null; // L: 88 + WorldMapID.SpriteBuffer_spritePalette = null; // L: 89 + class13.SpriteBuffer_pixels = null; // L: 90 + return var5; // L: 94 } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "11601118" + ) + static boolean method3212(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 814 + } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 089f1dd3f3..7527716bc2 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,10 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hf") +@Implements("Skills") public class Skills { - @ObfuscatedName("k") + @ObfuscatedName("sf") + @ObfuscatedSignature( + descriptor = "Lme;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("b") + @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("Skills_experienceTable") public static int[] Skills_experienceTable; static { diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index feabedf164..11338b6d39 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -1,9 +1,13 @@ import java.lang.ref.SoftReference; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("fj") +@Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("ref") SoftReference ref; SoftWrapper(Object var1, int var2) { @@ -11,12 +15,14 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("get") Object get() { return this.ref.get(); // L: 15 } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("isSoft") boolean isSoft() { return true; // L: 19 } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 01bcd483c1..f76d45e6c7 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,38 +1,41 @@ -import net.runelite.mapping.ObfuscatedGetter; +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("ds") +@Implements("SoundCache") public class SoundCache { - @ObfuscatedName("rp") - @ObfuscatedGetter( - intValue = 1426340781 - ) - static int field1472; - @ObfuscatedName("z") + @ObfuscatedName("c") + @Export("ItemDefinition_inMembersWorld") + public static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Llp;" ) + @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Llc;" + descriptor = "Llp;" ) + @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Lic;Lic;)V" + descriptor = "(Liw;Liw;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); // L: 9 @@ -41,11 +44,12 @@ public class SoundCache { this.musicSampleIndex = var2; // L: 14 } // L: 15 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II[II)Lde;", - garbageValue = "-484042119" + descriptor = "(II[II)Ldo;", + garbageValue = "16776960" ) + @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 18 var4 |= var1 << 16; // L: 19 @@ -62,8 +66,8 @@ public class SoundCache { } else { var7 = var8.toRawSound(); // L: 26 this.rawSounds.put(var7, var5); // L: 27 - if (var3 != null) { - var3[0] -= var7.samples.length; // L: 28 + if (var3 != null) { // L: 28 + var3[0] -= var7.samples.length; } return var7; // L: 29 @@ -71,11 +75,12 @@ public class SoundCache { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II[IS)Lde;", - garbageValue = "-29447" + descriptor = "(II[II)Ldo;", + garbageValue = "-716229534" ) + @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 33 var4 |= var1 << 16; // L: 34 @@ -107,11 +112,12 @@ public class SoundCache { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I[IB)Lde;", - garbageValue = "-94" + descriptor = "(I[II)Ldo;", + garbageValue = "-541178737" ) + @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { if (this.soundEffectIndex.getGroupCount() == 1) { // L: 53 return this.getSoundEffect0(0, var1, var2); @@ -122,11 +128,12 @@ public class SoundCache { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I[II)Lde;", - garbageValue = "-1455606991" + descriptor = "(I[II)Ldo;", + garbageValue = "-1523377894" ) + @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { if (this.musicSampleIndex.getGroupCount() == 1) { // L: 59 return this.getMusicSample0(0, var1, var2); @@ -137,42 +144,73 @@ public class SoundCache { } } - @ObfuscatedName("aq") + @ObfuscatedName("gi") @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "115" + descriptor = "(IB)V", + garbageValue = "50" ) - static int method2607(int var0, Script var1, boolean var2) { + static final void method2646(int var0) { + int[] var1 = InterfaceParent.sceneMinimapSprite.pixels; // L: 5674 + int var2 = var1.length; // L: 5675 + int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3153 - Interpreter.Interpreter_intStackSize -= 2; // L: 3154 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3155 - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3156 - if (!Client.isCameraLocked) { // L: 3157 - Client.camAngleX = var3; // L: 3158 - Client.camAngleY = var4; // L: 3159 - } - - return 1; // L: 3161 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3163 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3164 - return 1; // L: 3165 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3167 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3168 - return 1; // L: 3169 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3171 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3172 - if (var3 < 0) { // L: 3173 - var3 = 0; - } - - Client.camFollowHeight = var3; // L: 3174 - return 1; // L: 3175 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3177 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3178 - return 1; // L: 3179 - } else { - return 2; // L: 3181 + for (var3 = 0; var3 < var2; ++var3) { // L: 5676 + var1[var3] = 0; } - } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { // L: 5677 + var4 = (103 - var3) * 2048 + 24628; // L: 5678 + + for (var5 = 1; var5 < 103; ++var5) { // L: 5679 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5680 + ModeWhere.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5681 + ModeWhere.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; // L: 5682 + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5685 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5686 + InterfaceParent.sceneMinimapSprite.setRaster(); // L: 5687 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 5688 + for (var6 = 1; var6 < 103; ++var6) { // L: 5689 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5690 + Canvas.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5691 + Canvas.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; // L: 5694 + + for (var5 = 0; var5 < 104; ++var5) { // L: 5695 + for (var6 = 0; var6 < 104; ++var6) { // L: 5696 + long var7 = ModeWhere.scene.getFloorDecorationTag(GrandExchangeOfferUnitPriceComparator.Client_plane, var5, var6); // L: 5697 + if (var7 != 0L) { // L: 5698 + int var9 = ObjectSound.Entity_unpackID(var7); // L: 5699 + int var10 = ScriptEvent.getObjectDefinition(var9).mapIconId; // L: 5700 + if (var10 >= 0 && class194.WorldMapElement_get(var10).field3248) { // L: 5701 5702 + Client.mapIcons[Client.mapIconCount] = class194.WorldMapElement_get(var10).getSpriteBool(false); // L: 5705 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 5706 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 5707 + ++Client.mapIconCount; // L: 5708 + } + } + } + } + + class22.rasterProvider.apply(); // L: 5713 + } // L: 5714 } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index d93a85c9c3..e1db05bf47 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -1,20 +1,26 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("dq") +@Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Ldz;" + descriptor = "[Ldk;" ) + @Export("instruments") Instrument[] instruments; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("start") int start; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; // L: 10 @@ -32,16 +38,18 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); // L: 29 } // L: 30 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lde;" + descriptor = "()Ldo;" ) + @Export("toRawSound") public RawSound toRawSound() { byte[] var1 = this.mix(); // L: 33 return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -75,7 +83,8 @@ public class SoundEffect { } } - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -113,10 +122,11 @@ public class SoundEffect { } } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;II)Ldj;" + descriptor = "(Liw;II)Ldq;" ) + @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); // L: 15 return var3 == null ? null : new SoundEffect(new Buffer(var3)); // L: 16 diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index b1dd2917f8..ad92f3f4f0 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -1,29 +1,43 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("da") +@Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("segments") int segments; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("durations") int[] durations; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("phases") int[] phases; - @ObfuscatedName("t") - int start; - @ObfuscatedName("i") - int end; - @ObfuscatedName("o") - int form; - @ObfuscatedName("w") - int ticks; - @ObfuscatedName("g") - int phaseIndex; @ObfuscatedName("m") + @Export("start") + int start; + @ObfuscatedName("z") + @Export("end") + int end; + @ObfuscatedName("q") + @Export("form") + int form; + @ObfuscatedName("k") + @Export("ticks") + int ticks; + @ObfuscatedName("c") + @Export("phaseIndex") + int phaseIndex; + @ObfuscatedName("u") + @Export("step") int step; - @ObfuscatedName("n") + @ObfuscatedName("t") + @Export("amplitude") int amplitude; - @ObfuscatedName("d") + @ObfuscatedName("e") + @Export("max") int max; SoundEnvelope() { @@ -36,10 +50,11 @@ public class SoundEnvelope { this.phases[1] = 65535; // L: 27 } // L: 28 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) + @Export("decode") final void decode(Buffer var1) { this.form = var1.readUnsignedByte(); // L: 31 this.start = var1.readInt(); // L: 32 @@ -47,10 +62,11 @@ public class SoundEnvelope { this.decodeSegments(var1); // L: 34 } // L: 35 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) + @Export("decodeSegments") final void decodeSegments(Buffer var1) { this.segments = var1.readUnsignedByte(); // L: 38 this.durations = new int[this.segments]; // L: 39 @@ -63,7 +79,8 @@ public class SoundEnvelope { } // L: 45 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("reset") final void reset() { this.ticks = 0; // L: 48 this.phaseIndex = 0; // L: 49 @@ -72,7 +89,8 @@ public class SoundEnvelope { this.max = 0; // L: 52 } // L: 53 - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 this.amplitude = this.phases[this.phaseIndex++] << 15; // L: 57 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index e953ae466c..e3b3884de6 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,18 +1,16 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dy") +@ObfuscatedName("dz") +@Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -2042157485 - ) - static int cacheGamebuild; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Ldr;" + descriptor = "[Ldh;" ) + @Export("players") volatile PcmPlayer[] players; SoundSystem() { @@ -28,138 +26,189 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { // L: 17 - Decimator.RunException_sendStackTrace((String)null, var4); // L: 18 + PacketWriter.RunException_sendStackTrace((String)null, var4); // L: 18 } } // L: 20 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Ljt;", - garbageValue = "-649379031" + descriptor = "(I)[Lcd;", + garbageValue = "1735365545" ) - public static FloorOverlayDefinition method2594(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 26 - if (var1 != null) { // L: 27 - return var1; - } else { - byte[] var2 = class1.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28 - var1 = new FloorOverlayDefinition(); // L: 29 - if (var2 != null) { // L: 30 - var1.decode(new Buffer(var2), var0); - } + static AttackOption[] method2631() { + return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; // L: 11714 + } - var1.postDecode(); // L: 31 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1698839968" + ) + @Export("Messages_getNextChatID") + static int Messages_getNextChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 77 + if (var1 == null) { // L: 78 + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 79 80 } } - @ObfuscatedName("o") + @ObfuscatedName("hn") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-2072659501" + descriptor = "(Lks;I)V", + garbageValue = "-359449402" ) - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 122 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 123 - char var7 = var0.charAt(var6 + var1); // L: 124 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 125 - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 126 - var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 127 - var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 128 - var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 129 - var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 130 - var3[var6 + var4] = -123; - } else if (var7 == 8224) { // L: 131 - var3[var6 + var4] = -122; - } else if (var7 == 8225) { // L: 132 - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; // L: 133 - } else if (var7 == 8240) { // L: 134 - var3[var6 + var4] = -119; - } else if (var7 == 352) { // L: 135 - var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 136 - var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 137 - var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 138 - var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 139 - var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 140 - var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 141 - var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 142 - var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 143 - var3[var6 + var4] = -107; - } else if (var7 == 8211) { // L: 144 - var3[var6 + var4] = -106; - } else if (var7 == 8212) { // L: 145 - var3[var6 + var4] = -105; - } else if (var7 == 732) { // L: 146 - var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 147 - var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 148 - var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 149 - var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 150 - var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 151 - var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 152 - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; // L: 153 + static final void method2632(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field726; ++var1) { // L: 7583 + int var2 = Client.field727[var1]; // L: 7584 + NPC var3 = Client.npcs[var2]; // L: 7585 + int var4 = var0.readUnsignedByte(); // L: 7586 + if ((var4 & 16) != 0) { // L: 7587 + var3.targetIndex = var0.method5659(); // L: 7588 + if (var3.targetIndex == 65535) { // L: 7589 + var3.targetIndex = -1; + } } - } - return var5; // L: 155 - } + int var5; + int var6; + int var7; + if ((var4 & 1) != 0) { // L: 7591 + var5 = var0.method5797(); // L: 7592 + if (var5 == 65535) { // L: 7593 + var5 = -1; + } - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)Z", - garbageValue = "-1863289029" - ) - static final boolean method2592(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 176 - if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 177 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_y - var6; // L: 178 - if (var7 > var0 && var7 > var1 && var7 > var2) { - return false; // L: 179 - } else { - var7 = ViewportMouse.ViewportMouse_x + var6; // L: 180 - if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 181 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x - var6; // L: 182 - return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 183 + var6 = var0.method5650(); // L: 7594 + if (var5 == var3.sequence && var5 != -1) { // L: 7595 + var7 = class105.SequenceDefinition_get(var5).field3551; // L: 7596 + if (var7 == 1) { // L: 7597 + var3.sequenceFrame = 0; // L: 7598 + var3.sequenceFrameCycle = 0; // L: 7599 + var3.sequenceDelay = var6; // L: 7600 + var3.field1022 = 0; // L: 7601 + } + + if (var7 == 2) { // L: 7603 + var3.field1022 = 0; // L: 7604 + } + } else if (var5 == -1 || var3.sequence == -1 || class105.SequenceDefinition_get(var5).field3545 >= class105.SequenceDefinition_get(var3.sequence).field3545) { // L: 7607 + var3.sequence = var5; // L: 7608 + var3.sequenceFrame = 0; // L: 7609 + var3.sequenceFrameCycle = 0; // L: 7610 + var3.sequenceDelay = var6; // L: 7611 + var3.field1022 = 0; // L: 7612 + var3.field1034 = var3.pathLength; // L: 7613 + } + } + + int var8; + if ((var4 & 2) != 0) { // L: 7617 + var5 = var0.method5659(); // L: 7618 + var6 = var0.method5659(); // L: 7619 + var7 = var3.x - (var5 - FloorDecoration.baseX - FloorDecoration.baseX) * 64; // L: 7620 + var8 = var3.y - (var6 - WorldMapData_0.baseY - WorldMapData_0.baseY) * 64; // L: 7621 + if (var7 != 0 || var8 != 0) { // L: 7622 + var3.field1003 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 32) != 0) { // L: 7624 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 7625 + var3.overheadTextCyclesRemaining = 100; // L: 7626 + } + + if ((var4 & 8) != 0) { // L: 7628 + var3.field1017 = var0.readByte(); // L: 7629 + var3.field1019 = var0.method5837(); // L: 7630 + var3.field1018 = var0.readByte(); // L: 7631 + var3.field1020 = var0.method5837(); // L: 7632 + var3.field1009 = var0.readUnsignedShort() + Client.cycle; // L: 7633 + var3.field1024 = var0.readUnsignedShort() + Client.cycle; // L: 7634 + var3.field1023 = var0.method5675(); // L: 7635 + var3.pathLength = 1; // L: 7636 + var3.field1034 = 0; // L: 7637 + var3.field1017 += var3.pathX[0]; // L: 7638 + var3.field1019 += var3.pathY[0]; // L: 7639 + var3.field1018 += var3.pathX[0]; // L: 7640 + var3.field1020 += var3.pathY[0]; // L: 7641 + } + + if ((var4 & 128) != 0) { // L: 7643 + var5 = var0.method5668(); // L: 7644 + int var9; + int var10; + int var11; + if (var5 > 0) { // L: 7645 + for (var6 = 0; var6 < var5; ++var6) { // L: 7646 + var8 = -1; // L: 7648 + var9 = -1; // L: 7649 + var10 = -1; // L: 7650 + var7 = var0.readUShortSmart(); // L: 7651 + if (var7 == 32767) { // L: 7652 + var7 = var0.readUShortSmart(); // L: 7653 + var9 = var0.readUShortSmart(); // L: 7654 + var8 = var0.readUShortSmart(); // L: 7655 + var10 = var0.readUShortSmart(); // L: 7656 + } else if (var7 != 32766) { // L: 7658 + var9 = var0.readUShortSmart(); // L: 7659 + } else { + var7 = -1; // L: 7661 + } + + var11 = var0.readUShortSmart(); // L: 7662 + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 7663 + } + } + + var6 = var0.method5668(); // L: 7666 + if (var6 > 0) { // L: 7667 + for (var7 = 0; var7 < var6; ++var7) { // L: 7668 + var8 = var0.readUShortSmart(); // L: 7669 + var9 = var0.readUShortSmart(); // L: 7670 + if (var9 != 32767) { // L: 7671 + var10 = var0.readUShortSmart(); // L: 7672 + var11 = var0.method5650(); // L: 7673 + int var12 = var9 > 0 ? var0.readUnsignedByte() : var11; // L: 7674 + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 7675 + } else { + var3.removeHealthBar(var8); // L: 7677 + } + } + } + } + + if ((var4 & 64) != 0) { // L: 7681 + var3.definition = Clock.getNpcDefinition(var0.method5797()); // L: 7682 + var3.field1011 = var3.definition.size; // L: 7683 + var3.field1028 = var3.definition.rotation; // L: 7684 + var3.walkSequence = var3.definition.walkSequence; // L: 7685 + var3.walkBackSequence = var3.definition.walkBackSequence; // L: 7686 + var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 7687 + var3.walkRightSequence = var3.definition.walkRightSequence; // L: 7688 + var3.idleSequence = var3.definition.idleSequence; // L: 7689 + var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 7690 + var3.turnRightSequence = var3.definition.turnRightSequence; // L: 7691 + } + + if ((var4 & 4) != 0) { // L: 7693 + var3.spotAnimation = var0.readUnsignedShort(); // L: 7694 + var5 = var0.readInt(); // L: 7695 + var3.field1016 = var5 >> 16; // L: 7696 + var3.field1015 = (var5 & 65535) + Client.cycle; // L: 7697 + var3.spotAnimationFrame = 0; // L: 7698 + var3.spotAnimationFrameCycle = 0; // L: 7699 + if (var3.field1015 > Client.cycle) { // L: 7700 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 7701 + var3.spotAnimation = -1; } } } - } - @ObfuscatedName("iy") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "69" - ) - static boolean shouldPrioritizeDrop() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 9639 - } + } // L: 7704 } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index aec3666cf1..273aad8878 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -1,81 +1,107 @@ +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("ih") +@ObfuscatedName("ie") +@Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) - public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("k") + @Export("SpotAnimationDefinition_archive") + static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("s") + @Export("SpotAnimationDefinition_modelArchive") + static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) - public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("gs") - @ObfuscatedGetter( - intValue = 668491151 - ) - static int field3261; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -478410851 - ) - int id; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -19861827 - ) - int archive; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 393054485 - ) - public int sequence; - @ObfuscatedName("w") - short[] recolorFrom; - @ObfuscatedName("g") - short[] recolorTo; + @Export("SpotAnimationDefinition_cached") + static EvictingDualNodeHashTable SpotAnimationDefinition_cached; @ObfuscatedName("m") - short[] retextureFrom; - @ObfuscatedName("n") - short[] retextureTo; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1945923571 + @ObfuscatedSignature( + descriptor = "Lev;" ) - int widthScale; - @ObfuscatedName("h") + @Export("SpotAnimationDefinition_cachedModels") + static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = -1138122677 + intValue = 324624887 ) - int heightScale; - @ObfuscatedName("a") + static int field3282; + @ObfuscatedName("ix") @ObfuscatedGetter( - intValue = 702880483 + intValue = -787495021 ) - int orientation; + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -378851373 + ) + @Export("id") + int id; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1865720119 + intValue = -1622885381 ) - int ambient; - @ObfuscatedName("c") + @Export("archive") + int archive; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1594131491 + intValue = 1604295303 ) + @Export("sequence") + public int sequence; + @ObfuscatedName("c") + @Export("recolorFrom") + short[] recolorFrom; + @ObfuscatedName("u") + @Export("recolorTo") + short[] recolorTo; + @ObfuscatedName("t") + @Export("retextureFrom") + short[] retextureFrom; + @ObfuscatedName("e") + @Export("retextureTo") + short[] retextureTo; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1171838019 + ) + @Export("widthScale") + int widthScale; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1777738887 + ) + @Export("heightScale") + int heightScale; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 439933857 + ) + @Export("orientation") + int orientation; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -2047701161 + ) + @Export("ambient") + int ambient; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1188839011 + ) + @Export("contrast") int contrast; static { @@ -92,163 +118,190 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; // L: 27 } // L: 29 - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "106" + descriptor = "(Lkb;B)V", + garbageValue = "57" ) + @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 44 - if (var2 == 0) { // L: 45 - return; // L: 48 + int var2 = var1.readUnsignedByte(); // L: 49 + if (var2 == 0) { // L: 50 + return; // L: 53 } - this.decodeNext(var1, var2); // L: 46 + this.decodeNext(var1, var2); // L: 51 } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "1008523619" + descriptor = "(Lkb;II)V", + garbageValue = "-1222478116" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 51 + if (var2 == 1) { // L: 56 this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 52 + } else if (var2 == 2) { // L: 57 this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { // L: 53 + } else if (var2 == 4) { // L: 58 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 54 + } else if (var2 == 5) { // L: 59 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 55 + } else if (var2 == 6) { // L: 60 this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 56 + } else if (var2 == 7) { // L: 61 this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { // L: 57 + } else if (var2 == 8) { // L: 62 this.contrast = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 40) { // L: 58 - var3 = var1.readUnsignedByte(); // L: 59 - this.recolorFrom = new short[var3]; // L: 60 - this.recolorTo = new short[var3]; // L: 61 + if (var2 == 40) { // L: 63 + var3 = var1.readUnsignedByte(); // L: 64 + this.recolorFrom = new short[var3]; // L: 65 + this.recolorTo = new short[var3]; // L: 66 - for (var4 = 0; var4 < var3; ++var4) { // L: 62 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 + for (var4 = 0; var4 < var3; ++var4) { // L: 67 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 68 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 69 } - } else if (var2 == 41) { // L: 67 - var3 = var1.readUnsignedByte(); // L: 68 - this.retextureFrom = new short[var3]; // L: 69 - this.retextureTo = new short[var3]; // L: 70 + } else if (var2 == 41) { // L: 72 + var3 = var1.readUnsignedByte(); // L: 73 + this.retextureFrom = new short[var3]; // L: 74 + this.retextureTo = new short[var3]; // L: 75 - for (var4 = 0; var4 < var3; ++var4) { // L: 71 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 + for (var4 = 0; var4 < var3; ++var4) { // L: 76 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 77 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 78 } } } - } // L: 77 + } // L: 82 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)Ler;", - garbageValue = "-820492992" + descriptor = "(IB)Leh;", + garbageValue = "-32" ) + @Export("getModel") public final Model getModel(int var1) { - Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80 - if (var2 == null) { // L: 81 - ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82 - if (var3 == null) { // L: 83 + Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 85 + if (var2 == null) { // L: 86 + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 87 + if (var3 == null) { // L: 88 return null; } int var4; - if (this.recolorFrom != null) { // L: 84 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 85 - var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 86 + if (this.recolorFrom != null) { // L: 89 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 90 + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 91 } } - if (this.retextureFrom != null) { // L: 89 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 90 - var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 91 + if (this.retextureFrom != null) { // L: 94 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 95 + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 96 } } - var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 94 - SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 95 + var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 99 + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 100 } Model var5; - if (this.sequence != -1 && var1 != -1) { // L: 98 - var5 = WorldMapRegion.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + if (this.sequence != -1 && var1 != -1) { // L: 103 + var5 = class105.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); // L: 99 + var5 = var2.toSharedSpotAnimationModel(true); // L: 104 } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 100 + if (this.widthScale != 128 || this.heightScale != 128) { // L: 105 var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { // L: 101 - if (this.orientation == 90) { // L: 102 + if (this.orientation != 0) { // L: 106 + if (this.orientation == 90) { // L: 107 var5.rotateY90Ccw(); } - if (this.orientation == 180) { // L: 103 - var5.rotateY90Ccw(); // L: 104 - var5.rotateY90Ccw(); // L: 105 - } - - if (this.orientation == 270) { // L: 107 - var5.rotateY90Ccw(); // L: 108 + if (this.orientation == 180) { // L: 108 var5.rotateY90Ccw(); // L: 109 var5.rotateY90Ccw(); // L: 110 } + + if (this.orientation == 270) { // L: 112 + var5.rotateY90Ccw(); // L: 113 + var5.rotateY90Ccw(); // L: 114 + var5.rotateY90Ccw(); // L: 115 + } } - return var5; // L: 113 + return var5; // L: 118 } @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)[Lld;", - garbageValue = "-17" + descriptor = "(ILco;ZI)I", + garbageValue = "2006459682" ) - static PrivateChatMode[] method4518() { - return new PrivateChatMode[]{PrivateChatMode.field3823, PrivateChatMode.field3822, PrivateChatMode.field3821}; // L: 11 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-2117209732" - ) - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 159 - int var4 = 0; // L: 160 - - for (int var5 = 0; var5 < var2; ++var5) { // L: 161 - int var6 = var0[var5 + var1] & 255; // L: 162 - if (var6 != 0) { // L: 163 - if (var6 >= 128 && var6 < 160) { // L: 164 - char var7 = class297.cp1252AsciiExtension[var6 - 128]; // L: 165 - if (var7 == 0) { // L: 166 - var7 = '?'; - } - - var6 = var7; // L: 167 - } - - var3[var4++] = (char)var6; // L: 169 - } + static int method4577(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 497 + Widget var4; + if (var0 >= 2000) { // L: 499 + var0 -= 1000; // L: 500 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 501 + var4 = UserComparator4.getWidget(var3); // L: 502 + } else { + var4 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 504 } - return new String(var3, 0, var4); // L: 171 + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 505 + MilliClock.Interpreter_intStackSize -= 4; // L: 506 + var4.rawX = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 507 + var4.rawY = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 508 + var4.xAlignment = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 509 + var4.yAlignment = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3]; // L: 510 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var4); // L: 511 + ByteArrayPool.client.alignWidget(var4); // L: 512 + if (var3 != -1 && var4.type == 0) { // L: 513 + UserComparator9.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 514 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 516 + MilliClock.Interpreter_intStackSize -= 4; // L: 517 + var4.rawWidth = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 518 + var4.rawHeight = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 519 + var4.widthAlignment = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 520 + var4.heightAlignment = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3]; // L: 521 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var4); // L: 522 + ByteArrayPool.client.alignWidget(var4); // L: 523 + if (var3 != -1 && var4.type == 0) { // L: 524 + UserComparator9.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 525 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 527 + boolean var5 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 528 + if (var5 != var4.isHidden) { // L: 529 + var4.isHidden = var5; // L: 530 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var4); // L: 531 + } + + return 1; // L: 533 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 535 + var4.noClickThrough = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 536 + return 1; // L: 537 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 539 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 540 + return 1; // L: 541 + } else { + return 2; // L: 543 + } } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 2883f13785..4c8c949db0 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -1,21 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lc") +@Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("pixels") public int[] pixels; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("subWidth") public int subWidth; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("subHeight") public int subHeight; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("xOffset") public int xOffset; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("yOffset") int yOffset; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("width") public int width; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("height") public int height; public Sprite(int[] var1, int var2, int var3) { @@ -33,10 +43,11 @@ public final class Sprite extends Rasterizer2D { Sprite() { } // L: 19 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Llp;" + descriptor = "()Llc;" ) + @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { Sprite var1 = new Sprite(this.subWidth, this.subHeight); // L: 34 var1.width = this.width; // L: 35 @@ -53,10 +64,11 @@ public final class Sprite extends Rasterizer2D { return var1; // L: 44 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Llp;" + descriptor = "()Llc;" ) + @Export("copyNormalized") public Sprite copyNormalized() { Sprite var1 = new Sprite(this.width, this.height); // L: 48 @@ -69,12 +81,14 @@ public final class Sprite extends Rasterizer2D { return var1; // L: 54 } - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 } // L: 59 - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 int[] var1 = new int[this.width * this.height]; // L: 63 @@ -93,7 +107,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 74 - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 int var2 = var1; // L: 78 @@ -134,7 +149,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 99 - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 int var2 = 0; // L: 103 @@ -149,7 +165,8 @@ public final class Sprite extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 } // L: 109 - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 int var2 = 0; // L: 113 @@ -164,7 +181,8 @@ public final class Sprite extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 } // L: 119 - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 int var3 = 0; // L: 123 @@ -177,8 +195,8 @@ public final class Sprite extends Rasterizer2D { var6 = var1; } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129 var6 = var1; - } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = var1; // L: 130 + } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { // L: 130 + var6 = var1; } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 131 var6 = var1; } @@ -191,7 +209,8 @@ public final class Sprite extends Rasterizer2D { this.pixels = var2; // L: 136 } // L: 137 - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 int var3 = var2 * this.subWidth; // L: 141 @@ -205,7 +224,8 @@ public final class Sprite extends Rasterizer2D { } // L: 146 - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 149 var2 += this.yOffset; // L: 150 @@ -250,7 +270,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 182 - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; // L: 203 var2 += this.yOffset; // L: 204 @@ -295,7 +316,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 236 - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { // L: 267 int var5 = this.subWidth; // L: 268 @@ -359,7 +381,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 310 - @ObfuscatedName("c") + @ObfuscatedName("r") + @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { // L: 329 this.drawTransBgAt(var1, var2); // L: 330 @@ -408,7 +431,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 331 366 - @ObfuscatedName("r") + @ObfuscatedName("s") + @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; // L: 389 var2 += this.yOffset; // L: 390 @@ -453,7 +477,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 422 - @ObfuscatedName("p") + @ObfuscatedName("d") + @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 441 int var6 = this.subWidth; // L: 442 @@ -517,8 +542,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 484 - @ObfuscatedName("l") - public void method6260(int var1, int var2, int var3) { + @ObfuscatedName("g") + public void method6290(int var1, int var2, int var3) { var1 += this.xOffset; // L: 507 var2 += this.yOffset; // L: 508 int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 509 @@ -559,16 +584,16 @@ public final class Sprite extends Rasterizer2D { if (var7 > 0 && var6 > 0) { // L: 538 if (var3 == 256) { - method6257(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 + method6291(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 } else { - method6258(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 + method6297(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 } } } // L: 541 - @ObfuscatedName("ag") - public void method6278(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ac") + public void method6293(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 582 int var6 = this.subWidth; // L: 583 int var7 = this.subHeight; // L: 584 @@ -628,16 +653,16 @@ public final class Sprite extends Rasterizer2D { } if (var5 == 256) { // L: 624 - method6289(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6285(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6261(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + method6345(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 } } } // L: 626 - @ObfuscatedName("ap") - public void method6262(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("av") + public void method6296(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { int var9 = var2 < 0 ? -var2 : 0; // L: 675 int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 676 int var11 = var1 < 0 ? -var1 : 0; // L: 677 @@ -684,7 +709,8 @@ public final class Sprite extends Rasterizer2D { } // L: 700 - @ObfuscatedName("au") + @ObfuscatedName("ar") + @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 { int var11 = -var3 / 2; // L: 704 @@ -718,8 +744,8 @@ public final class Sprite extends Rasterizer2D { } // L: 729 - @ObfuscatedName("aa") - public void method6264(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("ay") + public void method6303(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; // L: 733 int var11 = -var4 / 2; // L: 734 @@ -757,13 +783,13 @@ public final class Sprite extends Rasterizer2D { } // L: 759 - @ObfuscatedName("ar") - public void method6296(int var1, int var2, int var3, int var4) { - this.method6266(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 + @ObfuscatedName("ah") + public void method6299(int var1, int var2, int var3, int var4) { + this.method6300(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 } // L: 763 - @ObfuscatedName("at") - void method6266(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("az") + void method6300(int var1, int var2, int var3, int var4, int var5, int var6) { if (var6 != 0) { // L: 766 var1 -= this.xOffset << 4; // L: 767 var2 -= this.yOffset << 4; // L: 768 @@ -1231,7 +1257,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 1076 - @ObfuscatedName("aq") + @ObfuscatedName("ak") + @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { // L: 1079 int var5 = var3 * this.xOffset / this.width + var1; // L: 1082 @@ -1353,7 +1380,8 @@ public final class Sprite extends Rasterizer2D { } } // L: 1094 1151 - @ObfuscatedName("n") + @ObfuscatedName("e") + @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) { // L: 185 int var9; @@ -1372,7 +1400,8 @@ public final class Sprite extends Rasterizer2D { } // L: 200 - @ObfuscatedName("h") + @ObfuscatedName("n") + @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); // L: 239 var5 = -(var5 & 3); // L: 240 @@ -1424,7 +1453,8 @@ public final class Sprite extends Rasterizer2D { } // L: 264 - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 313 @@ -1449,7 +1479,8 @@ public final class Sprite extends Rasterizer2D { } // L: 326 - @ObfuscatedName("j") + @ObfuscatedName("y") + @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; // L: 369 int var12 = (var10 & 16711935) * var11 & -16711936; // L: 370 @@ -1474,7 +1505,8 @@ public final class Sprite extends Rasterizer2D { } // L: 386 - @ObfuscatedName("u") + @ObfuscatedName("j") + @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; // L: 425 @@ -1495,7 +1527,8 @@ public final class Sprite extends Rasterizer2D { } // L: 438 - @ObfuscatedName("b") + @ObfuscatedName("a") + @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { int var13 = 256 - var12; // L: 487 int var14 = var3; // L: 488 @@ -1522,8 +1555,8 @@ public final class Sprite extends Rasterizer2D { } // L: 504 - @ObfuscatedName("e") - static void method6257(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("h") + static void method6291(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) { // L: 544 for (var6 = -var9; var6 < 0; ++var6) { // L: 545 var0 = var4[var5++]; // L: 546 @@ -1545,7 +1578,7 @@ public final class Sprite extends Rasterizer2D { } // L: 559 @ObfuscatedName("ab") - static void method6258(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) { + static void method6297(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) { // L: 562 for (var6 = -var9; var6 < 0; ++var6) { // L: 563 var0 = var4[var5++]; // L: 564 @@ -1569,7 +1602,7 @@ public final class Sprite extends Rasterizer2D { } // L: 579 @ObfuscatedName("ao") - static void method6289(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) { + static void method6285(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) { // L: 629 630 var7 = var15 * (var9 >> 16); // L: 631 @@ -1595,8 +1628,8 @@ public final class Sprite extends Rasterizer2D { } // L: 648 - @ObfuscatedName("ae") - static void method6261(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("af") + static void method6345(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) { // L: 651 652 var7 = var15 * (var9 >> 16); // L: 653 diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 21cbcc418b..4d77088da8 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -1,62 +1,435 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hz") +@ObfuscatedName("ho") +@Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("w") + @ObfuscatedName("rl") @ObfuscatedGetter( - intValue = -1396616335 + intValue = -1921410783 ) - static int field2552; - @ObfuscatedName("z") + static int field2542; + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "[Lle;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2052975947 + intValue = 387841137 ) + @Export("width") public final int width; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -583477063 + intValue = 1259434667 ) + @Export("height") public final int height; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 712 - this.height = var2; // L: 713 - this.xWidths = var3; // L: 714 - this.xStarts = var4; // L: 715 - } // L: 716 + this.width = var1; // L: 735 + this.height = var2; // L: 736 + this.xWidths = var3; // L: 737 + this.xStarts = var4; // L: 738 + } // L: 739 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1864355280" + descriptor = "(IIB)Z", + garbageValue = "92" ) + @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 719 - int var3 = this.xStarts[var2]; // L: 720 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 721 + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 742 + int var3 = this.xStarts[var2]; // L: 743 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 744 return true; } } - return false; // L: 723 + return false; // L: 746 } - @ObfuscatedName("ku") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Lhq;I)Ljava/lang/String;", - garbageValue = "1504596976" + descriptor = "(ILco;ZI)I", + garbageValue = "-239225469" ) - static String Widget_getSpellActionName(Widget var0) { - if (GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var0)) == 0) { // L: 10744 - return null; + static int method4119(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 1913 + if (WorldMapLabelSize.friendSystem.field1097 == 0) { // L: 1914 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -2; + } else if (WorldMapLabelSize.friendSystem.field1097 == 1) { // L: 1915 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapLabelSize.friendSystem.friendsList.getSize(); // L: 1916 + } + + return 1; // L: 1917 } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 10745 10746 10748 + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1920 + if (WorldMapLabelSize.friendSystem.method1958() && var3 >= 0 && var3 < WorldMapLabelSize.friendSystem.friendsList.getSize()) { // L: 1921 + Friend var8 = (Friend)WorldMapLabelSize.friendSystem.friendsList.get(var3); // L: 1922 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var8.getName(); // L: 1923 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 1924 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1927 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1928 + } + + return 1; // L: 1930 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1933 + if (WorldMapLabelSize.friendSystem.method1958() && var3 >= 0 && var3 < WorldMapLabelSize.friendSystem.friendsList.getSize()) { // L: 1934 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ((Buddy)WorldMapLabelSize.friendSystem.friendsList.get(var3)).world; // L: 1935 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1937 + } + + return 1; // L: 1938 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1941 + if (WorldMapLabelSize.friendSystem.method1958() && var3 >= 0 && var3 < WorldMapLabelSize.friendSystem.friendsList.getSize()) { // L: 1942 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ((Buddy)WorldMapLabelSize.friendSystem.friendsList.get(var3)).rank; // L: 1943 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1945 + } + + return 1; // L: 1946 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1949 + int var6 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1950 + GameShell.method1138(var5, var6); // L: 1951 + return 1; // L: 1952 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1955 + WorldMapLabelSize.friendSystem.addFriend(var5); // L: 1956 + return 1; // L: 1957 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1960 + WorldMapLabelSize.friendSystem.removeFriend(var5); // L: 1961 + return 1; // L: 1962 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1965 + WorldMapLabelSize.friendSystem.addIgnore(var5); // L: 1966 + return 1; // L: 1967 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1970 + WorldMapLabelSize.friendSystem.removeIgnore(var5); // L: 1971 + return 1; // L: 1972 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 1975 + var5 = GrandExchangeOfferUnitPriceComparator.method218(var5); // L: 1976 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapLabelSize.friendSystem.isFriended(new Username(var5, UserComparator4.loginType), false) ? 1 : 0; // L: 1977 + return 1; // L: 1978 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (DevicePcmPlayerProvider.clanChat != null) { // L: 1981 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.name; // L: 1982 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1984 + } + + return 1; // L: 1985 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (DevicePcmPlayerProvider.clanChat != null) { // L: 1988 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat.getSize(); // L: 1989 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1991 + } + + return 1; // L: 1992 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1995 + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { // L: 1996 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.get(var3).getUsername().getName(); // L: 1997 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 1999 + } + + return 1; // L: 2000 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2003 + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { // L: 2004 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).getWorld(); // L: 2005 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2007 + } + + return 1; // L: 2008 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2011 + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { // L: 2012 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).rank; // L: 2013 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2015 + } + + return 1; // L: 2016 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.minKick : 0; // L: 2019 + return 1; // L: 2020 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2023 + ScriptFrame.clanKickUser(var5); // L: 2024 + return 1; // L: 2025 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.rank * 1309828391 * 1444461207 : 0; // L: 2028 + return 1; // L: 2029 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2032 + Message.Clan_joinChat(var5); // L: 2033 + return 1; // L: 2034 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + class1.Clan_leaveChat(); // L: 2037 + return 1; // L: 2038 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!WorldMapLabelSize.friendSystem.method1958()) { // L: 2041 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapLabelSize.friendSystem.ignoreList.getSize(); // L: 2042 + } + + return 1; // L: 2043 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2046 + if (WorldMapLabelSize.friendSystem.method1958() && var3 >= 0 && var3 < WorldMapLabelSize.friendSystem.ignoreList.getSize()) { // L: 2047 + Ignored var4 = (Ignored)WorldMapLabelSize.friendSystem.ignoreList.get(var3); // L: 2048 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2049 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2050 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2053 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2054 + } + + return 1; // L: 2056 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2059 + var5 = GrandExchangeOfferUnitPriceComparator.method218(var5); // L: 2060 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapLabelSize.friendSystem.isIgnored(new Username(var5, UserComparator4.loginType)) ? 1 : 0; // L: 2061 + return 1; // L: 2062 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2065 + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && DevicePcmPlayerProvider.clanChat.get(var3).getUsername().equals(PlayerType.localPlayer.username)) { // L: 2066 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; // L: 2067 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2069 + } + + return 1; // L: 2070 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (DevicePcmPlayerProvider.clanChat != null && DevicePcmPlayerProvider.clanChat.owner != null) { // L: 2073 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.owner; // L: 2074 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2076 + } + + return 1; // L: 2077 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2080 + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate)DevicePcmPlayerProvider.clanChat.get(var3)).isFriend()) { // L: 2081 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; // L: 2082 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2084 + } + + return 1; // L: 2085 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + WorldMapLabelSize.friendSystem.friendsList.removeComparator(); // L: 2096 + return 1; // L: 2097 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2100 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2101 + return 1; // L: 2102 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2105 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2106 + return 1; // L: 2107 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2110 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2111 + return 1; // L: 2112 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2115 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2116 + return 1; // L: 2117 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2120 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2121 + return 1; // L: 2122 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2125 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2126 + return 1; // L: 2127 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2130 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2131 + return 1; // L: 2132 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2135 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2136 + return 1; // L: 2137 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2140 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2141 + return 1; // L: 2142 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2145 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2146 + return 1; // L: 2147 + } else if (var0 == 3639) { + WorldMapLabelSize.friendSystem.friendsList.sort(); // L: 2150 + return 1; // L: 2151 + } else if (var0 == 3640) { + WorldMapLabelSize.friendSystem.ignoreList.removeComparator(); // L: 2154 + return 1; // L: 2155 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2158 + WorldMapLabelSize.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2159 + return 1; // L: 2160 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2163 + WorldMapLabelSize.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2164 + return 1; // L: 2165 + } else if (var0 == 3643) { + WorldMapLabelSize.friendSystem.ignoreList.sort(); // L: 2168 + return 1; // L: 2169 + } else if (var0 == 3644) { + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2172 + DevicePcmPlayerProvider.clanChat.removeComparator(); // L: 2173 + } + + return 1; // L: 2175 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2178 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2179 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator1(var7)); // L: 2180 + } + + return 1; // L: 2182 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2185 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2186 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator2(var7)); // L: 2187 + } + + return 1; // L: 2189 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2192 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2193 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator3(var7)); // L: 2194 + } + + return 1; // L: 2196 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2199 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2200 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator4(var7)); // L: 2201 + } + + return 1; // L: 2203 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2206 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2207 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator5(var7)); // L: 2208 + } + + return 1; // L: 2210 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2213 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2214 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator6(var7)); // L: 2215 + } + + return 1; // L: 2217 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2220 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2221 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator7(var7)); // L: 2222 + } + + return 1; // L: 2224 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2227 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2228 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator8(var7)); // L: 2229 + } + + return 1; // L: 2231 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2234 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2235 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator9(var7)); // L: 2236 + } + + return 1; // L: 2238 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2241 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2242 + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator10(var7)); // L: 2243 + } + + return 1; // L: 2245 + } else if (var0 == 3655) { + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2248 + DevicePcmPlayerProvider.clanChat.sort(); // L: 2249 + } + + return 1; // L: 2251 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2254 + WorldMapLabelSize.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2255 + return 1; // L: 2256 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2259 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 2260 + DevicePcmPlayerProvider.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2261 + } + + return 1; // L: 2263 + } else { + return 2; // L: 2265 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2088 + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate)DevicePcmPlayerProvider.clanChat.get(var3)).isIgnored()) { // L: 2089 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; // L: 2090 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2092 + } + + return 1; // L: 2093 + } + } } } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "1" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 115 + } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 9c7543c61b..4984f7ea82 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,69 +1,72 @@ -import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hy") +@ObfuscatedName("he") +@Implements("Strings") public class Strings { - @ObfuscatedName("bj") - public static String field2988; - @ObfuscatedName("cx") - public static String field2936; + @ObfuscatedName("bg") + public static String field2839; + @ObfuscatedName("cj") + public static String field3046; @ObfuscatedName("jv") - public static String field3067; - @ObfuscatedName("ji") - public static String field3015; - @ObfuscatedName("jb") - public static String field3069; + public static String field3054; + @ObfuscatedName("js") + public static String field3055; + @ObfuscatedName("ja") + public static String field3056; static { - field2988 = "Please visit the support page for assistance."; // L: 60 - field2936 = "Please visit the support page for assistance."; // L: 99 - field3067 = ""; // L: 275 - field3015 = "Page has opened in a new window."; // L: 276 - field3069 = "(Please check your popup blocker.)"; // L: 277 + field2839 = "Please visit the support page for assistance."; // L: 60 + field3046 = "Please visit the support page for assistance."; // L: 99 + field3054 = ""; // L: 275 + field3055 = "Page has opened in a new window."; // L: 276 + field3056 = "(Please check your popup blocker.)"; // L: 277 } // L: 307 - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-21" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1467551929" ) - static void method4202() { - if (Login.clearLoginScreen) { // L: 226 - class296.titleboxSprite = null; // L: 227 - ModelData0.titlebuttonSprite = null; // L: 228 - GrandExchangeOfferTotalQuantityComparator.runesSprite = null; // L: 229 - UserComparator2.leftTitleSprite = null; // L: 230 - Login.rightTitleSprite = null; // L: 231 - AbstractByteArrayCopier.logoSprite = null; // L: 232 - ClientPreferences.title_muteSprite = null; // L: 233 - class227.options_buttons_0Sprite = null; // L: 234 - MusicPatchNode2.options_buttons_2Sprite = null; // L: 235 - MidiPcmStream.worldSelectBackSprites = null; // L: 236 - AbstractWorldMapIcon.worldSelectFlagSprites = null; // L: 237 - MusicPatchNode.worldSelectArrows = null; // L: 238 - Login.worldSelectStars = null; // L: 239 - class7.field36 = null; // L: 240 - Varcs.loginScreenRunesAnimation.method1904(); // L: 241 - class58.method915(2); // L: 242 - if (NetCache.NetCache_socket != null) { // L: 244 - try { - Buffer var0 = new Buffer(4); // L: 246 - var0.writeByte(2); // L: 247 - var0.writeMedium(0); // L: 248 - NetCache.NetCache_socket.write(var0.array, 0, 4); // L: 249 - } catch (IOException var3) { - try { - NetCache.NetCache_socket.close(); // L: 253 - } catch (Exception var2) { // L: 255 - } - - ++NetCache.NetCache_ioExceptions; // L: 256 - NetCache.NetCache_socket = null; // L: 257 - } - } - - Login.clearLoginScreen = false; // L: 260 + @Export("inventoryQuantityFormat") + static final String inventoryQuantityFormat(int var0) { + if (var0 < 100000) { // L: 413 + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 414 415 } - } // L: 261 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILco;ZB)I", + garbageValue = "58" + ) + static int method4259(int var0, Script var1, boolean var2) { + Widget var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 1165 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1166 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.x; // L: 1167 + return 1; // L: 1168 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1170 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.y; // L: 1171 + return 1; // L: 1172 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1174 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.width; // L: 1175 + return 1; // L: 1176 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1178 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.height; // L: 1179 + return 1; // L: 1180 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1182 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1183 + return 1; // L: 1184 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1186 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.parentId; // L: 1187 + return 1; // L: 1188 + } else { + return 2; // L: 1190 + } + } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index f638381065..39105228a7 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -1,22 +1,28 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("jo") +@Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) + @Export("StructDefinition_cached") static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lll;" ) + @Export("params") IterableNodeHashTable params; static { @@ -26,19 +32,21 @@ public class StructDefinition extends DualNode { StructDefinition() { } // L: 16 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2018201430" + garbageValue = "-1231164770" ) + @Export("postDecode") void postDecode() { } // L: 33 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "1854456107" + descriptor = "(Lkb;I)V", + garbageValue = "-1053369133" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 37 @@ -50,55 +58,68 @@ public class StructDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "1912740742" + descriptor = "(Lkb;II)V", + garbageValue = "-941858292" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = PacketWriter.readStringIntParameters(var1, this.params); // L: 44 + this.params = InvDefinition.readStringIntParameters(var1, this.params); // L: 44 } } // L: 46 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "1" + descriptor = "(III)I", + garbageValue = "408521937" ) + @Export("getIntParam") public int getIntParam(int var1, int var2) { - return Username.method5309(this.params, var1, var2); // L: 49 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "101" - ) - public String getStringParam(int var1, String var2) { - IterableNodeHashTable var4 = this.params; // L: 54 - String var3; - if (var4 == null) { // L: 56 - var3 = var2; // L: 57 + IterableNodeHashTable var4 = this.params; // L: 50 + int var3; + if (var4 == null) { // L: 52 + var3 = var2; // L: 53 } else { - ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 60 - if (var5 == null) { // L: 61 - var3 = var2; // L: 62 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 56 + if (var5 == null) { // L: 57 + var3 = var2; // L: 58 } else { - var3 = (String)var5.obj; // L: 65 + var3 = var5.integer; // L: 61 } } - return var3; // L: 67 + return var3; // L: 63 } - @ObfuscatedName("hl") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "-1032705828" + descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "7540" ) - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - Tiles.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8236 - } // L: 8237 + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + return WorldMapSection0.method307(this.params, var1, var2); // L: 67 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "22" + ) + @Export("getEntityIdUnderMouse") + public static int getEntityIdUnderMouse(int var0) { + return ObjectSound.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1317179334" + ) + public static void method4699() { + StructDefinition_cached.clear(); // L: 71 + } // L: 72 } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 3af0e84342..c1df34f0bd 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -1,46 +1,57 @@ +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("is") +@ObfuscatedName("ik") +@Implements("StudioGame") public enum StudioGame implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + @Export("runescape") + runescape("runescape", "RuneScape", 0), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + @Export("stellardawn") + stellardawn("stellardawn", "Stellar Dawn", 1), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + @Export("game3") + game3("game3", "Game 3", 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lik;" + ) + @Export("game4") + game4("game4", "Game 4", 3), @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lis;" - ) - runescape("runescape", "RuneScape", 0), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - game3("game3", "Game 3", 2), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lis;" - ) - game4("game4", "Game 4", 3), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lik;" ) + @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lik;" ) + @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("name") public final String name; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1491225247 + intValue = 1622621893 ) + @Export("id") final int id; StudioGame(String var3, String var4, int var5) { @@ -48,21 +59,13 @@ public enum StudioGame implements Enumerated { this.id = var5; // L: 22 } // L: 23 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 26 } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1502336414" - ) - public static boolean method4230(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; // L: 13 - } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index b3fc251844..4b9b6b6084 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -1,26 +1,35 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("fu") +@Implements("Task") public class Task { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lfu;" ) + @Export("next") Task next; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("status") public volatile int status; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1774016279 + intValue = -1399267459 ) + @Export("type") int type; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("intArgument") public int intArgument; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("objectArgument") Object objectArgument; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("result") public volatile Object result; Task() { diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 867bd6adf1..04f155ec8f 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -2,47 +2,55 @@ import java.io.DataInputStream; import java.net.InetAddress; import java.net.Socket; import java.net.URL; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fl") +@Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("w") - static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("lp") + @ObfuscatedName("hl") @ObfuscatedSignature( - descriptor = "Lcf;" + descriptor = "[Llc;" ) - static MenuAction tempMenuAction; - @ObfuscatedName("s") + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lfu;" ) + @Export("current") Task current; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lfu;" ) + @Export("task") Task task; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("isClosed") boolean isClosed; public TaskHandler() { - this.current = null; - this.task = null; + this.current = null; // L: 11 + this.task = null; // L: 12 this.isClosed = false; // L: 14 - javaVendor = "Unknown"; - javaVersion = "1.6"; + javaVendor = "Unknown"; // L: 20 + javaVersion = "1.6"; // L: 21 try { - javaVendor = System.getProperty("java.vendor"); - javaVersion = System.getProperty("java.version"); + javaVendor = System.getProperty("java.vendor"); // L: 23 + javaVersion = System.getProperty("java.version"); // L: 24 } catch (Exception var2) { // L: 26 } @@ -53,11 +61,12 @@ public class TaskHandler implements Runnable { this.thread.start(); // L: 31 } // L: 32 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1905813436" + descriptor = "(B)V", + garbageValue = "14" ) + @Export("close") public final void close() { synchronized(this) { // L: 35 this.isClosed = true; // L: 36 @@ -71,11 +80,12 @@ public class TaskHandler implements Runnable { } // L: 43 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;B)Lfl;", - garbageValue = "1" + descriptor = "(IIILjava/lang/Object;B)Lfu;", + garbageValue = "44" ) + @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { Task var5 = new Task(); // L: 90 var5.type = var1; // L: 91 @@ -94,20 +104,22 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lfl;", - garbageValue = "-1230716173" + descriptor = "(Ljava/lang/String;II)Lfu;", + garbageValue = "1542542692" ) + @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lfl;", - garbageValue = "1199992408" + descriptor = "(Ljava/lang/Runnable;IS)Lfu;", + garbageValue = "3910" ) + @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { return this.newTask(2, var2, 0, var1); // L: 112 } @@ -160,40 +172,12 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Liy;", - garbageValue = "960281764" + descriptor = "(ZZI)Lle;", + garbageValue = "1626700828" ) - public static VarbitDefinition method3567(int var0) { - VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); // L: 19 - if (var1 != null) { // L: 20 - return var1; - } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); // L: 21 - var1 = new VarbitDefinition(); // L: 22 - if (var2 != null) { // L: 23 - var1.decode(new Buffer(var2)); - } - - VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); // L: 24 - return var1; // L: 25 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1918850707" - ) - public static int method3568(int var0, int var1, int var2) { - var2 &= 3; // L: 9 - if (var2 == 0) { // L: 10 - return var0; - } else if (var2 == 1) { // L: 11 - return var1; - } else { - return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 - } + static IndexedSprite method3609(boolean var0, boolean var1) { + return var0 ? (var1 ? DevicePcmPlayerProvider.field439 : Login.options_buttons_2Sprite) : (var1 ? class69.field583 : Login.options_buttons_0Sprite); // L: 199 } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 17fe14cdae..30f058af21 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -1,38 +1,48 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("ez") +@Implements("Texture") public class Texture extends Node { - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("averageRGB") int averageRGB; - @ObfuscatedName("o") - boolean field1647; - @ObfuscatedName("x") + @ObfuscatedName("q") + boolean field1655; + @ObfuscatedName("k") + @Export("fileIds") int[] fileIds; - @ObfuscatedName("w") - int[] field1649; - @ObfuscatedName("g") - int[] field1650; - @ObfuscatedName("m") - int[] field1651; - @ObfuscatedName("n") + @ObfuscatedName("c") + int[] field1652; + @ObfuscatedName("u") + int[] field1653; + @ObfuscatedName("t") + int[] field1658; + @ObfuscatedName("e") + @Export("animationDirection") int animationDirection; - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("h") + @ObfuscatedName("n") + @Export("pixels") int[] pixels; - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) Texture(Buffer var1) { this.isLoaded = false; // L: 25 this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field1647 = var1.readUnsignedByte() == 1; // L: 30 + this.field1655 = var1.readUnsignedByte() == 1; // L: 30 int var2 = var1.readUnsignedByte(); // L: 31 if (var2 >= 1 && var2 <= 4) { // L: 32 this.fileIds = new int[var2]; // L: 35 @@ -43,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { // L: 37 - this.field1649 = new int[var2 - 1]; // L: 38 + this.field1652 = new int[var2 - 1]; // L: 38 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field1649[var3] = var1.readUnsignedByte(); + this.field1652[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { // L: 41 - this.field1650 = new int[var2 - 1]; // L: 42 + this.field1653 = new int[var2 - 1]; // L: 42 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field1650[var3] = var1.readUnsignedByte(); + this.field1653[var3] = var1.readUnsignedByte(); } } - this.field1651 = new int[var2]; // L: 45 + this.field1658 = new int[var2]; // L: 45 for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field1651[var3] = var1.readInt(); + this.field1658[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); // L: 47 @@ -72,10 +82,11 @@ public class Texture extends Node { } } // L: 50 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(DILic;)Z" + descriptor = "(DILiw;)Z" ) + @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { int var5; for (var5 = 0; var5 < this.fileIds.length; ++var5) { // L: 53 @@ -88,100 +99,95 @@ public class Texture extends Node { this.pixels = new int[var5]; // L: 57 for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - int var8 = this.fileIds[var6]; // L: 60 - IndexedSprite var7; - if (!class197.method3742(var4, var8)) { // L: 62 - var7 = null; // L: 63 - } else { - var7 = InvDefinition.method4448(); // L: 66 + IndexedSprite var7 = class298.method5411(var4, this.fileIds[var6]); // L: 59 + var7.normalize(); // L: 60 + byte[] var8 = var7.pixels; // L: 61 + int[] var9 = var7.palette; // L: 62 + int var10 = this.field1658[var6]; // L: 63 + if ((var10 & -16777216) == 16777216) { // L: 64 } - var7.normalize(); // L: 69 - byte[] var10 = var7.pixels; // L: 70 - int[] var11 = var7.palette; // L: 71 - int var12 = this.field1651[var6]; // L: 72 - if ((var12 & -16777216) == 16777216) { // L: 73 - } - - if ((var12 & -16777216) == 33554432) { // L: 74 + if ((var10 & -16777216) == 33554432) { // L: 65 } + int var11; + int var12; int var13; int var14; - int var15; - int var16; - if ((var12 & -16777216) == 50331648) { // L: 75 - var13 = var12 & 16711935; // L: 76 - var14 = var12 >> 8 & 255; // L: 77 + if ((var10 & -16777216) == 50331648) { // L: 66 + var11 = var10 & 16711935; // L: 67 + var12 = var10 >> 8 & 255; // L: 68 - for (var15 = 0; var15 < var11.length; ++var15) { // L: 78 - var16 = var11[var15]; // L: 79 - if (var16 >> 8 == (var16 & 65535)) { // L: 80 - var16 &= 255; // L: 81 - var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; // L: 82 + for (var13 = 0; var13 < var9.length; ++var13) { // L: 69 + var14 = var9[var13]; // L: 70 + if (var14 >> 8 == (var14 & 65535)) { // L: 71 + var14 &= 255; // L: 72 + var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; // L: 73 } } } - for (var13 = 0; var13 < var11.length; ++var13) { // L: 86 - var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); + for (var11 = 0; var11 < var9.length; ++var11) { // L: 77 + var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } - if (var6 == 0) { // L: 88 - var13 = 0; + if (var6 == 0) { // L: 79 + var11 = 0; } else { - var13 = this.field1649[var6 - 1]; // L: 89 + var11 = this.field1652[var6 - 1]; // L: 80 } - if (var13 == 0) { // L: 90 - if (var3 == var7.subWidth) { // L: 91 - for (var14 = 0; var14 < var5; ++var14) { // L: 92 - this.pixels[var14] = var11[var10[var14] & 255]; + if (var11 == 0) { // L: 81 + if (var3 == var7.subWidth) { // L: 82 + for (var12 = 0; var12 < var5; ++var12) { // L: 83 + this.pixels[var12] = var9[var8[var12] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { // L: 94 - var14 = 0; // L: 95 + } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 + var12 = 0; // L: 86 - for (var15 = 0; var15 < var3; ++var15) { // L: 96 - for (var16 = 0; var16 < var3; ++var16) { // L: 97 - this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; + for (var13 = 0; var13 < var3; ++var13) { // L: 87 + for (var14 = 0; var14 < var3; ++var14) { // L: 88 + this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { // L: 100 - throw new RuntimeException(); // L: 107 + if (var7.subWidth != 128 || var3 != 64) { // L: 91 + throw new RuntimeException(); // L: 98 } - var14 = 0; // L: 101 + var12 = 0; // L: 92 - for (var15 = 0; var15 < var3; ++var15) { // L: 102 - for (var16 = 0; var16 < var3; ++var16) { // L: 103 - this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; + for (var13 = 0; var13 < var3; ++var13) { // L: 93 + for (var14 = 0; var14 < var3; ++var14) { // L: 94 + this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if (var13 == 1) { // L: 110 + if (var11 == 1) { // L: 101 } - if (var13 == 2) { // L: 111 + if (var11 == 2) { // L: 102 } - if (var13 == 3) { // L: 112 + if (var11 == 3) { // L: 103 } } - return true; // L: 114 + return true; // L: 105 } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("reset") void reset() { - this.pixels = null; // L: 118 - } // L: 119 + this.pixels = null; // L: 109 + } // L: 110 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("animate") void animate(int var1) { - if (this.pixels != null) { // L: 122 + if (this.pixels != null) { // L: 113 short var2; int var3; int var4; @@ -189,65 +195,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 123 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 124 + if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 114 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 115 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 126 + if (this.pixels.length == 4096) { // L: 117 var2 = 64; } else { - var2 = 128; // L: 127 + var2 = 128; // L: 118 } - var3 = this.pixels.length; // L: 128 - var4 = var2 * this.animationSpeed * var1; // L: 129 - var5 = var3 - 1; // L: 130 - if (this.animationDirection == 1) { // L: 131 + var3 = this.pixels.length; // L: 119 + var4 = var2 * this.animationSpeed * var1; // L: 120 + var5 = var3 - 1; // L: 121 + if (this.animationDirection == 1) { // L: 122 var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { // L: 132 - var7 = var6 + var4 & var5; // L: 133 - Texture_animatedPixels[var6] = this.pixels[var7]; // L: 134 + for (var6 = 0; var6 < var3; ++var6) { // L: 123 + var7 = var6 + var4 & var5; // L: 124 + Texture_animatedPixels[var6] = this.pixels[var7]; // L: 125 } - var10 = this.pixels; // L: 136 - this.pixels = Texture_animatedPixels; // L: 137 - Texture_animatedPixels = var10; // L: 138 + var10 = this.pixels; // L: 127 + this.pixels = Texture_animatedPixels; // L: 128 + Texture_animatedPixels = var10; // L: 129 } - if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 140 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 141 + if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 131 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 132 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 143 + if (this.pixels.length == 4096) { // L: 134 var2 = 64; } else { - var2 = 128; // L: 144 + var2 = 128; // L: 135 } - var3 = this.pixels.length; // L: 145 - var4 = this.animationSpeed * var1; // L: 146 - var5 = var2 - 1; // L: 147 - if (this.animationDirection == 2) { // L: 148 + var3 = this.pixels.length; // L: 136 + var4 = this.animationSpeed * var1; // L: 137 + var5 = var2 - 1; // L: 138 + if (this.animationDirection == 2) { // L: 139 var4 = -var4; } - for (var6 = 0; var6 < var3; var6 += var2) { // L: 149 - for (var7 = 0; var7 < var2; ++var7) { // L: 150 - int var8 = var6 + var7; // L: 151 - int var9 = var6 + (var7 + var4 & var5); // L: 152 - Texture_animatedPixels[var8] = this.pixels[var9]; // L: 153 + for (var6 = 0; var6 < var3; var6 += var2) { // L: 140 + for (var7 = 0; var7 < var2; ++var7) { // L: 141 + int var8 = var6 + var7; // L: 142 + int var9 = var6 + (var7 + var4 & var5); // L: 143 + Texture_animatedPixels[var8] = this.pixels[var9]; // L: 144 } } - var10 = this.pixels; // L: 156 - this.pixels = Texture_animatedPixels; // L: 157 - Texture_animatedPixels = var10; // L: 158 + var10 = this.pixels; // L: 147 + this.pixels = Texture_animatedPixels; // L: 148 + Texture_animatedPixels = var10; // L: 149 } } - } // L: 160 + } // L: 151 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index ba6a1e7743..a058b1fb5d 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -1,33 +1,39 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("ea") +@Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1265290789" + garbageValue = "1646805002" ) + @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "260599249" + garbageValue = "-914943322" ) + @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "168595235" + garbageValue = "-335824430" ) - boolean vmethod3396(int var1); + boolean vmethod3401(int var1); - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "14506" + descriptor = "(II)Z", + garbageValue = "533356584" ) + @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 9b7c4f8aa2..186fc269ea 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -1,90 +1,102 @@ +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("dt") +@ObfuscatedName("du") +@Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("ri") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1518116289 + intValue = 1514159297 ) static int field1561; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Leo;" + descriptor = "[Lez;" ) + @Export("textures") Texture[] textures; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lja;" + ) + @Export("deque") + NodeDeque deque; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1277948479 + ) + @Export("capacity") + int capacity; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1933585105 + ) + @Export("remaining") + int remaining; + @ObfuscatedName("z") + @Export("brightness") + double brightness; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1967077047 + ) + @Export("textureSize") + int textureSize; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lji;" - ) - NodeDeque deque; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1194513141 - ) - int capacity; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1829748835 - ) - int remaining; - @ObfuscatedName("i") - double brightness; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -436241833 - ) - int textureSize; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lic;Lic;IDI)V" + descriptor = "(Liw;Liw;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); // L: 9 this.remaining = 0; // L: 11 this.brightness = 1.0D; // L: 12 this.textureSize = 128; // L: 13 - this.archive = var2; - this.capacity = var3; - this.remaining = this.capacity; + this.archive = var2; // L: 17 + this.capacity = var3; // L: 18 + this.remaining = this.capacity; // L: 19 this.brightness = var4; // L: 20 - this.textureSize = var6; + this.textureSize = var6; // L: 21 int[] var7 = var1.getGroupFileIds(0); // L: 22 - int var8 = var7.length; - this.textures = new Texture[var1.getGroupFileCount(0)]; + int var8 = var7.length; // L: 23 + this.textures = new Texture[var1.getGroupFileCount(0)]; // L: 24 for (int var9 = 0; var9 < var8; ++var9) { - Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); // L: 26 + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); this.textures[var7[var9]] = new Texture(var10); } } // L: 29 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "861798052" + garbageValue = "185901230" ) + @Export("getLoadedPercentage") public int getLoadedPercentage() { - int var1 = 0; // L: 32 - int var2 = 0; // L: 33 + int var1 = 0; + int var2 = 0; Texture[] var3 = this.textures; // L: 35 for (int var4 = 0; var4 < var3.length; ++var4) { // L: 36 - Texture var5 = var3[var4]; // L: 37 - if (var5 != null && var5.fileIds != null) { // L: 39 - var1 += var5.fileIds.length; // L: 40 - int[] var6 = var5.fileIds; + Texture var5 = var3[var4]; + if (var5 != null && var5.fileIds != null) { + var1 += var5.fileIds.length; + int[] var6 = var5.fileIds; // L: 42 for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 int var8 = var6[var7]; // L: 44 - if (this.archive.method4251(var8)) { // L: 46 + if (this.archive.method4301(var8)) { // L: 46 ++var2; // L: 47 } } @@ -98,17 +110,19 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; // L: 60 this.clear(); // L: 61 } // L: 62 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-1265290789" + garbageValue = "1646805002" ) + @Export("getTexturePixels") public int[] getTexturePixels(int var1) { Texture var2 = this.textures[var1]; // L: 65 if (var2 != null) { // L: 66 @@ -136,38 +150,41 @@ public class TextureProvider implements TextureLoader { return null; // L: 84 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "260599249" + garbageValue = "-914943322" ) + @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "168595235" + garbageValue = "-335824430" ) - public boolean vmethod3396(int var1) { - return this.textures[var1].field1647; // L: 93 + public boolean vmethod3401(int var1) { + return this.textures[var1].field1655; // L: 93 } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "14506" + descriptor = "(II)Z", + garbageValue = "533356584" ) + @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "8" + garbageValue = "-60" ) + @Export("clear") public void clear() { for (int var1 = 0; var1 < this.textures.length; ++var1) { // L: 101 if (this.textures[var1] != null) { // L: 102 @@ -179,11 +196,12 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; // L: 105 } // L: 106 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-736148510" + garbageValue = "-2135201206" ) + @Export("animate") public void animate(int var1) { for (int var2 = 0; var2 < this.textures.length; ++var2) { // L: 109 Texture var3 = this.textures[var2]; // L: 110 @@ -195,48 +213,36 @@ public class TextureProvider implements TextureLoader { } // L: 116 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "194887508" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-524621860" ) - public static boolean method2876(int var0) { - return var0 >= WorldMapDecorationType.field2760.id && var0 <= WorldMapDecorationType.field2757.id || var0 == WorldMapDecorationType.field2761.id; // L: 42 - } + static void method2899(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 + var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 + } // L: 40 - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "([Lgq;II)Lgq;", - garbageValue = "1374231902" + descriptor = "(IIIIIIB)I", + garbageValue = "-103" ) - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; // L: 17 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - Enumerated var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 - } + public static int method2906(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 25 + int var6 = var3; // L: 26 + var3 = var4; // L: 27 + var4 = var6; // L: 28 } - return null; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IB)Lij;", - garbageValue = "38" - ) - public static GameBuild method2863(int var0) { - GameBuild[] var1 = IgnoreList.method5182(); // L: 23 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24 - GameBuild var3 = var1[var2]; // L: 25 - if (var0 == var3.buildId) { - return var3; // L: 27 - } + var2 &= 3; // L: 30 + if (var2 == 0) { // L: 31 + return var0; + } else if (var2 == 1) { // L: 32 + return var1; + } else { + return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 33 34 } - - return null; // L: 31 } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index bfa1877eca..e37dd53534 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,124 +1,191 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("eo") +@Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("sg") - @ObfuscatedSignature( - descriptor = "Lce;" - ) - static ClientPreferences clientPreferences; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -400770483 - ) - int originalPlane; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1404568893 + intValue = -1401858365 ) + @Export("plane") int plane; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -378034661 + intValue = 1121105615 ) + @Export("x") int x; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -266768933 + intValue = -541915111 ) + @Export("y") int y; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lem;" + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 102326407 ) - TilePaint paint; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Len;" - ) - TileModel model; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Leb;" - ) - BoundaryObject boundaryObject; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lex;" - ) - WallDecoration wallDecoration; - @ObfuscatedName("g") + @Export("originalPlane") + int originalPlane; + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Leu;" ) - FloorDecoration floorDecoration; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ldg;" - ) - TileItemPile tileItemPile; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 240084109 - ) - int gameObjectsCount; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "[Led;" - ) - GameObject[] gameObjects; - @ObfuscatedName("h") - int[] gameObjectEdgeMasks; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -640534231 - ) - int gameObjectsEdgeMask; + @Export("paint") + TilePaint paint; @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1686983663 + @ObfuscatedSignature( + descriptor = "Leq;" ) - int minPlane; + @Export("model") + TileModel model; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lem;" + ) + @Export("boundaryObject") + BoundaryObject boundaryObject; @ObfuscatedName("c") - boolean drawPrimary; - @ObfuscatedName("f") - boolean drawSecondary; - @ObfuscatedName("y") - boolean drawGameObjects; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 913733009 + @ObfuscatedSignature( + descriptor = "Ley;" ) - int drawGameObjectEdges; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -870351799 - ) - int field1678; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1246325149 - ) - int field1687; + @Export("wallDecoration") + WallDecoration wallDecoration; @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 465843851 - ) - int field1689; - @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Lek;" ) + @Export("floorDecoration") + FloorDecoration floorDecoration; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + @Export("tileItemPile") + TileItemPile tileItemPile; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 436898265 + ) + @Export("gameObjectsCount") + int gameObjectsCount; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Lel;" + ) + @Export("gameObjects") + GameObject[] gameObjects; + @ObfuscatedName("n") + @Export("gameObjectEdgeMasks") + int[] gameObjectEdgeMasks; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1777238771 + ) + @Export("gameObjectsEdgeMask") + int gameObjectsEdgeMask; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -401318033 + ) + @Export("minPlane") + int minPlane; + @ObfuscatedName("r") + @Export("drawPrimary") + boolean drawPrimary; + @ObfuscatedName("y") + @Export("drawSecondary") + boolean drawSecondary; + @ObfuscatedName("s") + @Export("drawGameObjects") + boolean drawGameObjects; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 533162945 + ) + @Export("drawGameObjectEdges") + int drawGameObjectEdges; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1399607657 + ) + int field1690; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1848862367 + ) + int field1691; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 858719123 + ) + int field1671; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Leo;" + ) + @Export("linkedBelowTile") Tile linkedBelowTile; Tile(int var1, int var2, int var3) { this.gameObjects = new GameObject[5]; // L: 17 this.gameObjectEdgeMasks = new int[5]; // L: 18 this.gameObjectsEdgeMask = 0; // L: 19 - this.originalPlane = this.plane = var1; // L: 31 - this.x = var2; // L: 32 - this.y = var3; // L: 33 - } // L: 34 + this.originalPlane = this.plane = var1; + this.x = var2; + this.y = var3; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-23" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 81 + + try { + var0 = WorldMapID.getPreferencesFile("", GrandExchangeOfferWorldComparator.field58.name, true); // L: 83 + Buffer var1 = GrandExchangeOfferAgeComparator.clientPreferences.toBuffer(); // L: 84 + var0.write(var1.array, 0, var1.offset); // L: 85 + } catch (Exception var3) { // L: 87 + } + + try { + if (var0 != null) { // L: 89 + var0.closeSync(true); // L: 90 + } + } catch (Exception var2) { // L: 93 + } + + } // L: 94 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lkb;I)Ljava/lang/String;", + garbageValue = "-968900649" + ) + public static String method3004(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); // L: 29 + if (var2 > 32767) { // L: 30 + var2 = 32767; + } + + byte[] var3 = new byte[var2]; // L: 31 + var0.offset += class219.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 32 + String var4 = class52.decodeStringCp1252(var3, 0, var2); // L: 33 + var1 = var4; // L: 34 + } catch (Exception var6) { // L: 36 + var1 = "Cabbage"; // L: 37 + } + + return var1; // L: 40 + } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index d1bbada6b7..97e10c010a 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -1,227 +1,177 @@ -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("ch") +@ObfuscatedName("cb") +@Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 652464565 - ) - int id; + @ObfuscatedName("m") + static byte[][][] field1273; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 417363545 + intValue = -1111898775 ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("ip") + @ObfuscatedGetter( + intValue = 1784149291 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -459870843 + ) + @Export("id") + int id; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 724722271 + ) + @Export("quantity") int quantity; TileItem() { } // L: 11 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Ler;", - garbageValue = "-2026237468" + descriptor = "(I)Leh;", + garbageValue = "-2070677844" ) + @Export("getModel") protected final Model getModel() { - return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 + return AbstractWorldMapData.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Lhq;", - garbageValue = "7632896" + descriptor = "(I)[Lik;", + garbageValue = "2051989358" ) - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 186 - int var2 = var0 & 65535; // L: 187 - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 188 - boolean var3 = WorldMapSprite.loadInterface(var1); // L: 189 - if (!var3) { // L: 190 - return null; - } - } - - return Widget.Widget_interfaceComponents[var1][var2]; // L: 192 + public static StudioGame[] method2237() { + return new StudioGame[]{StudioGame.runescape, StudioGame.game3, StudioGame.game5, StudioGame.oldscape, StudioGame.game4, StudioGame.stellardawn}; // L: 17 } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)Lld;", - garbageValue = "86" + descriptor = "(II)Lju;", + garbageValue = "458582933" ) - public static PrivateChatMode method2202(int var0) { - PrivateChatMode[] var1 = SpotAnimationDefinition.method4518(); // L: 20 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 - PrivateChatMode var3 = var1[var2]; // L: 22 - if (var0 == var3.field3824) { - return var3; // L: 24 - } - } - - return null; // L: 28 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(CLgn;I)C", - garbageValue = "-2022621554" - ) - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 93 - if (var0 >= 192 && var0 <= 198) { // L: 94 - return 'A'; - } - - if (var0 == 199) { // L: 95 - return 'C'; - } - - if (var0 >= 200 && var0 <= 203) { // L: 96 - return 'E'; - } - - if (var0 >= 204 && var0 <= 207) { // L: 97 - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { // L: 98 - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { // L: 99 - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { // L: 100 - return 'U'; - } - - if (var0 == 221) { // L: 101 - return 'Y'; - } - - if (var0 == 223) { // L: 102 - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { // L: 103 - return 'a'; - } - - if (var0 == 231) { // L: 104 - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { // L: 105 - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; // L: 106 - } - - if (var0 == 241 && var1 != Language.Language_ES) { // L: 107 - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { // L: 108 - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { // L: 109 - return 'u'; - } - - if (var0 == 253 || var0 == 255) { // L: 110 - return 'y'; - } - } - - if (var0 == 338) { // L: 112 - return 'O'; - } else if (var0 == 339) { // L: 113 - return 'o'; - } else if (var0 == 376) { // L: 114 - return 'Y'; + @Export("getParamDefinition") + public static ParamDefinition getParamDefinition(int var0) { + ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; } else { - return var0; // L: 115 + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); // L: 23 + var1 = new ParamDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 26 + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 + return var1; // L: 28 } } - @ObfuscatedName("t") - public static int Entity_unpackSceneX(long var0) { - return (int)(var0 >>> 0 & 127L); - } - - @ObfuscatedName("d") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "1" + descriptor = "(Lks;B)V", + garbageValue = "43" ) - static final int method2206(int var0, int var1) { - int var2 = GrandExchangeOfferOwnWorldComparator.method1334(var0 - 1, var1 - 1) + GrandExchangeOfferOwnWorldComparator.method1334(var0 + 1, var1 - 1) + GrandExchangeOfferOwnWorldComparator.method1334(var0 - 1, 1 + var1) + GrandExchangeOfferOwnWorldComparator.method1334(var0 + 1, var1 + 1); // L: 849 - int var3 = GrandExchangeOfferOwnWorldComparator.method1334(var0 - 1, var1) + GrandExchangeOfferOwnWorldComparator.method1334(1 + var0, var1) + GrandExchangeOfferOwnWorldComparator.method1334(var0, var1 - 1) + GrandExchangeOfferOwnWorldComparator.method1334(var0, var1 + 1); // L: 850 - int var4 = GrandExchangeOfferOwnWorldComparator.method1334(var0, var1); // L: 851 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 852 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lfo;III)Ldr;", - garbageValue = "-1837543032" - ) - public static final PcmPlayer method2205(TaskHandler var0, int var1, int var2) { - if (PcmPlayer.field1447 == 0) { // L: 52 - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { // L: 53 - if (var2 < 256) { // L: 54 - var2 = 256; - } - - try { - PcmPlayer var3 = class300.pcmPlayerProvider.player(); // L: 56 - var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 57 - var3.field1438 = var2; // L: 58 - var3.init(); // L: 59 - var3.capacity = (var2 & -1024) + 1024; // L: 60 - if (var3.capacity > 16384) { // L: 61 - var3.capacity = 16384; - } - - var3.open(var3.capacity); // L: 62 - if (Decimator.field1491 > 0 && class1.soundSystem == null) { // L: 63 - class1.soundSystem = new SoundSystem(); // L: 64 - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 65 - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(class1.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 66 - } - - if (class1.soundSystem != null) { // L: 68 - if (class1.soundSystem.players[var1] != null) { // L: 69 - throw new IllegalArgumentException(); - } - - class1.soundSystem.players[var1] = var3; // L: 70 - } - - return var3; // L: 72 - } catch (Throwable var4) { // L: 74 - return new PcmPlayer(); // L: 75 - } - } else { - throw new IllegalArgumentException(); + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = PlayerType.localPlayer = Client.players[var1] = new Player(); // L: 39 + var2.index = var1; // L: 40 + int var3 = var0.readBits(30); // L: 41 + byte var4 = (byte)(var3 >> 28); // L: 42 + int var5 = var3 >> 14 & 16383; // L: 43 + int var6 = var3 & 16383; // L: 44 + var2.pathX[0] = var5 - FloorDecoration.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - WorldMapData_0.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + GrandExchangeOfferUnitPriceComparator.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1284[var1] != null) { // L: 50 + var2.read(Players.field1284[var1]); } + + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1282[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 + + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var1 != var7) { // L: 56 + int var8 = var0.readBits(18); // L: 57 + int var9 = var8 >> 16; // L: 58 + int var10 = var8 >> 8 & 597; // L: 59 + int var11 = var8 & 597; // L: 60 + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 + Players.Players_orientations[var7] = 0; // L: 62 + Players.Players_targetIndices[var7] = -1; // L: 63 + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 + Players.field1282[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "181206884" + ) + public static void method2239() { + NPCDefinition.NpcDefinition_cached.clear(); // L: 266 + NPCDefinition.NpcDefinition_cachedModels.clear(); // L: 267 + } // L: 268 + + @ObfuscatedName("jx") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1638276370" + ) + static boolean method2235(int var0) { + for (int var1 = 0; var1 < Client.field902; ++var1) { // L: 10802 + if (Client.field904[var1] == var0) { // L: 10803 + return true; + } + } + + return false; // L: 10805 } - @ObfuscatedName("ga") + @ObfuscatedName("jr") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "41" + descriptor = "(IIIILlc;Lho;I)V", + garbageValue = "1898087966" ) - static boolean method2208() { - return (Client.drawPlayerNames & 8) != 0; // L: 4409 - } + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + if (var4 != null) { // L: 11469 + int var6 = Client.camAngleY & 2047; // L: 11470 + int var7 = var3 * var3 + var2 * var2; // L: 11471 + if (var7 <= 6400) { // L: 11472 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11473 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11474 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11475 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11476 + if (var7 > 2500) { + var4.method6296(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 11477 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11478 + } + + } + } + } // L: 11479 } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index dcd49c00fa..c84578c89b 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -1,50 +1,196 @@ +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("dg") +@ObfuscatedName("dr") +@Implements("TileItemPile") public final class TileItemPile { + @ObfuscatedName("o") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1480957507 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 2145467321 + ) + @Export("x") + int x; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1424662537 + ) + @Export("y") + int y; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lej;" + ) + @Export("second") + Entity second; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lej;" ) + @Export("first") Entity first; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lej;" + ) + @Export("third") + Entity third; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 715274953 - ) - int tileHeight; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -987294249 - ) - int x; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1805580001 - ) - int y; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lez;" - ) - Entity second; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lez;" - ) - Entity third; - @ObfuscatedName("x") - @ObfuscatedGetter( - longValue = -7395510386628271631L + longValue = 4099834780630391479L ) + @Export("tag") long tag; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -863180021 + intValue = -350155061 ) + @Export("height") int height; TileItemPile() { } // L: 13 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Liw;Liw;Liw;Lgv;I)Z", + garbageValue = "-1153797307" + ) + public static boolean method2909(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class206.musicPatchesArchive = var0; // L: 26 + class206.musicSamplesArchive = var1; // L: 27 + class206.soundEffectsArchive = var2; // L: 28 + class13.midiPcmStream = var3; // L: 29 + return true; // L: 30 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lks;I)V", + garbageValue = "-669198743" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 31 + if (var1 != null) { // L: 32 + int var2 = var0.offset; // L: 33 + var0.writeInt(var1.id); // L: 34 + + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 35 + if (var1.creationErrors[var3] != 0) { // L: 36 + var0.writeByte(var1.creationErrors[var3]); // L: 37 + } else { + try { + int var4 = var1.operations[var3]; // L: 41 + Field var5; + int var6; + if (var4 == 0) { // L: 42 + var5 = var1.fields[var3]; // L: 43 + var6 = Reflection.getInt(var5, (Object)null); // L: 44 + var0.writeByte(0); // L: 45 + var0.writeInt(var6); // L: 46 + } else if (var4 == 1) { // L: 48 + var5 = var1.fields[var3]; // L: 49 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 50 + var0.writeByte(0); // L: 51 + } else if (var4 == 2) { // L: 53 + var5 = var1.fields[var3]; // L: 54 + var6 = var5.getModifiers(); // L: 55 + var0.writeByte(0); // L: 56 + var0.writeInt(var6); // L: 57 + } + + Method var25; + if (var4 != 3) { // L: 59 + if (var4 == 4) { // L: 79 + var25 = var1.methods[var3]; // L: 80 + var6 = var25.getModifiers(); // L: 81 + var0.writeByte(0); // L: 82 + var0.writeInt(var6); // L: 83 + } + } else { + var25 = var1.methods[var3]; // L: 60 + byte[][] var10 = var1.arguments[var3]; // L: 61 + Object[] var7 = new Object[var10.length]; // L: 62 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 63 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 64 + var7[var8] = var9.readObject(); // L: 65 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 67 + if (var11 == null) { // L: 68 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 69 + var0.writeByte(1); // L: 70 + var0.writeLong(((Number)var11).longValue()); // L: 71 + } else if (var11 instanceof String) { // L: 73 + var0.writeByte(2); // L: 74 + var0.writeStringCp1252NullTerminated((String)var11); // L: 75 + } else { + var0.writeByte(4); // L: 77 + } + } + } catch (ClassNotFoundException var13) { // L: 86 + var0.writeByte(-10); // L: 87 + } catch (InvalidClassException var14) { // L: 89 + var0.writeByte(-11); // L: 90 + } catch (StreamCorruptedException var15) { // L: 92 + var0.writeByte(-12); // L: 93 + } catch (OptionalDataException var16) { // L: 95 + var0.writeByte(-13); // L: 96 + } catch (IllegalAccessException var17) { // L: 98 + var0.writeByte(-14); // L: 99 + } catch (IllegalArgumentException var18) { // L: 101 + var0.writeByte(-15); // L: 102 + } catch (InvocationTargetException var19) { // L: 104 + var0.writeByte(-16); // L: 105 + } catch (SecurityException var20) { // L: 107 + var0.writeByte(-17); // L: 108 + } catch (IOException var21) { // L: 110 + var0.writeByte(-18); // L: 111 + } catch (NullPointerException var22) { // L: 113 + var0.writeByte(-19); // L: 114 + } catch (Exception var23) { // L: 116 + var0.writeByte(-20); // L: 117 + } catch (Throwable var24) { // L: 119 + var0.writeByte(-21); // L: 120 + } + } + } + + var0.writeCrc(var2); // L: 123 + var1.remove(); // L: 124 + } + } // L: 125 + + @ObfuscatedName("hu") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-47736046" + ) + static void method2908() { + KitDefinition.method4634(KeyHandler.menuWidth / 2 + Coord.menuX, WorldMapArea.menuY); // L: 7891 + } // L: 7892 } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 8c12608820..b2e86fed03 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -1,60 +1,78 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("en") +@ObfuscatedName("eq") +@Implements("TileModel") public final class TileModel { - @ObfuscatedName("c") - static int[] field1626; - @ObfuscatedName("f") - static int[] field1627; - @ObfuscatedName("y") - static int[] field1628; - @ObfuscatedName("v") - static int[] field1624; - @ObfuscatedName("j") - static int[] field1630; @ObfuscatedName("r") - static final int[][] field1632; - @ObfuscatedName("u") - static final int[][] field1616; - @ObfuscatedName("z") - int[] vertexX; - @ObfuscatedName("k") - int[] vertexY; + static int[] field1628; + @ObfuscatedName("y") + static int[] field1634; @ObfuscatedName("s") - int[] vertexZ; - @ObfuscatedName("t") - int[] triangleColorA; - @ObfuscatedName("i") - int[] triangleColorB; - @ObfuscatedName("o") - int[] triangleColorC; - @ObfuscatedName("x") - int[] faceX; + static int[] field1630; + @ObfuscatedName("j") + static int[] field1627; @ObfuscatedName("w") - int[] faceY; - @ObfuscatedName("g") - int[] faceZ; - @ObfuscatedName("m") - int[] triangleTextureId; - @ObfuscatedName("n") - boolean isFlat; + static int[] field1632; + @ObfuscatedName("v") + static final int[][] field1633; @ObfuscatedName("d") - int shape; - @ObfuscatedName("h") - int rotation; - @ObfuscatedName("a") - int underlayRgb; + static final int[][] field1620; + @ObfuscatedName("f") + @Export("vertexX") + int[] vertexX; + @ObfuscatedName("b") + @Export("vertexY") + int[] vertexY; + @ObfuscatedName("l") + @Export("vertexZ") + int[] vertexZ; + @ObfuscatedName("m") + @Export("triangleColorA") + int[] triangleColorA; + @ObfuscatedName("z") + @Export("triangleColorB") + int[] triangleColorB; @ObfuscatedName("q") + @Export("triangleColorC") + int[] triangleColorC; + @ObfuscatedName("k") + @Export("faceX") + int[] faceX; + @ObfuscatedName("c") + @Export("faceY") + int[] faceY; + @ObfuscatedName("u") + @Export("faceZ") + int[] faceZ; + @ObfuscatedName("t") + @Export("triangleTextureId") + int[] triangleTextureId; + @ObfuscatedName("e") + @Export("isFlat") + boolean isFlat; + @ObfuscatedName("o") + @Export("shape") + int shape; + @ObfuscatedName("n") + @Export("rotation") + int rotation; + @ObfuscatedName("x") + @Export("underlayRgb") + int underlayRgb; + @ObfuscatedName("p") + @Export("overlayRgb") int overlayRgb; static { - field1626 = new int[6]; // L: 21 - field1627 = new int[6]; // L: 22 - field1628 = new int[6]; // L: 23 - field1624 = new int[6]; // L: 24 - field1630 = new int[6]; // L: 25 - field1632 = 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}}; // L: 26 - field1616 = 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}}; // L: 41 + field1628 = new int[6]; // L: 21 + field1634 = new int[6]; // L: 22 + field1630 = new int[6]; // L: 23 + field1627 = new int[6]; // L: 24 + field1632 = new int[6]; // L: 25 + field1633 = 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}}; // L: 26 + field1620 = 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}}; // L: 41 } 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) { @@ -71,7 +89,7 @@ public final class TileModel { int var21 = var20 / 2; // L: 64 int var22 = var20 / 4; // L: 65 int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field1632[var1]; // L: 67 + int[] var24 = field1633[var1]; // L: 67 int var25 = var24.length; // L: 68 this.vertexX = new int[var25]; // L: 69 this.vertexY = new int[var25]; // L: 70 @@ -206,7 +224,7 @@ public final class TileModel { var27[var30] = var36; // L: 202 } - int[] var38 = field1616[var1]; // L: 204 + int[] var38 = field1620[var1]; // L: 204 var31 = var38.length / 4; // L: 205 this.faceX = new int[var31]; // L: 206 this.faceY = new int[var31]; // L: 207 diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 1916ef26f0..5c47a36967 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -1,50 +1,50 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("eu") +@Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lio;" + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -235685251 ) - static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("dt") - @ObfuscatedSignature( - descriptor = "Liw;" + @Export("swColor") + int swColor; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1377191477 ) - static Archive archive13; + @Export("seColor") + int seColor; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1254090335 + ) + @Export("neColor") + int neColor; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -156684907 + ) + @Export("nwColor") + int nwColor; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -533090373 + intValue = -1065902093 ) - int swColor; + @Export("texture") + int texture; + @ObfuscatedName("q") + @Export("isFlat") + boolean isFlat; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -141428387 - ) - int seColor; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -2027106077 - ) - int neColor; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1015841735 - ) - int nwColor; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1352493759 - ) - int texture; - @ObfuscatedName("o") - boolean isFlat; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 248691895 + intValue = -1963077615 ) + @Export("rgb") int rgb; TilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { @@ -58,15 +58,152 @@ public final class TilePaint { this.isFlat = var7; // L: 19 } // L: 20 - @ObfuscatedName("t") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IZIZB)V", - garbageValue = "-24" + descriptor = "(Liw;Liw;Ljava/lang/String;Ljava/lang/String;I)Lkq;", + garbageValue = "2122951194" ) - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (AbstractByteArrayCopier.World_worlds != null) { // L: 171 - WorldMapRegion.doWorldSorting(0, AbstractByteArrayCopier.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + public static Font method3210(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 166 + int var5 = var0.getFileId(var4, var3); // L: 167 + byte[] var8 = var0.takeFile(var4, var5); // L: 172 + boolean var7; + if (var8 == null) { // L: 173 + var7 = false; // L: 174 + } else { + class217.SpriteBuffer_decode(var8); // L: 177 + var7 = true; // L: 178 } - } // L: 174 + Font var6; + if (!var7) { // L: 180 + var6 = null; // L: 181 + } else { + var6 = UrlRequester.method3430(var1.takeFile(var4, var5)); // L: 184 + } + + return var6; // L: 186 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IIIIIZB)Llc;", + garbageValue = "17" + ) + @Export("getItemSprite") + public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 345 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 346 + var4 = 1; + } + + long var6 = ((long)var3 << 42) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var4 << 40); // L: 347 + Sprite var8; + if (!var5) { // L: 349 + var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); // L: 350 + if (var8 != null) { // L: 351 + return var8; + } + } + + ItemDefinition var9 = AbstractWorldMapData.ItemDefinition_get(var0); // L: 353 + if (var1 > 1 && var9.countobj != null) { // L: 354 + int var10 = -1; // L: 355 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 356 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 357 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 359 + var9 = AbstractWorldMapData.ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); // L: 361 + if (var19 == null) { // L: 362 + return null; + } else { + Sprite var20 = null; // L: 363 + if (var9.noteTemplate != -1) { // L: 364 + var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 365 + if (var20 == null) { // L: 366 + return null; + } + } else if (var9.notedId != -1) { // L: 368 + var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 369 + if (var20 == null) { // L: 370 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 372 + var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 373 + if (var20 == null) { // L: 374 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 376 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 377 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 378 + int[] var15 = new int[4]; // L: 379 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 380 + var8 = new Sprite(36, 32); // L: 381 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 382 + Rasterizer2D.Rasterizer2D_clear(); // L: 383 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 384 + Rasterizer3D.method3174(16, 16); // L: 385 + Rasterizer3D.field1794 = false; // L: 386 + if (var9.placeholderTemplate != -1) { // L: 387 + var20.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 388 + if (var5) { // L: 389 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 390 + var16 = (int)((double)var16 * 1.04D); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 391 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 392 + var19.calculateBoundsCylinder(); // L: 393 + var19.method3064(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 394 + if (var9.notedId != -1) { // L: 395 + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 396 + var8.outline(1); + } + + if (var2 >= 2) { // L: 397 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 398 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 399 + if (var9.noteTemplate != -1) { // L: 400 + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 401 + VerticalAlignment.ItemDefinition_fontPlain11.draw(Strings.inventoryQuantityFormat(var1), 0, 9, 16776960, 1); // L: 402 + } + + if (!var5) { // L: 404 + ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 405 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 406 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 407 + Rasterizer3D.field1794 = true; // L: 408 + return var8; // L: 409 + } + } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 055ea0ac0f..228a7f2e67 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -1,176 +1,172 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bu") +@ObfuscatedName("bw") +@Implements("Tiles") public final class Tiles { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("k") - static byte[][][] Tiles_renderFlags; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 210424451 - ) - static int Tiles_minPlane; - @ObfuscatedName("t") - static byte[][][] field528; - @ObfuscatedName("i") - static byte[][][] field521; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1682339213 - ) - public static int musicTrackVolume; - @ObfuscatedName("m") - static int[] Tiles_hue; - @ObfuscatedName("n") - static int[] Tiles_saturation; - @ObfuscatedName("v") - static final int[] field524; - @ObfuscatedName("j") - static final int[] field525; - @ObfuscatedName("r") - static final int[] field517; - @ObfuscatedName("u") - static final int[] field527; - @ObfuscatedName("p") - static final int[] field534; @ObfuscatedName("b") - static final int[] field529; + @Export("Tiles_renderFlags") + static byte[][][] Tiles_renderFlags; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1084049787 + intValue = -1638163549 ) - static int field535; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 96867879 - ) - static int field520; - @ObfuscatedName("bh") + @Export("Tiles_minPlane") + static int Tiles_minPlane; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lle;" ) - static StudioGame field532; + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("q") + static byte[][][] field531; + @ObfuscatedName("j") + static final int[] field533; + @ObfuscatedName("w") + static final int[] field534; + @ObfuscatedName("v") + static final int[] field528; + @ObfuscatedName("d") + static final int[] field536; + @ObfuscatedName("a") + static final int[] field535; + @ObfuscatedName("g") + static final int[] field529; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 2130461421 + ) + static int field539; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1692186847 + ) + static int field540; + @ObfuscatedName("er") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("im") + @ObfuscatedGetter( + intValue = -1235854871 + ) + static int field542; static { Tiles_heights = new int[4][105][105]; // L: 16 Tiles_renderFlags = new byte[4][104][104]; // L: 17 Tiles_minPlane = 99; // L: 18 - field524 = new int[]{1, 2, 4, 8}; - field525 = new int[]{16, 32, 64, 128}; - field517 = new int[]{1, 0, -1, 0}; - field527 = new int[]{0, -1, 0, 1}; - field534 = new int[]{1, -1, -1, 1}; - field529 = new int[]{-1, -1, 1, 1}; - field535 = (int)(Math.random() * 17.0D) - 8; // L: 40 - field520 = (int)(Math.random() * 33.0D) - 16; // L: 41 + field533 = new int[]{1, 2, 4, 8}; // L: 34 + field534 = new int[]{16, 32, 64, 128}; // L: 35 + field528 = new int[]{1, 0, -1, 0}; + field536 = new int[]{0, -1, 0, 1}; // L: 37 + field535 = new int[]{1, -1, -1, 1}; // L: 38 + field529 = new int[]{-1, -1, 1, 1}; // L: 39 + field539 = (int)(Math.random() * 17.0D) - 8; // L: 40 + field540 = (int)(Math.random() * 33.0D) - 16; // L: 41 } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Lih;", - garbageValue = "1036194944" + descriptor = "(CB)Z", + garbageValue = "-86" ) - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 32 - if (var1 != null) { // L: 33 - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 - var1 = new SpotAnimationDefinition(); // L: 35 - var1.id = var0; // L: 36 - if (var2 != null) { // L: 37 - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 - } + static final boolean method1223(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 36 } - @ObfuscatedName("z") - static boolean method1191(long var0) { - int var2 = (int)(var0 >>> 14 & 3L); // L: 46 - return var2 == 2; // L: 48 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lky;S)I", - garbageValue = "5748" - ) - static int method1186(PacketBuffer var0) { - int var1 = var0.readBits(2); // L: 179 - int var2; - if (var1 == 0) { // L: 181 - var2 = 0; - } else if (var1 == 1) { // L: 182 - var2 = var0.readBits(5); - } else if (var1 == 2) { // L: 183 - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); // L: 184 - } - - return var2; // L: 185 - } - - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(CI)Z", - garbageValue = "-877871317" + garbageValue = "-1955687589" ) - public static boolean method1187(char var0) { - if ((var0 < ' ' || var0 >= 127) && (var0 <= 127 || var0 >= 160) && (var0 <= 160 || var0 > 255)) { // L: 61 - if (var0 != 0) { // L: 62 - char[] var1 = class297.cp1252AsciiExtension; // L: 64 + public static boolean method1195(char var0) { + if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 45 + return true; + } else { + if (var0 != 0) { // L: 46 + char[] var1 = class298.cp1252AsciiExtension; // L: 48 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 65 - char var3 = var1[var2]; // L: 66 - if (var0 == var3) { // L: 68 - return true; // L: 69 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 + char var3 = var1[var2]; // L: 50 + if (var0 == var3) { // L: 52 + return true; // L: 53 } } } - return false; // L: 75 - } else { - return true; + return false; // L: 59 } } - @ObfuscatedName("gk") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1367737542" + descriptor = "(Lks;I)I", + garbageValue = "2087937385" ) - static void method1177() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4254 - VarpDefinition.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4255 + static int method1220(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 352 + int var2; + if (var1 == 0) { // L: 354 + var2 = 0; + } else if (var1 == 1) { // L: 355 + var2 = var0.readBits(5); + } else if (var1 == 2) { // L: 356 + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); // L: 357 } - } // L: 4257 + return var2; // L: 358 + } - @ObfuscatedName("hd") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - garbageValue = "-1" + descriptor = "(ILco;ZB)I", + garbageValue = "45" ) - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 8240 - if (Client.menuOptionsCount < 500) { // L: 8241 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 8242 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8243 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8244 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8245 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8246 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8247 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8248 - ++Client.menuOptionsCount; // L: 8249 + static int method1222(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3124 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = UrlRequester.getWindowedMode(); // L: 3125 + return 1; // L: 3126 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3128 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3129 + if (var3 == 1 || var3 == 2) { // L: 3130 + class277.setWindowedMode(var3); + } + + return 1; // L: 3131 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3133 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.clientPreferences.windowMode; // L: 3134 + return 1; // L: 3135 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3137 + if (var0 == 5310) { // L: 3145 + --MilliClock.Interpreter_intStackSize; // L: 3146 + return 1; // L: 3147 + } else { + return 2; // L: 3149 + } + } else { + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3138 + if (var3 == 1 || var3 == 2) { // L: 3139 + GrandExchangeOfferAgeComparator.clientPreferences.windowMode = var3; // L: 3140 + Tile.savePreferences(); // L: 3141 + } + + return 1; // L: 3143 } - } - } // L: 8251 + } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index cdec33ac4e..4456ea732d 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -1,143 +1,147 @@ +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("jz") +@ObfuscatedName("jr") +@Implements("Timer") public class Timer { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -5225543966373226735L + longValue = 8550403030095862389L ) - long field3597; - @ObfuscatedName("k") + long field3604; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 4082684683626742437L + longValue = 7994702175123860963L ) - long field3602; - @ObfuscatedName("s") - public boolean field3598; - @ObfuscatedName("t") - @ObfuscatedGetter( - longValue = -551536066132799497L - ) - long field3600; - @ObfuscatedName("i") - @ObfuscatedGetter( - longValue = -5071374217160666521L - ) - long field3601; - @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = 6965498240839128689L - ) - long field3606; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1025178027 - ) - int field3603; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -931396039 - ) - int field3604; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -531975401 - ) - int field3605; + long field3607; + @ObfuscatedName("l") + public boolean field3606; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -76474973 + longValue = 4133381384365556773L ) - int field3599; + long field3608; + @ObfuscatedName("z") + @ObfuscatedGetter( + longValue = 3557480670410738873L + ) + long field3605; + @ObfuscatedName("q") + @ObfuscatedGetter( + longValue = 6361595278255869411L + ) + long field3609; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -134378941 + ) + int field3610; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -337124169 + ) + int field3611; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 2101828205 + ) + int field3612; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1450803179 + ) + int field3613; public Timer() { - this.field3597 = -1L; // L: 7 - this.field3602 = -1L; // L: 8 - this.field3598 = false; // L: 9 - this.field3600 = 0L; // L: 10 - this.field3601 = 0L; // L: 11 - this.field3606 = 0L; // L: 12 - this.field3603 = 0; // L: 13 - this.field3604 = 0; // L: 14 - this.field3605 = 0; // L: 15 - this.field3599 = 0; // L: 16 + this.field3604 = -1L; // L: 7 + this.field3607 = -1L; // L: 8 + this.field3606 = false; // L: 9 + this.field3608 = 0L; // L: 10 + this.field3605 = 0L; // L: 11 + this.field3609 = 0L; // L: 12 + this.field3610 = 0; // L: 13 + this.field3611 = 0; // L: 14 + this.field3612 = 0; // L: 15 + this.field3613 = 0; // L: 16 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1776227441" + descriptor = "(B)V", + garbageValue = "-12" ) - public void method5106() { - this.field3597 = PacketWriter.currentTimeMillis(); // L: 19 + public void method5135() { + this.field3604 = User.currentTimeMillis(); // L: 19 } // L: 20 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2001375296" + garbageValue = "568889217" ) - public void method5098() { - if (-1L != this.field3597) { // L: 23 - this.field3601 = PacketWriter.currentTimeMillis() - this.field3597; // L: 24 - this.field3597 = -1L; // L: 25 + public void method5147() { + if (this.field3604 != -1L) { // L: 23 + this.field3605 = User.currentTimeMillis() - this.field3604; // L: 24 + this.field3604 = -1L; // L: 25 } } // L: 27 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1052633329" + garbageValue = "-391105625" ) - public void method5110(int var1) { - this.field3602 = PacketWriter.currentTimeMillis(); // L: 30 - this.field3603 = var1; // L: 31 + public void method5153(int var1) { + this.field3607 = User.currentTimeMillis(); // L: 30 + this.field3610 = var1; // L: 31 } // L: 32 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "683776298" + descriptor = "(S)V", + garbageValue = "255" ) - public void method5100() { - if (-1L != this.field3602) { // L: 35 - this.field3600 = PacketWriter.currentTimeMillis() - this.field3602; // L: 36 - this.field3602 = -1L; // L: 37 + public void method5137() { + if (this.field3607 != -1L) { // L: 35 + this.field3608 = User.currentTimeMillis() - this.field3607; // L: 36 + this.field3607 = -1L; // L: 37 } - ++this.field3605; // L: 39 - this.field3598 = true; // L: 40 + ++this.field3612; // L: 39 + this.field3606 = true; // L: 40 } // L: 41 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1997993253" + descriptor = "(B)V", + garbageValue = "20" ) - public void method5101() { - this.field3598 = false; // L: 44 - this.field3604 = 0; // L: 45 + public void method5142() { + this.field3606 = false; // L: 44 + this.field3611 = 0; // L: 45 } // L: 46 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-729089885" + garbageValue = "-1427350248" ) - public void method5099() { - this.method5100(); // L: 49 + public void method5139() { + this.method5137(); // L: 49 } // L: 50 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-1209731041" + descriptor = "(Lkb;I)V", + garbageValue = "-942267659" ) + @Export("write") public void write(Buffer var1) { - long var2 = this.field3601; // L: 53 + long var2 = this.field3605; // L: 53 var2 /= 10L; // L: 55 if (var2 < 0L) { // L: 56 var2 = 0L; @@ -146,7 +150,7 @@ public class Timer { } var1.writeShort((int)var2); // L: 58 - long var4 = this.field3600; // L: 60 + long var4 = this.field3608; // L: 60 var4 /= 10L; // L: 62 if (var4 < 0L) { // L: 63 var4 = 0L; @@ -155,7 +159,7 @@ public class Timer { } var1.writeShort((int)var4); // L: 65 - long var6 = this.field3606; // L: 67 + long var6 = this.field3609; // L: 67 var6 /= 10L; // L: 69 if (var6 < 0L) { // L: 70 var6 = 0L; @@ -164,25 +168,9 @@ public class Timer { } var1.writeShort((int)var6); // L: 72 - var1.writeShort(this.field3603); // L: 74 - var1.writeShort(this.field3604); // L: 75 - var1.writeShort(this.field3605); // L: 76 - var1.writeShort(this.field3599); // L: 77 + var1.writeShort(this.field3610); // L: 74 + var1.writeShort(this.field3611); // L: 75 + var1.writeShort(this.field3612); // L: 76 + var1.writeShort(this.field3613); // L: 77 } // L: 78 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "98" - ) - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 135 - int var2 = 0; // L: 136 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 137 - var2 = (var2 << 5) - var2 + class227.charToByteCp1252(var0.charAt(var3)); - } - - return var2; // L: 138 - } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index c081ed335d..3f2f8d8545 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,28 +1,29 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kz") +@Implements("TriBool") public class TriBool { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Lkz;" ) + @Export("TriBool_false") public static final TriBool TriBool_false; - @ObfuscatedName("lj") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget mousedOverWidgetIf1; static { TriBool_unknown = new TriBool(); // L: 4 diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 1e63c581f3..56c850760e 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,37 +1,99 @@ import java.net.URL; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("eg") +@Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("h") - static boolean field1986; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("url") final URL url; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { this.url = var1; // L: 96 } // L: 97 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1064227353" + garbageValue = "-225221070" ) + @Export("isDone") public boolean isDone() { return this.isDone0; // L: 100 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)[B", - garbageValue = "524450632" + descriptor = "(B)[B", + garbageValue = "-126" ) + @Export("getResponse") public byte[] getResponse() { return this.response0; // L: 104 } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "118404213" + ) + static void method3436() { + Messages.Messages_channels.clear(); // L: 54 + Messages.Messages_hashTable.clear(); // L: 55 + Messages.Messages_queue.clear(); // L: 56 + Messages.Messages_count = 0; // L: 57 + } // L: 58 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-697232655" + ) + static final boolean method3437(int var0, int var1) { + ObjectDefinition var2 = ScriptEvent.getObjectDefinition(var0); // L: 499 + if (var1 == 11) { // L: 500 + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; // L: 501 + } + + return var2.method4764(var1); // L: 502 + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(IIIILlc;Lho;I)V", + garbageValue = "1829625632" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; // L: 11451 + if (var6 > 4225 && var6 < 90000) { // L: 11452 + int var7 = Client.camAngleY & 2047; // L: 11453 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11454 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11455 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11456 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11457 + double var12 = Math.atan2((double)var10, (double)var11); // L: 11458 + int var14 = var5.width / 2 - 25; // L: 11459 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11460 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11461 + byte var17 = 20; // L: 11462 + class219.redHintArrowSprite.method6303(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11463 + } else { + TileItem.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11465 + } + + } // L: 11466 } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 1b94f0cca0..00ee0ea3f8 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -5,36 +5,44 @@ import java.net.URL; import java.net.URLConnection; 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("ev") +@ObfuscatedName("es") +@Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("dc") - @ObfuscatedSignature( - descriptor = "Liw;" + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2009862837 ) - static Archive archive9; - @ObfuscatedName("z") + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("f") + @Export("thread") final Thread thread; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("requests") Queue requests; public UrlRequester() { this.requests = new LinkedList(); // L: 15 - this.thread = new Thread(this); // L: 18 - this.thread.setPriority(1); // L: 19 - this.thread.start(); // L: 20 - } // L: 21 + this.thread = new Thread(this); + this.thread.setPriority(1); + this.thread.start(); + } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lei;", - garbageValue = "-8401642" + descriptor = "(Ljava/net/URL;B)Leg;", + garbageValue = "70" ) + @Export("request") public UrlRequest request(URL var1) { UrlRequest var2 = new UrlRequest(var1); // L: 71 synchronized(this) { // L: 72 @@ -44,11 +52,12 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-210243346" + garbageValue = "1551713219" ) + @Export("close") public void close() { this.isClosed = true; // L: 80 @@ -64,21 +73,21 @@ public class UrlRequester implements Runnable { } // L: 88 public void run() { - while (!this.isClosed) { // L: 24 + while (!this.isClosed) { try { UrlRequest var1; - synchronized(this) { // L: 27 - var1 = (UrlRequest)this.requests.poll(); // L: 28 - if (var1 == null) { // L: 29 + synchronized(this) { + var1 = (UrlRequest)this.requests.poll(); + if (var1 == null) { try { - this.wait(); // L: 31 + this.wait(); } catch (InterruptedException var13) { // L: 33 } continue; } } - DataInputStream var2 = null; // L: 37 + DataInputStream var2 = null; URLConnection var3 = null; // L: 38 try { @@ -109,178 +118,83 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { // L: 64 - Decimator.RunException_sendStackTrace((String)null, var17); // L: 65 + PacketWriter.RunException_sendStackTrace((String)null, var17); // L: 65 } } } // L: 68 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-516919063" + descriptor = "(I[BLlt;I)V", + garbageValue = "300500560" ) - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1456 - Login.Login_response2 = var1; // L: 1457 - Login.Login_response3 = var2; // L: 1458 - } // L: 1459 + static void method3417(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 + var3.type = 0; // L: 19 + var3.key = (long)var0; // L: 20 + var3.data = var1; // L: 21 + var3.archiveDisk = var2; // L: 22 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 + } // L: 25 - @ObfuscatedName("w") + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 27 + if (ArchiveDiskActionHandler.field3176 == 0) { // L: 28 + class105.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 29 + class105.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 30 + class105.ArchiveDiskActionHandler_thread.start(); // L: 31 + class105.ArchiveDiskActionHandler_thread.setPriority(5); // L: 32 + } + + ArchiveDiskActionHandler.field3176 = 600; // L: 34 + } + } // L: 37 + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "1482184938" + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "-25" ) - static int method3419(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 772 - Widget var4; - if (var0 >= 2000) { // L: 774 - var0 -= 1000; // L: 775 - var4 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 776 - var3 = false; // L: 777 - } else { - var4 = var2 ? Canvas.field438 : class3.field12; // L: 779 + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 136 + int var2 = 0; // L: 137 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 138 + var2 = (var2 << 5) - var2 + class219.charToByteCp1252(var0.charAt(var3)); } - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 780 - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 781 - if (var11 >= 0 && var11 <= 9) { // L: 782 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]); // L: 786 - return 1; // L: 787 - } else { - --Varps.Interpreter_stringStackSize; // L: 783 - return 1; // L: 784 - } + return var2; // L: 139 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "([BB)Lkq;", + garbageValue = "98" + ) + public static Font method3430(byte[] var0) { + if (var0 == null) { // L: 239 + return null; } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 789 - Interpreter.Interpreter_intStackSize -= 2; // L: 790 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 791 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 792 - var4.parent = SecureRandomCallable.getWidgetChild(var11, var6); // L: 793 - return 1; // L: 794 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 796 - var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 797 - return 1; // L: 798 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 800 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 801 - return 1; // L: 802 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 804 - var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 805 - return 1; // L: 806 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 808 - var4.dataText = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 809 - return 1; // L: 810 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 812 - var4.spellActionName = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 813 - return 1; // L: 814 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 816 - var4.actions = null; // L: 817 - return 1; // L: 818 - } else if (var0 == 1308) { // L: 820 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 821 - return 1; // L: 822 - } else if (var0 == 1309) { // L: 824 - --Interpreter.Interpreter_intStackSize; // L: 825 - return 1; // L: 826 - } else { - int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 828 - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 858 - Interpreter.Interpreter_intStackSize -= 2; // L: 859 - var5 = 10; // L: 860 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 861 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 862 - NetSocket.Widget_setKey(var4, var5, var8, var9); // L: 863 - return 1; // L: 864 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 866 - Interpreter.Interpreter_intStackSize -= 3; // L: 867 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 868 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 869 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 870 - if (var11 >= 0 && var11 <= 9) { // L: 871 - MouseHandler.Widget_setKeyRate(var4, var11, var6, var7); // L: 874 - return 1; // L: 875 - } else { - throw new RuntimeException(); // L: 872 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 877 - var5 = 10; // L: 878 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 879 - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 880 - MouseHandler.Widget_setKeyRate(var4, var5, var6, var7); // L: 881 - return 1; // L: 882 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 884 - --Interpreter.Interpreter_intStackSize; // L: 885 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 886 - if (var11 >= 0 && var11 <= 9) { // L: 887 - class60.Widget_setKeyIgnoreHeld(var4, var11); // L: 890 - return 1; // L: 891 - } else { - throw new RuntimeException(); // L: 888 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 893 - var5 = 10; // L: 894 - class60.Widget_setKeyIgnoreHeld(var4, var5); // L: 895 - return 1; // L: 896 - } else { - return 2; // L: 898 - } - } else { - byte[] var10 = null; // L: 829 - var8 = null; // L: 830 - if (var3) { // L: 831 - Interpreter.Interpreter_intStackSize -= 10; // L: 832 - - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 834 835 - } - - if (var7 > 0) { // L: 837 - var10 = new byte[var7 / 2]; // L: 838 - var8 = new byte[var7 / 2]; // L: 839 - - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 840 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; // L: 841 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; // L: 842 - } - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 847 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 848 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 849 - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 851 - if (var7 >= 0 && var7 <= 9) { // L: 852 - NetSocket.Widget_setKey(var4, var7, var10, var8); // L: 855 - return 1; // L: 856 - } else { - throw new RuntimeException(); // L: 853 - } - } - } + Font var1 = new Font(var0, class336.SpriteBuffer_xOffsets, class225.SpriteBuffer_yOffsets, class336.SpriteBuffer_spriteWidths, class336.SpriteBuffer_spriteHeights, WorldMapID.SpriteBuffer_spritePalette, class13.SpriteBuffer_pixels); // L: 240 + class336.SpriteBuffer_xOffsets = null; // L: 242 + class225.SpriteBuffer_yOffsets = null; // L: 243 + class336.SpriteBuffer_spriteWidths = null; // L: 244 + class336.SpriteBuffer_spriteHeights = null; // L: 245 + WorldMapID.SpriteBuffer_spritePalette = null; // L: 246 + class13.SpriteBuffer_pixels = null; // L: 247 + return var1; // L: 249 } } - @ObfuscatedName("m") + @ObfuscatedName("fp") @ObfuscatedSignature( - descriptor = "(II)Lef;", - garbageValue = "-1165420128" + descriptor = "(B)I", + garbageValue = "-4" ) - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 - if (var1 != null) { // L: 182 - return var1; - } else { - var1 = ArchiveDiskActionHandler.method4337(SequenceDefinition.SequenceDefinition_animationsArchive, GrandExchangeOfferAgeComparator.SequenceDefinition_skeletonsArchive, var0, false); // L: 183 - if (var1 != null) { // L: 184 - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } - - return var1; // L: 185 - } + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 4200 } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 217a2e5865..f57a30690c 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -1,54 +1,63 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jh") +@Implements("User") public class User implements Comparable { - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkm;" ) + @Export("username") Username username; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lku;" + descriptor = "Lkm;" ) + @Export("previousUsername") Username previousUsername; User() { } // L: 7 - @ObfuscatedName("ae") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)Lku;", - garbageValue = "-53975348" + descriptor = "(I)Lkm;", + garbageValue = "-335278145" ) + @Export("getUsername") public Username getUsername() { return this.username; // L: 10 } - @ObfuscatedName("ap") + @ObfuscatedName("ac") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2094298107" + garbageValue = "-1574764800" ) + @Export("getName") public String getName() { - return this.username == null ? "" : this.username.getName(); // L: 14 15 + return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("au") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "2114724515" + garbageValue = "198172856" ) + @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20 + return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 20 } - @ObfuscatedName("aa") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lku;Lku;I)V", - garbageValue = "-1201574407" + descriptor = "(Lkm;Lkm;I)V", + garbageValue = "208802745" ) + @Export("set") void set(Username var1, Username var2) { if (var1 == null) { // L: 24 throw new NullPointerException(); @@ -58,11 +67,12 @@ public class User implements Comparable { } } // L: 27 - @ObfuscatedName("ar") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljc;I)I", - garbageValue = "-243007320" + descriptor = "(Ljh;B)I", + garbageValue = "69" ) + @Export("compareTo_user") public int compareTo_user(User var1) { return this.username.compareToTyped(var1.username); // L: 30 } @@ -71,25 +81,19 @@ public class User implements Comparable { return this.compareTo_user((User)var1); // L: 34 } - @ObfuscatedName("hu") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "793231569" + descriptor = "(S)J", + garbageValue = "17738" ) - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = SecureRandomCallable.getWidgetChild(var0, var1); // L: 8100 - if (var4 != null && var4.onTargetEnter != null) { // L: 8101 - ScriptEvent var5 = new ScriptEvent(); // L: 8102 - var5.widget = var4; // L: 8103 - var5.args = var4.onTargetEnter; // L: 8104 - Script.runScriptEvent(var5); // L: 8105 + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < ArchiveLoader.field565) { // L: 15 + class307.field3731 += ArchiveLoader.field565 - var0; // L: 16 } - Client.field834 = var3; // L: 8107 - Client.isSpellSelected = true; // L: 8108 - class232.selectedSpellWidget = var0; // L: 8109 - Client.selectedSpellChildIndex = var1; // L: 8110 - UserComparator8.selectedSpellFlags = var2; // L: 8111 - class52.invalidateWidget(var4); // L: 8112 - } // L: 8113 + ArchiveLoader.field565 = var0; // L: 18 + return class307.field3731 + var0; // L: 19 + } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 152aa39e69..8f238ad07c 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -1,165 +1,35 @@ -import java.io.IOException; import java.util.Comparator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("lr") +@Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator1(boolean var1) { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljc;Ljc;B)I", - garbageValue = "57" + descriptor = "(Ljh;Ljh;B)I", + garbageValue = "-9" ) + @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); // L: 18 - } - public boolean equals(Object var1) { return super.equals(var1); // L: 22 } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;ZII)V", - garbageValue = "1091425537" - ) - static void method6041(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { // L: 124 - if (var3 == 4) { // L: 125 - Login.loginIndex = 4; // L: 126 - } - - } else { - Login.loginIndex = var3; // L: 130 - Rasterizer2D.Rasterizer2D_clear(); // L: 131 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 132 - UserComparator2.leftTitleSprite = MouseHandler.convertJpgToSprite(var4); // L: 133 - Login.rightTitleSprite = UserComparator2.leftTitleSprite.mirrorHorizontally(); // L: 134 - if ((Client.worldProperties & 536870912) != 0) { // L: 135 - AbstractByteArrayCopier.logoSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((Client.worldProperties & 1073741824) != 0) { // L: 136 - AbstractByteArrayCopier.logoSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - AbstractByteArrayCopier.logoSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 137 - } - - class296.titleboxSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 138 - ModelData0.titlebuttonSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 139 - int var6 = var1.getGroupId("runes"); // L: 142 - int var7 = var1.getFileId(var6, ""); // L: 143 - IndexedSprite[] var5 = UserComparator5.method3515(var1, var6, var7); // L: 144 - GrandExchangeOfferTotalQuantityComparator.runesSprite = var5; // L: 146 - var7 = var1.getGroupId("title_mute"); // L: 149 - int var8 = var1.getFileId(var7, ""); // L: 150 - IndexedSprite[] var10 = UserComparator5.method3515(var1, var7, var8); // L: 151 - ClientPreferences.title_muteSprite = var10; // L: 153 - class227.options_buttons_0Sprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 154 - PlayerType.field3134 = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 155 - MusicPatchNode2.options_buttons_2Sprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 156 - Login.field1221 = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 157 - GrandExchangeOfferNameComparator.field114 = class227.options_buttons_0Sprite.subWidth; // L: 158 - ReflectionCheck.field1364 = class227.options_buttons_0Sprite.subHeight; // L: 159 - Varcs.loginScreenRunesAnimation = new LoginScreenAnimation(GrandExchangeOfferTotalQuantityComparator.runesSprite); // L: 160 - if (var2) { // L: 161 - Login.Login_username = ""; // L: 162 - Login.Login_password = ""; // L: 163 - } - - LoginScreenAnimation.field1070 = 0; // L: 165 - WorldMapLabelSize.otp = ""; // L: 166 - Login.field1223 = true; // L: 167 - Login.worldSelectOpen = false; // L: 168 - if (!Tile.clientPreferences.titleMusicDisabled) { // L: 169 - Archive var11 = CollisionMap.archive6; // L: 170 - var8 = var11.getGroupId("scape main"); // L: 172 - int var9 = var11.getFileId(var8, ""); // L: 173 - class206.musicPlayerStatus = 1; // L: 175 - class204.musicTrackArchive = var11; // L: 176 - BuddyRankComparator.musicTrackGroupId = var8; // L: 177 - class206.musicTrackFileId = var9; // L: 178 - Tiles.musicTrackVolume = 255; // L: 179 - class206.musicTrackBoolean = false; // L: 180 - FaceNormal.pcmSampleLength = 2; // L: 181 - } else { - class58.method915(2); // L: 185 - } - - if (NetCache.NetCache_socket != null) { // L: 187 - try { - Buffer var15 = new Buffer(4); // L: 189 - var15.writeByte(3); // L: 190 - var15.writeMedium(0); // L: 191 - NetCache.NetCache_socket.write(var15.array, 0, 4); // L: 192 - } catch (IOException var14) { - try { - NetCache.NetCache_socket.close(); // L: 196 - } catch (Exception var13) { // L: 198 - } - - ++NetCache.NetCache_ioExceptions; // L: 199 - NetCache.NetCache_socket = null; // L: 200 - } - } - - Login.clearLoginScreen = true; // L: 203 - Login.xPadding = (FloorDecoration.canvasWidth - 765) / 2; // L: 204 - Login.loginBoxX = Login.xPadding + 202; // L: 205 - IsaacCipher.loginBoxCenter = Login.loginBoxX + 180; // L: 206 - UserComparator2.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 207 - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 208 - AbstractByteArrayCopier.logoSprite.drawAt(Login.xPadding + 382 - AbstractByteArrayCopier.logoSprite.subWidth / 2, 18); // L: 209 - } - } // L: 128 210 - - @ObfuscatedName("hh") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-660550270" - ) - static final void method6040() { - int var0 = ChatChannel.menuX; // L: 7018 - int var1 = Client.menuY; // L: 7019 - int var2 = DevicePcmPlayerProvider.menuWidth; // L: 7020 - int var3 = WorldMapManager.menuHeight; // L: 7021 - int var4 = 6116423; // L: 7022 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 7023 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 7024 - Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 7025 - class4.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 7026 - int var5 = MouseHandler.MouseHandler_x; // L: 7027 - int var6 = MouseHandler.MouseHandler_y; // L: 7028 - - for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 7029 - int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 7030 - int var9 = 16777215; // L: 7031 - if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 7032 - var9 = 16776960; - } - - Font var10 = class4.fontBold12; // L: 7033 - String var11; - if (var7 < 0) { // L: 7036 - var11 = ""; // L: 7037 - } else if (Client.menuTargets[var7].length() > 0) { // L: 7040 - var11 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; - } else { - var11 = Client.menuActions[var7]; // L: 7041 - } - - var10.draw(var11, var0 + 3, var8, var9, 0); // L: 7043 - } - - HealthBarUpdate.method1817(ChatChannel.menuX, Client.menuY, DevicePcmPlayerProvider.menuWidth, WorldMapManager.menuHeight); // L: 7045 - } // L: 7046 + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); // L: 18 + } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 8d257e3d71..40cf10fa12 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,22 +1,37 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fk") +@ObfuscatedName("ff") +@Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("ei") - static int[] field2017; - @ObfuscatedName("z") + @ObfuscatedName("u") + static int[][] field1999; + @ObfuscatedName("p") + static int[][][] field2000; + @ObfuscatedName("ah") + static String field2002; + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "Lfu;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;B)I", - garbageValue = "37" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "2109769786" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 @@ -26,20 +41,129 @@ public class UserComparator10 extends AbstractUserComparator { } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("k") + @ObfuscatedName("jm") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1641862640" + descriptor = "(Lht;IIIB)V", + garbageValue = "-68" ) - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 - if (var2 == null) { // L: 22 - return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + FriendSystem.playPcmPlayers(); // L: 11358 + SpriteMask var4 = var0.getSpriteMask(false); // L: 11359 + if (var4 != null) { // L: 11360 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11361 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11362 + int var5 = Client.camAngleY & 2047; // L: 11363 + int var6 = PlayerType.localPlayer.x / 32 + 48; // L: 11364 + int var7 = 464 - PlayerType.localPlayer.y / 32; // L: 11365 + InterfaceParent.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11366 + + int var8; + int var10; + int var17; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11367 + var17 = Client.mapIconXs[var8] * 4 + 2 - PlayerType.localPlayer.x / 32; // L: 11368 + var10 = Client.mapIconYs[var8] * 4 + 2 - PlayerType.localPlayer.y / 32; // L: 11369 + TileItem.drawSpriteOnMinimap(var1, var2, var17, var10, Client.mapIcons[var8], var4); // L: 11370 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 11372 + for (var17 = 0; var17 < 104; ++var17) { // L: 11373 + NodeDeque var15 = Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var8][var17]; // L: 11374 + if (var15 != null) { // L: 11375 + var11 = var8 * 4 + 2 - PlayerType.localPlayer.x / 32; // L: 11376 + var12 = var17 * 4 + 2 - PlayerType.localPlayer.y / 32; // L: 11377 + TileItem.drawSpriteOnMinimap(var1, var2, var11, var12, Entity.mapDotSprites[0], var4); // L: 11378 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11382 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11383 + if (var9 != null && var9.isVisible()) { // L: 11384 + NPCDefinition var19 = var9.definition; // L: 11385 + if (var19 != null && var19.transforms != null) { // L: 11386 + var19 = var19.transform(); + } + + if (var19 != null && var19.drawMapDot && var19.isInteractable) { // L: 11387 + var11 = var9.x / 32 - PlayerType.localPlayer.x / 32; // L: 11388 + var12 = var9.y / 32 - PlayerType.localPlayer.y / 32; // L: 11389 + TileItem.drawSpriteOnMinimap(var1, var2, var11, var12, Entity.mapDotSprites[1], var4); // L: 11390 + } + } + } + + var8 = Players.Players_count; // L: 11394 + int[] var18 = Players.Players_indices; // L: 11395 + + for (var10 = 0; var10 < var8; ++var10) { // L: 11396 + Player var16 = Client.players[var18[var10]]; // L: 11397 + if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != PlayerType.localPlayer) { // L: 11398 + var12 = var16.x / 32 - PlayerType.localPlayer.x / 32; // L: 11399 + int var13 = var16.y / 32 - PlayerType.localPlayer.y / 32; // L: 11400 + boolean var14 = false; // L: 11401 + if (PlayerType.localPlayer.team != 0 && var16.team != 0 && var16.team == PlayerType.localPlayer.team) { // L: 11402 + var14 = true; + } + + if (var16.isFriend()) { // L: 11403 + TileItem.drawSpriteOnMinimap(var1, var2, var12, var13, Entity.mapDotSprites[3], var4); + } else if (var14) { // L: 11404 + TileItem.drawSpriteOnMinimap(var1, var2, var12, var13, Entity.mapDotSprites[4], var4); + } else if (var16.isClanMember()) { // L: 11405 + TileItem.drawSpriteOnMinimap(var1, var2, var12, var13, Entity.mapDotSprites[5], var4); + } else { + TileItem.drawSpriteOnMinimap(var1, var2, var12, var13, Entity.mapDotSprites[2], var4); // L: 11406 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11409 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11410 + NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11411 + if (var20 != null) { // L: 11412 + var11 = var20.x / 32 - PlayerType.localPlayer.x / 32; // L: 11413 + var12 = var20.y / 32 - PlayerType.localPlayer.y / 32; // L: 11414 + UrlRequest.worldToMinimap(var1, var2, var11, var12, ScriptEvent.mapMarkerSprites[1], var4); // L: 11415 + } + } + + if (Client.hintArrowType == 2) { // L: 11418 + var10 = Client.hintArrowX * 4 - FloorDecoration.baseX * 4 + 2 - PlayerType.localPlayer.x / 32; // L: 11419 + var11 = Client.hintArrowY * 4 - WorldMapData_0.baseY * 4 + 2 - PlayerType.localPlayer.y / 32; // L: 11420 + UrlRequest.worldToMinimap(var1, var2, var10, var11, ScriptEvent.mapMarkerSprites[1], var4); // L: 11421 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11423 + Player var21 = Client.players[Client.hintArrowPlayerIndex]; // L: 11424 + if (var21 != null) { // L: 11425 + var11 = var21.x / 32 - PlayerType.localPlayer.x / 32; // L: 11426 + var12 = var21.y / 32 - PlayerType.localPlayer.y / 32; // L: 11427 + UrlRequest.worldToMinimap(var1, var2, var11, var12, ScriptEvent.mapMarkerSprites[1], var4); // L: 11428 + } + } + } + + if (Client.destinationX != 0) { // L: 11432 + var10 = Client.destinationX * 4 + 2 - PlayerType.localPlayer.x / 32; // L: 11433 + var11 = Client.destinationY * 4 + 2 - PlayerType.localPlayer.y / 32; // L: 11434 + TileItem.drawSpriteOnMinimap(var1, var2, var10, var11, ScriptEvent.mapMarkerSprites[0], var4); // L: 11435 + } + + if (!PlayerType.localPlayer.isHidden) { // L: 11437 + 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); // L: 11439 + } + + Client.field758[var3] = true; // L: 11440 } - } + } // L: 11441 } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 7c9482066c..4d7af564c5 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,37 +1,51 @@ 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("lg") +@ObfuscatedName("la") +@Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - static Sprite leftTitleSprite; - @ObfuscatedName("p") - static String userHomeDirectory; - @ObfuscatedName("z") + @ObfuscatedName("k") + static byte[][][] field3859; + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator2(boolean var1) { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljc;Ljc;I)I", - garbageValue = "-512542775" + descriptor = "(Ljh;Ljh;I)I", + garbageValue = "-74930835" ) + @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 } + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); // L: 18 + } + public boolean equals(Object var1) { return super.equals(var1); // L: 22 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); // L: 18 - } + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "788090268" + ) + static void method6067(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11518 + if ((long)var0 == (var1.key >> 48 & 65535L)) { // L: 11519 + var1.remove(); // L: 11520 + } + } + + } // L: 11523 } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index c34c83dde4..95508c3bfa 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,20 +1,31 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fk") +@Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("z") + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lft;" + ) + @Export("clock") + static Clock clock; + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator3(boolean var1) { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;B)I", - garbageValue = "-39" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "-214138656" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var2.world != var1.world) { // L: 14 return this.reversed ? var1.world - var2.world : var2.world - var1.world; // L: 15 @@ -26,4 +37,139 @@ public class UserComparator3 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2009862837" + ) + public static void method3546() { + class13.midiPcmStream.clear(); // L: 49 + class206.musicPlayerStatus = 1; // L: 50 + class23.musicTrackArchive = null; // L: 51 + } // L: 52 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "-1190316664" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 381 + int var2 = var1.readUnsignedByte(); // L: 382 + int var3 = var1.readInt(); // L: 383 + if (var3 < 0 || AbstractArchive.field3173 != 0 && var3 > AbstractArchive.field3173) { // L: 384 + throw new RuntimeException(); // L: 385 + } else if (var2 == 0) { // L: 387 + byte[] var6 = new byte[var3]; // L: 388 + var1.readBytes(var6, 0, var3); // L: 389 + return var6; // L: 390 + } else { + int var4 = var1.readInt(); // L: 393 + if (var4 >= 0 && (AbstractArchive.field3173 == 0 || var4 <= AbstractArchive.field3173)) { // L: 394 + byte[] var5 = new byte[var4]; // L: 397 + if (var2 == 1) { // L: 398 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399 + } + + return var5; // L: 400 + } else { + throw new RuntimeException(); // L: 395 + } + } + } + + @ObfuscatedName("in") + @ObfuscatedSignature( + descriptor = "(Lbi;IIII)V", + garbageValue = "-2001365984" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (PlayerType.localPlayer != var0) { // L: 9234 + if (Client.menuOptionsCount < 400) { // L: 9235 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 9237 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9238 + var7 = var0.combatLevel; // L: 9240 + int var8 = PlayerType.localPlayer.combatLevel; // L: 9241 + int var9 = var8 - var7; // L: 9243 + String var6; + if (var9 < -9) { // L: 9244 + var6 = Client.colorStartTag(16711680); // L: 9245 + } else if (var9 < -6) { // L: 9248 + var6 = Client.colorStartTag(16723968); // L: 9249 + } else if (var9 < -3) { // L: 9252 + var6 = Client.colorStartTag(16740352); // L: 9253 + } else if (var9 < 0) { // L: 9256 + var6 = Client.colorStartTag(16756736); // L: 9257 + } else if (var9 > 9) { // L: 9260 + var6 = Client.colorStartTag(65280); // L: 9261 + } else if (var9 > 6) { // L: 9264 + var6 = Client.colorStartTag(4259584); // L: 9265 + } else if (var9 > 3) { // L: 9268 + var6 = Client.colorStartTag(8453888); // L: 9269 + } else if (var9 > 0) { // L: 9272 + var6 = Client.colorStartTag(12648192); // L: 9273 + } else { + var6 = Client.colorStartTag(16776960); // L: 9276 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9278 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9280 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 9281 + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + Client.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9282 + } else if (Client.isSpellSelected) { // L: 9285 + if ((class105.selectedSpellFlags & 8) == 8) { // L: 9286 + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + Client.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9287 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 9292 + if (Client.playerMenuActions[var10] != null) { // L: 9293 + short var11 = 0; // L: 9294 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9295 + if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9296 + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > PlayerType.localPlayer.combatLevel) { // L: 9297 + var11 = 2000; // L: 9298 + } + + if (PlayerType.localPlayer.team != 0 && var0.team != 0) { // L: 9300 + if (var0.team == PlayerType.localPlayer.team) { // L: 9301 + var11 = 2000; + } else { + var11 = 0; // L: 9302 + } + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 9305 + var11 = 2000; + } + + boolean var12 = false; // L: 9306 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9307 + ModelData0.insertMenuItemNoShift(Client.playerMenuActions[var10], Client.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9308 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9313 + if (Client.menuOpcodes[var10] == 23) { // L: 9314 + Client.menuTargets[var10] = Client.colorStartTag(16777215) + var4; // L: 9315 + break; + } + } + + } + } + } // L: 9319 } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index fc92504639..f2c2173199 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,37 +1,123 @@ import java.util.Comparator; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fs") +@ObfuscatedName("fr") +@Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("f") - static String[] field2005; - @ObfuscatedName("fu") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Lmc;" ) - static UrlRequester urlRequester; - @ObfuscatedName("z") + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator4(boolean var1) { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;I)I", - garbageValue = "1508747808" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "-1246089706" ) + @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 } + public boolean equals(Object var1) { + return super.equals(var1); + } + public int compare(Object var1, Object var2) { return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 22 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Liw;II)Lhk;", + garbageValue = "1936937358" + ) + static MusicPatch method3497(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 21 + return var2 == null ? null : new MusicPatch(var2); // L: 22 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Liw;Liw;I)Z", + garbageValue = "-301606279" + ) + public static boolean method3504(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; // L: 44 + if (!var0.isFullyLoaded()) { // L: 45 + return false; // L: 46 + } else { + NPC.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[NPC.WorldMapElement_count]; // L: 49 + + for (int var2 = 0; var2 < NPC.WorldMapElement_count; ++var2) { // L: 50 + byte[] var3 = var0.takeFile(35, var2); // L: 51 + WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52 + if (var3 != null) { // L: 53 + WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54 + WorldMapElement.WorldMapElement_cached[var2].method4518(); // L: 55 + } + } + + return true; // L: 58 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)Lht;", + garbageValue = "-45" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 195 + int var2 = var0 & 65535; // L: 196 + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 197 + boolean var3 = ScriptFrame.loadInterface(var1); // L: 198 + if (!var3) { // L: 199 + return null; + } + } + + return Widget.Widget_interfaceComponents[var1][var2]; // L: 201 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-1942076594" + ) + static int method3506(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 1104 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1105 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.itemId; // L: 1106 + return 1; // L: 1107 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1109 + if (var3.itemId != -1) { // L: 1110 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1111 + } + + return 1; // L: 1112 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1114 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1115 + return 1; // L: 1116 + } else { + return 2; // L: 1118 + } } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 1256ff72a3..675aa7d570 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -1,27 +1,44 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("fv") +@Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("z") + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "Lfu;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("gl") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("compass") + static Sprite compass; + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;B)I", - garbageValue = "46" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "-1154663749" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0) { // L: 14 if (var2.world == 0) { // L: 15 return this.reversed ? -1 : 1; } - } else if (var2.world != 0) { - return this.reversed ? 1 : -1; // L: 18 + } else if (var2.world != 0) { // L: 18 + return this.reversed ? 1 : -1; } return this.compareUser(var1, var2); // L: 20 @@ -31,30 +48,45 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;IIB)[Lls;", - garbageValue = "20" + descriptor = "(Liw;IIB)[Lle;", + garbageValue = "-1" ) - public static IndexedSprite[] method3515(AbstractArchive var0, int var1, int var2) { + public static IndexedSprite[] method3540(AbstractArchive var0, int var1, int var2) { byte[] var4 = var0.takeFile(var1, var2); // L: 25 boolean var3; if (var4 == null) { // L: 26 var3 = false; // L: 27 } else { - Occluder.SpriteBuffer_decode(var4); // L: 30 + class217.SpriteBuffer_decode(var4); // L: 30 var3 = true; // L: 31 } - return !var3 ? null : class307.method5558(); // L: 33 34 - } + if (!var3) { // L: 33 + return null; + } else { + IndexedSprite[] var5 = new IndexedSprite[class336.SpriteBuffer_spriteCount]; // L: 36 - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)[Lgd;", - garbageValue = "-755062190" - ) - public static class194[] method3518() { - return new class194[]{class194.field2371, class194.field2362, class194.field2363, class194.field2370, class194.field2365, class194.field2366, class194.field2364, class194.field2368, class194.field2361, class194.field2367}; // L: 17 + for (int var6 = 0; var6 < class336.SpriteBuffer_spriteCount; ++var6) { // L: 37 + IndexedSprite var7 = var5[var6] = new IndexedSprite(); // L: 38 + var7.width = class336.SpriteBuffer_spriteWidth; // L: 39 + var7.height = class336.SpriteBuffer_spriteHeight; // L: 40 + var7.xOffset = class336.SpriteBuffer_xOffsets[var6]; // L: 41 + var7.yOffset = class225.SpriteBuffer_yOffsets[var6]; // L: 42 + var7.subWidth = class336.SpriteBuffer_spriteWidths[var6]; // L: 43 + var7.subHeight = class336.SpriteBuffer_spriteHeights[var6]; // L: 44 + var7.palette = WorldMapID.SpriteBuffer_spritePalette; // L: 45 + var7.pixels = class13.SpriteBuffer_pixels[var6]; // L: 46 + } + + class336.SpriteBuffer_xOffsets = null; // L: 49 + class225.SpriteBuffer_yOffsets = null; // L: 50 + class336.SpriteBuffer_spriteWidths = null; // L: 51 + class336.SpriteBuffer_spriteHeights = null; // L: 52 + WorldMapID.SpriteBuffer_spritePalette = null; // L: 53 + class13.SpriteBuffer_pixels = null; // L: 54 + return var5; // L: 58 + } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 105f7455da..9d6e3c6c32 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,68 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fg") +@Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("z") + @ObfuscatedName("ec") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator6(boolean var1) { this.reversed = var1; // L: 10 - } + } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;I)I", - garbageValue = "1525327475" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "313468169" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + if (var1.world != 0 && var2.world != 0) { // L: 14 + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 15 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("z") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;", - garbageValue = "38" + descriptor = "(Ljg;IIIB)V", + garbageValue = "100" ) - public static String method3535(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { // L: 11 - return ""; - } else if (var2 == 1) { // L: 12 - CharSequence var10 = var0[var1]; // L: 13 - return var10 == null ? "null" : var10.toString(); // L: 14 15 - } else { - int var3 = var2 + var1; // L: 17 - int var4 = 0; // L: 18 - - for (int var5 = var1; var5 < var3; ++var5) { // L: 19 - CharSequence var9 = var0[var5]; // L: 20 - if (var9 == null) { // L: 21 - var4 += 4; - } else { - var4 += var9.length(); // L: 22 + @Export("addSequenceSoundEffect") + static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { // L: 3556 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3557 + int var4 = var0.soundEffects[var1]; // L: 3558 + if (var4 != 0) { // L: 3559 + int var5 = var4 >> 8; // L: 3560 + int var6 = var4 >> 4 & 7; // L: 3561 + int var7 = var4 & 15; // L: 3562 + Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3563 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3564 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3565 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3566 + int var8 = (var2 - 64) / 128; // L: 3567 + int var9 = (var3 - 64) / 128; // L: 3568 + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3569 + ++Client.soundEffectCount; // L: 3570 } } - - StringBuilder var8 = new StringBuilder(var4); // L: 24 - - for (int var6 = var1; var6 < var3; ++var6) { // L: 25 - CharSequence var7 = var0[var6]; // L: 26 - if (var7 == null) { // L: 27 - var8.append("null"); - } else { - var8.append(var7); // L: 28 - } - } - - return var8.toString(); // L: 30 } - } + } // L: 3571 + + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "(Lkb;II)V", + garbageValue = "-131099529" + ) + static void method3565(Buffer var0, int var1) { + class22.method246(var0.array, var1); // L: 11628 + UserComparator9.method3513(var0, var1); // L: 11629 + } // L: 11630 } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 9d887feb11..5dadc69d26 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,28 +1,25 @@ +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("fe") +@ObfuscatedName("fb") +@Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("m") - public static short[][] field2021; - @ObfuscatedName("dj") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - static Task js5SocketTask; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator7(boolean var1) { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;I)I", - garbageValue = "1614336230" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "-386132507" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0 && var2.world != 0) { // L: 14 return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 15 @@ -34,165 +31,4 @@ public class UserComparator7 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "([BS)Lcy;", - garbageValue = "-15973" - ) - static Script newScript(byte[] var0) { - Script var1 = new Script(); // L: 111 - Buffer var2 = new Buffer(var0); // L: 112 - var2.offset = var2.array.length - 2; // L: 113 - int var3 = var2.readUnsignedShort(); // L: 114 - int var4 = var2.array.length - 2 - var3 - 12; // L: 115 - var2.offset = var4; // L: 116 - int var5 = var2.readInt(); // L: 117 - var1.localIntCount = var2.readUnsignedShort(); // L: 118 - var1.localStringCount = var2.readUnsignedShort(); // L: 119 - var1.intArgumentCount = var2.readUnsignedShort(); // L: 120 - var1.stringArgumentCount = var2.readUnsignedShort(); // L: 121 - int var6 = var2.readUnsignedByte(); // L: 122 - int var7; - int var8; - if (var6 > 0) { // L: 123 - var1.switches = var1.newIterableNodeHashTable(var6); // L: 124 - - for (var7 = 0; var7 < var6; ++var7) { // L: 125 - var8 = var2.readUnsignedShort(); // L: 126 - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? class297.method5378(var8) : 1); // L: 127 - var1.switches[var7] = var9; // L: 128 - - while (var8-- > 0) { // L: 129 - int var10 = var2.readInt(); // L: 130 - int var11 = var2.readInt(); // L: 131 - var9.put(new IntegerNode(var11), (long)var10); // L: 132 - } - } - } - - var2.offset = 0; // L: 136 - var2.readStringCp1252NullTerminatedOrNull(); // L: 137 - var1.opcodes = new int[var5]; // L: 138 - var1.intOperands = new int[var5]; // L: 139 - var1.stringOperands = new String[var5]; // L: 140 - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 141 142 147 - var8 = var2.readUnsignedShort(); // L: 143 - if (var8 == 3) { // L: 144 - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { // L: 145 - var1.intOperands[var7] = var2.readInt(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); // L: 146 - } - } - - return var1; // L: 149 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-1793488116" - ) - static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 75 - boolean var3 = false; // L: 76 - boolean var4 = false; // L: 77 - int var5 = 0; // L: 78 - int var6 = var0.length(); // L: 79 - - for (int var7 = 0; var7 < var6; ++var7) { // L: 80 - char var8 = var0.charAt(var7); // L: 81 - if (var7 == 0) { // L: 82 - if (var8 == '-') { // L: 83 - var3 = true; // L: 84 - continue; - } - - if (var8 == '+') { // L: 87 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 89 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 90 - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { // L: 91 - throw new NumberFormatException(); // L: 92 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 93 - throw new NumberFormatException(); - } - - if (var3) { // L: 94 - var10 = -var10; - } - - int var9 = var10 + var5 * var1; // L: 95 - if (var9 / var1 != var5) { // L: 96 - throw new NumberFormatException(); - } - - var5 = var9; // L: 97 - var4 = true; // L: 98 - } - - if (!var4) { // L: 100 - throw new NumberFormatException(); - } else { - return var5; // L: 101 - } - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "54" - ) - static int method3513(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3124 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class39.getWindowedMode(); // L: 3125 - return 1; // L: 3126 - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3128 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3129 - if (var3 == 1 || var3 == 2) { // L: 3130 - FontName.setWindowedMode(var3); - } - - return 1; // L: 3131 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3133 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.windowMode; // L: 3134 - return 1; // L: 3135 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3137 - if (var0 == 5310) { // L: 3145 - --Interpreter.Interpreter_intStackSize; // L: 3146 - return 1; // L: 3147 - } else { - return 2; // L: 3149 - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3138 - if (var3 == 1 || var3 == 2) { // L: 3139 - Tile.clientPreferences.windowMode = var3; // L: 3140 - WorldMapData_1.savePreferences(); // L: 3141 - } - - return 1; // L: 3143 - } - } - } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index f200e7b969..4db582b22b 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,27 +1,25 @@ -import java.util.Iterator; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fy") +@Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("ml") - @ObfuscatedGetter( - intValue = 1924820265 - ) - static int selectedSpellFlags; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;I)I", - garbageValue = "2134639094" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "1500260549" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world) { // L: 15 if (var2.world != Client.worldId) { @@ -37,129 +35,4 @@ public class UserComparator8 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-346223119" - ) - static void method3497() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 59 - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 60 - var1.clearIsFromIgnored(); // L: 62 - } - - } // L: 65 - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "5447361" - ) - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = SecureRandomCallable.getWidgetChild(var1, var2); // L: 8137 - if (var5 != null) { // L: 8138 - if (var5.onOp != null) { // L: 8139 - ScriptEvent var6 = new ScriptEvent(); // L: 8140 - var6.widget = var5; // L: 8141 - var6.opIndex = var0; // L: 8142 - var6.targetName = var4; // L: 8143 - var6.args = var5.onOp; // L: 8144 - Script.runScriptEvent(var6); // L: 8145 - } - - boolean var8 = true; // L: 8147 - if (var5.contentType > 0) { // L: 8148 - var8 = class4.method60(var5); - } - - if (var8) { // L: 8149 - if (StudioGame.method4230(WorldMapIcon_0.getWidgetFlags(var5), var0 - 1)) { // L: 8150 - PacketBufferNode var7; - if (var0 == 1) { // L: 8153 - var7 = Client.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); // L: 8155 - var7.packetBuffer.writeInt(var1); // L: 8156 - var7.packetBuffer.writeShort(var2); // L: 8157 - var7.packetBuffer.writeShort(var3); // L: 8158 - Client.packetWriter.addNode(var7); // L: 8159 - } - - if (var0 == 2) { // L: 8161 - var7 = Client.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); // L: 8163 - var7.packetBuffer.writeInt(var1); // L: 8164 - var7.packetBuffer.writeShort(var2); // L: 8165 - var7.packetBuffer.writeShort(var3); // L: 8166 - Client.packetWriter.addNode(var7); // L: 8167 - } - - if (var0 == 3) { // L: 8169 - var7 = Client.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); // L: 8171 - var7.packetBuffer.writeInt(var1); // L: 8172 - var7.packetBuffer.writeShort(var2); // L: 8173 - var7.packetBuffer.writeShort(var3); // L: 8174 - Client.packetWriter.addNode(var7); // L: 8175 - } - - if (var0 == 4) { // L: 8177 - var7 = Client.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); // L: 8179 - var7.packetBuffer.writeInt(var1); // L: 8180 - var7.packetBuffer.writeShort(var2); // L: 8181 - var7.packetBuffer.writeShort(var3); // L: 8182 - Client.packetWriter.addNode(var7); // L: 8183 - } - - if (var0 == 5) { // L: 8185 - var7 = Client.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); // L: 8187 - var7.packetBuffer.writeInt(var1); // L: 8188 - var7.packetBuffer.writeShort(var2); // L: 8189 - var7.packetBuffer.writeShort(var3); // L: 8190 - Client.packetWriter.addNode(var7); // L: 8191 - } - - if (var0 == 6) { // L: 8193 - var7 = Client.getPacketBufferNode(ClientPacket.field2330, Client.packetWriter.isaacCipher); // L: 8195 - var7.packetBuffer.writeInt(var1); // L: 8196 - var7.packetBuffer.writeShort(var2); // L: 8197 - var7.packetBuffer.writeShort(var3); // L: 8198 - Client.packetWriter.addNode(var7); // L: 8199 - } - - if (var0 == 7) { // L: 8201 - var7 = Client.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); // L: 8203 - var7.packetBuffer.writeInt(var1); // L: 8204 - var7.packetBuffer.writeShort(var2); // L: 8205 - var7.packetBuffer.writeShort(var3); // L: 8206 - Client.packetWriter.addNode(var7); // L: 8207 - } - - if (var0 == 8) { // L: 8209 - var7 = Client.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8211 - var7.packetBuffer.writeInt(var1); // L: 8212 - var7.packetBuffer.writeShort(var2); // L: 8213 - var7.packetBuffer.writeShort(var3); // L: 8214 - Client.packetWriter.addNode(var7); // L: 8215 - } - - if (var0 == 9) { // L: 8217 - var7 = Client.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); // L: 8219 - var7.packetBuffer.writeInt(var1); // L: 8220 - var7.packetBuffer.writeShort(var2); // L: 8221 - var7.packetBuffer.writeShort(var3); // L: 8222 - Client.packetWriter.addNode(var7); // L: 8223 - } - - if (var0 == 10) { // L: 8225 - var7 = Client.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); // L: 8227 - var7.packetBuffer.writeInt(var1); // L: 8228 - var7.packetBuffer.writeShort(var2); // L: 8229 - var7.packetBuffer.writeShort(var3); // L: 8230 - Client.packetWriter.addNode(var7); // L: 8231 - } - - } - } - } - } // L: 8151 8233 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 8c70ebb75f..987c37fb86 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,26 +1,31 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fo") +@Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("rn") - @ObfuscatedGetter( - intValue = 1726851723 + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Liw;" ) - static int field2013; - @ObfuscatedName("z") + @Export("ItemDefinition_modelArchive") + public static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("f") + @Export("reversed") final boolean reversed; public UserComparator9(boolean var1) { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;Lko;B)I", - garbageValue = "6" + descriptor = "(Lkl;Lkl;I)I", + garbageValue = "-1791270735" ) + @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 16 @@ -33,33 +38,43 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("z") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lic;Lic;ZLkr;I)V", - garbageValue = "-766510730" + descriptor = "(Lkb;IB)V", + garbageValue = "39" ) - public static void method3487(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - class231.ItemDefinition_archive = var0; // L: 84 - ItemDefinition.ItemDefinition_modelArchive = var1; // L: 85 - ItemDefinition.ItemDefinition_inMembersWorld = var2; // L: 86 - class227.ItemDefinition_fileCount = class231.ItemDefinition_archive.getGroupFileCount(10); // L: 87 - ScriptEvent.ItemDefinition_fontPlain11 = var3; // L: 88 - } // L: 89 + public static void method3513(Buffer var0, int var1) { + if (JagexCache.JagexCache_randomDat != null) { // L: 327 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 329 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 330 + } catch (Exception var3) { // L: 332 + } + } - @ObfuscatedName("o") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 76 - } + } // L: 334 - @ObfuscatedName("d") + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-773772836" + descriptor = "([Lht;Lht;ZI)V", + garbageValue = "137772189" ) - static final void method3492(String var0) { - PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2315, Client.packetWriter.isaacCipher); // L: 134 - var1.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0)); // L: 135 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 136 - Client.packetWriter.addNode(var1); // L: 137 - } // L: 138 + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1991373371 * -999155981 : var1.width * 1458952181 * 410180701; // L: 9875 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -1625501093 * 850398675 : var1.height * -1661593933 * 964462715; // L: 9876 + SecureRandomFuture.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9877 + if (var1.children != null) { // L: 9878 + SecureRandomFuture.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9879 + if (var5 != null) { + Fonts.method5463(var5.group, var3, var4, var2); // L: 9880 + } + + if (var1.contentType == 1337) { // L: 9881 + } + + } // L: 9882 } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 1c73990181..8837ec781c 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -1,32 +1,41 @@ import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("ku") +@Implements("UserList") public abstract class UserList { - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2008774827 + intValue = 796277423 ) + @Export("capacity") final int capacity; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1305401637 + intValue = -866488291 ) + @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Ljc;" + descriptor = "[Ljh;" ) + @Export("array") User[] array; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("comparator") Comparator comparator; UserList(int var1) { @@ -38,25 +47,28 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); // L: 19 } // L: 20 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Ljc;", - garbageValue = "35" + descriptor = "(I)Ljh;", + garbageValue = "-1664145399" ) + @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)[Ljc;", - garbageValue = "-19" + descriptor = "(IB)[Ljh;", + garbageValue = "-35" ) + @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1831744514" + garbageValue = "1055831029" ) + @Export("clear") public void clear() { this.size = 0; // L: 23 Arrays.fill(this.array, (Object)null); // L: 24 @@ -64,29 +76,32 @@ public abstract class UserList { this.previousUsernamesMap.clear(); // L: 26 } // L: 27 - @ObfuscatedName("g") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1512383935" + garbageValue = "-1841589615" ) + @Export("getSize") public int getSize() { return this.size; // L: 30 } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-886251053" + descriptor = "(B)Z", + garbageValue = "39" ) + @Export("isFull") public boolean isFull() { - return this.size == this.capacity; // L: 34 + return this.capacity == this.size; // L: 34 } - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lku;I)Z", - garbageValue = "-311304829" + descriptor = "(Lkm;B)Z", + garbageValue = "6" ) + @Export("contains") public boolean contains(Username var1) { if (!var1.hasCleanName()) { // L: 38 return false; @@ -95,39 +110,43 @@ public abstract class UserList { } } - @ObfuscatedName("d") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lku;I)Ljc;", - garbageValue = "1710477064" + descriptor = "(Lkm;I)Ljh;", + garbageValue = "-1592102187" ) + @Export("getByUsername") public User getByUsername(Username var1) { User var2 = this.getByCurrentUsername(var1); // L: 44 return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46 } - @ObfuscatedName("h") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lku;I)Ljc;", - garbageValue = "-1895174831" + descriptor = "(Lkm;I)Ljh;", + garbageValue = "705820719" ) + @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 50 51 } - @ObfuscatedName("a") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lku;I)Ljc;", - garbageValue = "835389393" + descriptor = "(Lkm;B)Ljh;", + garbageValue = "63" ) + @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56 } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lku;I)Z", - garbageValue = "759347580" + descriptor = "(Lkm;I)Z", + garbageValue = "-539388005" ) + @Export("removeByUsername") public final boolean removeByUsername(Username var1) { User var2 = this.getByCurrentUsername(var1); // L: 60 if (var2 == null) { // L: 61 @@ -138,11 +157,12 @@ public abstract class UserList { } } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Ljc;I)V", - garbageValue = "-2147483648" + descriptor = "(Ljh;I)V", + garbageValue = "1784418658" ) + @Export("remove") final void remove(User var1) { int var2 = this.indexOf(var1); // L: 67 if (var2 != -1) { // L: 68 @@ -151,37 +171,40 @@ public abstract class UserList { } } // L: 71 - @ObfuscatedName("j") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lku;I)Ljc;", - garbageValue = "-213135493" + descriptor = "(Lkm;B)Ljh;", + garbageValue = "1" ) + @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 74 } - @ObfuscatedName("r") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lku;Lku;I)Ljc;", - garbageValue = "-230668555" + descriptor = "(Lkm;Lkm;I)Ljh;", + garbageValue = "-1324246236" ) + @Export("addLast") User addLast(Username var1, Username var2) { if (this.getByCurrentUsername(var1) != null) { // L: 78 throw new IllegalStateException(); } else { - User var3 = this.newInstance(); - var3.set(var1, var2); + User var3 = this.newInstance(); // L: 79 + var3.set(var1, var2); // L: 80 this.arrayAddLast(var3); // L: 81 this.mapPut(var3); // L: 82 return var3; // L: 83 } } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)Ljc;", - garbageValue = "1213282055" + descriptor = "(IB)Ljh;", + garbageValue = "20" ) + @Export("get") public final User get(int var1) { if (var1 >= 0 && var1 < this.size) { // L: 87 return this.array[var1]; @@ -190,11 +213,12 @@ public abstract class UserList { } } - @ObfuscatedName("p") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2116233502" + descriptor = "(B)V", + garbageValue = "0" ) + @Export("sort") public final void sort() { if (this.comparator == null) { // L: 92 Arrays.sort(this.array, 0, this.size); // L: 93 @@ -204,22 +228,24 @@ public abstract class UserList { } // L: 98 - @ObfuscatedName("b") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(Ljc;Lku;Lku;B)V", - garbageValue = "5" + descriptor = "(Ljh;Lkm;Lkm;I)V", + garbageValue = "226433495" ) + @Export("changeName") final void changeName(User var1, Username var2, Username var3) { this.mapRemove(var1); // L: 101 var1.set(var2, var3); // L: 102 this.mapPut(var1); // L: 103 } // L: 104 - @ObfuscatedName("l") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Ljc;I)I", - garbageValue = "-1151090294" + descriptor = "(Ljh;B)I", + garbageValue = "-67" ) + @Export("indexOf") final int indexOf(User var1) { for (int var2 = 0; var2 < this.size; ++var2) { // L: 107 if (this.array[var2] == var1) { // L: 108 @@ -230,11 +256,12 @@ public abstract class UserList { return -1; // L: 110 } - @ObfuscatedName("e") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Ljc;I)V", - garbageValue = "1797104499" + descriptor = "(Ljh;I)V", + garbageValue = "-2111985492" ) + @Export("mapRemove") final void mapRemove(User var1) { if (this.usernamesMap.remove(var1.username) == null) { // L: 114 throw new IllegalStateException(); @@ -246,20 +273,22 @@ public abstract class UserList { } } // L: 116 - @ObfuscatedName("ab") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljc;I)V", - garbageValue = "-909101676" + descriptor = "(Ljh;I)V", + garbageValue = "2106732917" ) + @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; // L: 119 } // L: 120 - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljc;B)V", - garbageValue = "44" + descriptor = "(Ljh;I)V", + garbageValue = "885880161" ) + @Export("mapPut") final void mapPut(User var1) { this.usernamesMap.put(var1.username, var1); // L: 123 if (var1.previousUsername != null) { // L: 124 @@ -271,11 +300,12 @@ public abstract class UserList { } // L: 130 - @ObfuscatedName("ao") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "7" + descriptor = "(II)V", + garbageValue = "1356379849" ) + @Export("arrayRemove") final void arrayRemove(int var1) { --this.size; // L: 133 if (var1 < this.size) { // L: 134 @@ -284,20 +314,22 @@ public abstract class UserList { } // L: 137 - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-50074451" + descriptor = "(B)V", + garbageValue = "-73" ) + @Export("removeComparator") public final void removeComparator() { this.comparator = null; // L: 143 } // L: 144 - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "-2021425176" + garbageValue = "-1563194016" ) + @Export("addComparator") public final void addComparator(Comparator var1) { if (this.comparator == null) { // L: 147 this.comparator = var1; // L: 148 @@ -306,13 +338,4 @@ public abstract class UserList { } } // L: 153 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-641844714" - ) - static char method5199(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 79 80 - } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 20cf746cc4..f1dfaa4f85 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -1,143 +1,90 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("km") +@Implements("Username") public class Username implements Comparable { - @ObfuscatedName("t") - static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("z") + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("f") + @Export("name") String name; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lmu;)V" + descriptor = "(Ljava/lang/String;Lmc;)V" ) public Username(String var1, LoginType var2) { this.name = var1; // L: 11 - String var4; - if (var1 == null) { // L: 15 - var4 = null; // L: 16 - } else { - int var5 = 0; // L: 19 + this.cleanName = class323.method6048(var1, var2); // L: 12 + } // L: 13 - int var6; - boolean var7; - char var8; - for (var6 = var1.length(); var5 < var6; ++var5) { // L: 20 23 - var8 = var1.charAt(var5); // L: 25 - var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 27 - if (!var7) { // L: 29 - break; - } - } - - while (var6 > var5) { // L: 37 - var8 = var1.charAt(var6 - 1); // L: 39 - var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 41 - if (!var7) { // L: 43 - break; - } - - --var6; // L: 47 - } - - int var13 = var6 - var5; // L: 49 - if (var13 >= 1 && var13 <= GrandExchangeOfferUnitPriceComparator.method211(var2)) { // L: 50 - StringBuilder var12 = new StringBuilder(var13); // L: 54 - - for (int var9 = var5; var9 < var6; ++var9) { // L: 55 - char var10 = var1.charAt(var9); // L: 56 - if (WorldMapSprite.method496(var10)) { // L: 57 - char var11 = class307.method5555(var10); // L: 58 - if (var11 != 0) { // L: 59 - var12.append(var11); // L: 60 - } - } - } - - if (var12.length() == 0) { // L: 62 - var4 = null; // L: 63 - } else { - var4 = var12.toString(); // L: 66 - } - } else { - var4 = null; // L: 51 - } - } - - this.cleanName = var4; // L: 68 - } // L: 69 - - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2006682850" + garbageValue = "-1362272434" ) + @Export("getName") public String getName() { - return this.name; // L: 72 + return this.name; // L: 16 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" + descriptor = "(I)Z", + garbageValue = "2074107082" ) + @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; // L: 76 + return this.cleanName != null; // L: 20 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lku;I)I", - garbageValue = "-354391485" + descriptor = "(Lkm;I)I", + garbageValue = "1900855669" ) + @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 100 - return var1.cleanName == null ? 0 : 1; // L: 101 102 + if (this.cleanName == null) { // L: 44 + return var1.cleanName == null ? 0 : 1; // L: 45 46 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 104 105 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 48 49 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 80 - Username var2 = (Username)var1; // L: 81 - if (this.cleanName == null) { // L: 82 - return var2.cleanName == null; - } else if (var2.cleanName == null) { // L: 83 + if (var1 instanceof Username) { // L: 24 + Username var2 = (Username)var1; // L: 25 + if (this.cleanName == null) { + return var2.cleanName == null; // L: 26 + } else if (var2.cleanName == null) { // L: 27 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 84 85 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 28 29 } } else { - return false; // L: 87 + return false; // L: 31 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 91 92 - } - - public String toString() { - return this.getName(); // L: 96 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 35 36 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 109 + return this.compareToTyped((Username)var1); // L: 53 } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Llq;IIB)I", - garbageValue = "29" - ) - static int method5309(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { // L: 33 - return var2; - } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 - return var3 == null ? var2 : var3.integer; // L: 35 36 - } + public String toString() { + return this.getName(); // L: 40 } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 65e9e1651e..6f94b67a01 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -1,12 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("ka") +@Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("ks") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(I)Lku;", - garbageValue = "1348007061" + descriptor = "(B)Lkm;", + garbageValue = "104" ) + @Export("username") Username username(); } diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 521e9fc7d7..2e940419ab 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -1,102 +1,95 @@ -import java.applet.Applet; +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("iy") +@Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) - static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("hf") - @ObfuscatedSignature( - descriptor = "[Llp;" - ) - static Sprite[] mapMarkerSprites; - @ObfuscatedName("s") + @Export("VarbitDefinition_cached") + public static EvictingDualNodeHashTable VarbitDefinition_cached; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -416955877 + intValue = 1810404981 ) + @Export("baseVar") public int baseVar; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -740697079 + intValue = -581436309 ) + @Export("startBit") public int startBit; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -427959509 + intValue = 1763957303 ) + @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - VarbitDefinition() { - } - - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "2006870580" + descriptor = "(Lkb;B)V", + garbageValue = "7" ) - void decode(Buffer var1) { + @Export("decode") + public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 30 - if (var2 == 0) { // L: 31 - return; // L: 34 + int var2 = var1.readUnsignedByte(); // L: 18 + if (var2 == 0) { // L: 19 + return; // L: 22 } - this.decodeNext(var1, var2); // L: 32 + this.decodeNext(var1, var2); // L: 20 } } - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "1701572620" + descriptor = "(Lkb;IB)V", + garbageValue = "37" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 37 - this.baseVar = var1.readUnsignedShort(); // L: 38 - this.startBit = var1.readUnsignedByte(); // L: 39 - this.endBit = var1.readUnsignedByte(); // L: 40 + if (var2 == 1) { // L: 25 + this.baseVar = var1.readUnsignedShort(); // L: 26 + this.startBit = var1.readUnsignedByte(); // L: 27 + this.endBit = var1.readUnsignedByte(); // L: 28 } - } // L: 43 + } // L: 31 - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "1125902282" + descriptor = "(CI)C", + garbageValue = "-943155680" ) - public static void method4593(Applet var0, String var1) { - class60.applet = var0; // L: 22 - if (var1 != null) { // L: 23 - class60.field451 = var1; - } - - } // L: 24 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-852003243" - ) - static int method4596(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; + static char method4663(char var0) { + if (var0 == 198) { // L: 95 + return 'E'; + } else if (var0 == 230) { // L: 96 + return 'e'; + } else if (var0 == 223) { + return 's'; // L: 97 + } else if (var0 == 338) { // L: 98 + return 'E'; } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100 } } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 7faad1207f..9436e9acc9 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,54 +1,210 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("if") +@Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) - static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("s") + @Export("VarcInt_cached") + public static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("l") + @Export("persist") public boolean persist; static { VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 } - VarcInt() { + public VarcInt() { this.persist = false; // L: 12 - } // L: 14 + } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "69" + descriptor = "(Lkb;I)V", + garbageValue = "-871619448" ) - void method4488(Buffer var1) { + public void method4552(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 28 - if (var2 == 0) { // L: 29 - return; // L: 32 + int var2 = var1.readUnsignedByte(); // L: 20 + if (var2 == 0) { // L: 21 + return; // L: 24 } - this.method4489(var1, var2); // L: 30 + this.method4556(var1, var2); // L: 22 } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;IB)V", - garbageValue = "-62" + descriptor = "(Lkb;II)V", + garbageValue = "-359946158" ) - void method4489(Buffer var1, int var2) { - if (var2 == 2) { // L: 35 - this.persist = true; // L: 36 + void method4556(Buffer var1, int var2) { + if (var2 == 2) { // L: 27 + this.persist = true; // L: 28 } - } // L: 39 + } // L: 31 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-159585156" + ) + static int method4562(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 389 + return Script.method2355(var0, var1, var2); + } else if (var0 < 1100) { // L: 390 + return SpotAnimationDefinition.method4577(var0, var1, var2); + } else if (var0 < 1200) { // L: 391 + return KeyHandler.method934(var0, var1, var2); + } else if (var0 < 1300) { // L: 392 + return class69.method1266(var0, var1, var2); + } else if (var0 < 1400) { // L: 393 + return FriendSystem.method2018(var0, var1, var2); + } else if (var0 < 1500) { // L: 394 + return Language.method3802(var0, var1, var2); + } else if (var0 < 1600) { // L: 395 + return GrandExchangeOffer.method198(var0, var1, var2); + } else if (var0 < 1700) { // L: 396 + return ParamDefinition.method4671(var0, var1, var2); + } else if (var0 < 1800) { // L: 397 + return UserComparator4.method3506(var0, var1, var2); + } else if (var0 < 1900) { // L: 398 + return MouseHandler.method1152(var0, var1, var2); + } else if (var0 < 2000) { // L: 399 + return PlayerType.method4274(var0, var1, var2); + } else if (var0 < 2100) { // L: 400 + return SpotAnimationDefinition.method4577(var0, var1, var2); + } else if (var0 < 2200) { // L: 401 + return KeyHandler.method934(var0, var1, var2); + } else if (var0 < 2300) { // L: 402 + return class69.method1266(var0, var1, var2); + } else if (var0 < 2400) { // L: 403 + return FriendSystem.method2018(var0, var1, var2); + } else if (var0 < 2500) { + return Language.method3802(var0, var1, var2); // L: 404 + } else if (var0 < 2600) { // L: 405 + return Strings.method4259(var0, var1, var2); + } else if (var0 < 2700) { // L: 406 + return GrandExchangeEvent.method165(var0, var1, var2); + } else if (var0 < 2800) { // L: 407 + return class23.method249(var0, var1, var2); + } else if (var0 < 2900) { // L: 408 + return WorldMapID.method667(var0, var1, var2); + } else if (var0 < 3000) { // L: 409 + return PlayerType.method4274(var0, var1, var2); + } else if (var0 < 3200) { // L: 410 + return NPC.method2158(var0, var1, var2); + } else if (var0 < 3300) { // L: 411 + return WorldMapDecoration.method429(var0, var1, var2); + } else if (var0 < 3400) { // L: 412 + return VertexNormal.method3134(var0, var1, var2); + } else if (var0 < 3500) { // L: 413 + return Player.method1354(var0, var1, var2); + } else if (var0 < 3700) { // L: 414 + return SpriteMask.method4119(var0, var1, var2); + } else if (var0 < 4000) { // L: 415 + return class217.method4099(var0, var1, var2); + } else if (var0 < 4100) { // L: 416 + return PendingSpawn.method1840(var0, var1, var2); + } else if (var0 < 4200) { // L: 417 + return NetCache.method4461(var0, var1, var2); + } else if (var0 < 4300) { // L: 418 + return ModeWhere.method3806(var0, var1, var2); + } else if (var0 < 5100) { // L: 419 + return WorldMapSprite.method518(var0, var1, var2); + } else if (var0 < 5400) { // L: 420 + return Tiles.method1222(var0, var1, var2); + } else if (var0 < 5600) { // L: 421 + return class169.method3572(var0, var1, var2); + } else if (var0 < 5700) { // L: 422 + return WorldMapArea.method511(var0, var1, var2); + } else if (var0 < 6300) { // L: 423 + return class22.method244(var0, var1, var2); + } else if (var0 < 6600) { // L: 424 + return GrandExchangeOfferAgeComparator.method240(var0, var1, var2); + } else { + return var0 < 6700 ? MusicPatch.method4036(var0, var1, var2) : 2; // L: 425 426 + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lid;IIIBZI)V", + garbageValue = "-1601672473" + ) + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 223 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 224 + if (var8 == null) { // L: 225 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 226 + if (var8 == null) { // L: 227 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 228 + if (var8 != null) { // L: 229 + if (var5) { // L: 230 + var8.removeDual(); // L: 231 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 232 + --NetCache.NetCache_pendingWritesCount; // L: 233 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 234 + } + + } else { + if (!var5) { // L: 238 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 239 + if (var8 != null) { // L: 240 + return; + } + } + + var8 = new NetFileRequest(); // L: 242 + var8.archive = var0; // L: 243 + var8.crc = var3; // L: 244 + var8.padding = var4; // L: 245 + if (var5) { // L: 246 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 247 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 248 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 251 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 252 + ++NetCache.NetCache_pendingWritesCount; // L: 253 + } + + } + } + } + } // L: 236 255 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-2000095907" + ) + static final int method4555(int var0, int var1) { + if (var0 == -1) { // L: 469 + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; // L: 470 + if (var1 < 2) { // L: 471 + var1 = 2; + } else if (var1 > 126) { // L: 472 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 473 + } + } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 99d6a15500..ba31e0123d 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -3,349 +3,413 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; +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("co") +@ObfuscatedName("cz") +@Implements("Varcs") public class Varcs { - @ObfuscatedName("q") + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "Lcv;" + descriptor = "Lid;" ) - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "[Llp;" - ) - static Sprite[] headIconHintSprites; - @ObfuscatedName("s") + @Export("archive5") + static Archive archive5; + @ObfuscatedName("l") + @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("map") Map map; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("strings") String[] strings; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 9168454196616585073L + longValue = -5306156143570405753L ) - long field1295; + long field1298; Varcs() { this.unwrittenChanges = false; // L: 22 - int var1 = NetFileRequest.archive2.getGroupFileCount(19); // L: 26 + int var1 = WorldMapSection3.archive2.getGroupFileCount(19); // L: 26 this.map = new HashMap(); // L: 27 this.intsPersistence = new boolean[var1]; // L: 28 int var2; for (var2 = 0; var2 < var1; ++var2) { // L: 29 - VarcInt var3 = Script.method2324(var2); // L: 30 - this.intsPersistence[var2] = var3.persist; // L: 31 + VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); // L: 32 + VarcInt var3; + if (var4 != null) { // L: 33 + var3 = var4; // L: 34 + } else { + byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); // L: 37 + var4 = new VarcInt(); // L: 38 + if (var5 != null) { + var4.method4552(new Buffer(var5)); // L: 39 + } + + VarcInt.VarcInt_cached.put(var4, (long)var2); // L: 40 + var3 = var4; // L: 41 + } + + this.intsPersistence[var2] = var3.persist; // L: 44 } - var2 = 0; // L: 33 - if (NetFileRequest.archive2.method4350(15)) { // L: 34 - var2 = NetFileRequest.archive2.getGroupFileCount(15); // L: 35 + var2 = 0; // L: 46 + if (WorldMapSection3.archive2.method4416(15)) { // L: 47 + var2 = WorldMapSection3.archive2.getGroupFileCount(15); // L: 48 } - this.strings = new String[var2]; // L: 37 - this.read(); // L: 38 - } // L: 39 + this.strings = new String[var2]; // L: 50 + this.read(); // L: 51 + } // L: 52 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1056987732" + ) + @Export("setInt") + void setInt(int var1, int var2) { + this.map.put(var1, var2); // L: 55 + if (this.intsPersistence[var1]) { + this.unwrittenChanges = true; // L: 56 + } + + } // L: 57 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "0" + ) + @Export("getInt") + int getInt(int var1) { + Object var2 = this.map.get(var1); // L: 60 + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 61 62 64 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "-368948322" + ) + @Export("setString") + void setString(int var1, String var2) { + this.map.put(var1, var2); // L: 68 + } // L: 69 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "2139997801" + ) + @Export("getString") + String getString(int var1) { + Object var2 = this.map.get(var1); // L: 72 + return var2 instanceof String ? (String)var2 : ""; // L: 73 74 76 + } @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-500127476" + descriptor = "(ILjava/lang/String;S)V", + garbageValue = "14747" ) - void setInt(int var1, int var2) { - this.map.put(var1, var2); // L: 42 - if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; // L: 43 - } + @Export("setStringOld") + void setStringOld(int var1, String var2) { + this.strings[var1] = var2; // L: 80 + } // L: 81 - } // L: 44 + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-475073463" + ) + @Export("getStringOld") + String getStringOld(int var1) { + return this.strings[var1]; // L: 84 + } @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-31" - ) - int getInt(int var1) { - Object var2 = this.map.get(var1); // L: 47 - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1549127087" - ) - void setString(int var1, String var2) { - this.map.put(var1, var2); // L: 55 - } // L: 56 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "95" - ) - String getString(int var1) { - Object var2 = this.map.get(var1); // L: 59 - return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1427019178" - ) - void setStringOld(int var1, String var2) { - this.strings[var1] = var2; // L: 67 - } // L: 68 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "106" - ) - String getStringOld(int var1) { - return this.strings[var1]; // L: 71 - } - - @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-69" + garbageValue = "2" ) + @Export("clearTransient") void clearTransient() { int var1; - for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 75 - if (!this.intsPersistence[var1]) { // L: 76 - this.map.remove(var1); // L: 77 + for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 88 + if (!this.intsPersistence[var1]) { // L: 89 + this.map.remove(var1); // L: 90 } } - for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 80 - this.strings[var1] = null; // L: 81 + for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 93 + this.strings[var1] = null; // L: 94 } - } // L: 83 + } // L: 96 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ZI)Lmy;", - garbageValue = "-850108574" + descriptor = "(ZI)Lmr;", + garbageValue = "229705825" ) + @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return class2.getPreferencesFile("2", Tiles.field532.name, var1); // L: 86 + return WorldMapID.getPreferencesFile("2", GrandExchangeOfferWorldComparator.field58.name, var1); // L: 99 } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "67" + descriptor = "(I)V", + garbageValue = "2018720636" ) + @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); // L: 90 + AccessFile var1 = this.getPreferencesFile(true); // L: 103 try { - int var2 = 3; // L: 92 - int var3 = 0; // L: 93 - Iterator var4 = this.map.entrySet().iterator(); // L: 94 + int var2 = 3; // L: 105 + int var3 = 0; // L: 106 + Iterator var4 = this.map.entrySet().iterator(); // L: 107 while (var4.hasNext()) { - Entry var5 = (Entry)var4.next(); // L: 95 - int var6 = (Integer)var5.getKey(); // L: 97 - if (this.intsPersistence[var6]) { // L: 98 - Object var7 = var5.getValue(); // L: 99 - var2 += 3; // L: 100 - if (var7 instanceof Integer) { // L: 101 + Entry var5 = (Entry)var4.next(); // L: 108 + int var6 = (Integer)var5.getKey(); // L: 110 + if (this.intsPersistence[var6]) { // L: 111 + Object var7 = var5.getValue(); // L: 112 + var2 += 3; // L: 113 + if (var7 instanceof Integer) { // L: 114 var2 += 4; } else if (var7 instanceof String) { - var2 += Decimator.stringCp1252NullTerminatedByteSize((String)var7); // L: 102 + var2 += SpriteMask.stringCp1252NullTerminatedByteSize((String)var7); // L: 115 } - ++var3; // L: 103 + ++var3; // L: 116 } } - Buffer var27 = new Buffer(var2); // L: 107 - var27.writeByte(2); // L: 108 - var27.writeShort(var3); // L: 109 - Iterator var28 = this.map.entrySet().iterator(); // L: 110 + Buffer var27 = new Buffer(var2); // L: 120 + var27.writeByte(2); // L: 121 + var27.writeShort(var3); // L: 122 + Iterator var28 = this.map.entrySet().iterator(); // L: 123 - label148: + label146: while (true) { Entry var16; int var17; do { if (!var28.hasNext()) { - var1.write(var27.array, 0, var27.offset); // L: 140 - break label148; + var1.write(var27.array, 0, var27.offset); // L: 153 + break label146; } - var16 = (Entry)var28.next(); // L: 111 - var17 = (Integer)var16.getKey(); // L: 113 - } while(!this.intsPersistence[var17]); // L: 114 + var16 = (Entry)var28.next(); // L: 124 + var17 = (Integer)var16.getKey(); // L: 126 + } while(!this.intsPersistence[var17]); // L: 127 - var27.writeShort(var17); // L: 115 - Object var8 = var16.getValue(); // L: 116 - Class var10 = var8.getClass(); // L: 118 - class3[] var11 = class3.method47(); // L: 121 + var27.writeShort(var17); // L: 128 + Object var8 = var16.getValue(); // L: 129 + Class var10 = var8.getClass(); // L: 131 + class3[] var11 = class3.method43(); // L: 134 int var12 = 0; class3 var9; while (true) { if (var12 >= var11.length) { - var9 = null; // L: 132 + var9 = null; // L: 145 break; } - class3 var13 = var11[var12]; // L: 123 - if (var10 == var13.field17) { // L: 125 - var9 = var13; // L: 126 - break; // L: 127 + class3 var13 = var11[var12]; // L: 136 + if (var10 == var13.field13) { // L: 138 + var9 = var13; // L: 139 + break; // L: 140 } - ++var12; // L: 122 + ++var12; // L: 135 } - var27.writeByte(var9.field16); // L: 135 - class3.method43(var8, var27); // L: 136 + var27.writeByte(var9.field12); // L: 148 + class3.method57(var8, var27); // L: 149 } - } catch (Exception var25) { // L: 142 + } catch (Exception var25) { // L: 155 } finally { try { - var1.close(); // L: 145 - } catch (Exception var24) { // L: 147 + var1.close(); // L: 158 + } catch (Exception var24) { // L: 160 } } - this.unwrittenChanges = false; // L: 149 - this.field1295 = PacketWriter.currentTimeMillis(); // L: 150 - } // L: 151 + this.unwrittenChanges = false; // L: 162 + this.field1298 = User.currentTimeMillis(); // L: 163 + } // L: 164 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" + descriptor = "(I)V", + garbageValue = "-236281402" ) + @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 154 + AccessFile var1 = this.getPreferencesFile(false); // L: 167 - label223: { + label224: { try { - byte[] var2 = new byte[(int)var1.length()]; // L: 156 + byte[] var2 = new byte[(int)var1.length()]; // L: 169 int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 157 158 161 - var4 = var1.read(var2, var3, var2.length - var3); // L: 159 - if (var4 == -1) { // L: 160 + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 170 171 174 + var4 = var1.read(var2, var3, var2.length - var3); // L: 172 + if (var4 == -1) { // L: 173 throw new EOFException(); } } - Buffer var14 = new Buffer(var2); // L: 163 - if (var14.array.length - var14.offset < 1) { // L: 164 + Buffer var14 = new Buffer(var2); // L: 176 + if (var14.array.length - var14.offset < 1) { // L: 177 return; } - int var15 = var14.readUnsignedByte(); // L: 165 - if (var15 >= 0 && var15 <= 2) { // L: 166 + int var15 = var14.readUnsignedByte(); // L: 178 + if (var15 >= 0 && var15 <= 2) { // L: 179 int var7; int var8; int var9; int var16; - if (var15 >= 2) { // L: 167 - var16 = var14.readUnsignedShort(); // L: 168 + if (var15 >= 2) { // L: 180 + var16 = var14.readUnsignedShort(); // L: 181 var7 = 0; while (true) { if (var7 >= var16) { - break label223; + break label224; } - var8 = var14.readUnsignedShort(); // L: 170 - var9 = var14.readUnsignedByte(); // L: 171 - class3 var10 = (class3)TextureProvider.findEnumerated(class3.method47(), var9); // L: 172 - Object var11 = var10.method46(var14); // L: 173 - if (this.intsPersistence[var8]) { // L: 174 - this.map.put(var8, var11); // L: 175 + var8 = var14.readUnsignedShort(); // L: 183 + var9 = var14.readUnsignedByte(); // L: 184 + class3 var10 = (class3)class195.findEnumerated(class3.method43(), var9); // L: 185 + Object var11 = var10.method47(var14); // L: 186 + if (this.intsPersistence[var8]) { // L: 187 + this.map.put(var8, var11); // L: 188 } - ++var7; // L: 169 + ++var7; // L: 182 } } else { - var16 = var14.readUnsignedShort(); // L: 180 + var16 = var14.readUnsignedShort(); // L: 193 - for (var7 = 0; var7 < var16; ++var7) { // L: 181 - var8 = var14.readUnsignedShort(); // L: 182 - var9 = var14.readInt(); // L: 183 - if (this.intsPersistence[var8]) { // L: 184 - this.map.put(var8, var9); // L: 185 + for (var7 = 0; var7 < var16; ++var7) { // L: 194 + var8 = var14.readUnsignedShort(); // L: 195 + var9 = var14.readInt(); // L: 196 + if (this.intsPersistence[var8]) { // L: 197 + this.map.put(var8, var9); // L: 198 } } - var7 = var14.readUnsignedShort(); // L: 188 + var7 = var14.readUnsignedShort(); // L: 201 var8 = 0; while (true) { if (var8 >= var7) { - break label223; + break label224; } - var14.readUnsignedShort(); // L: 190 - var14.readStringCp1252NullTerminated(); // L: 191 - ++var8; // L: 189 + var14.readUnsignedShort(); // L: 203 + var14.readStringCp1252NullTerminated(); // L: 204 + ++var8; // L: 202 } } } - } catch (Exception var25) { // L: 195 - break label223; + } catch (Exception var25) { // L: 208 + break label224; } finally { try { - var1.close(); // L: 198 + var1.close(); // L: 211 } catch (Exception var24) { } } - return; // L: 200 + return; // L: 213 } - this.unwrittenChanges = false; // L: 202 - } // L: 203 + this.unwrittenChanges = false; // L: 215 + } // L: 216 - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "89" + descriptor = "(I)V", + garbageValue = "362118254" ) + @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1295 < PacketWriter.currentTimeMillis() - 60000L) { // L: 206 - this.write(); // L: 207 + if (this.unwrittenChanges && this.field1298 < User.currentTimeMillis() - 60000L) { // L: 219 + this.write(); // L: 220 } - } // L: 209 + } // L: 222 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1436880111" + garbageValue = "-398043475" ) + @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 212 + return this.unwrittenChanges; // L: 225 } - @ObfuscatedName("z") + @ObfuscatedName("jq") @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "-1997146185" + descriptor = "(Lht;I)Z", + garbageValue = "322576420" ) - public static void method2257(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 19 - } // L: 20 + static final boolean method2313(Widget var0) { + int var1 = var0.contentType; // L: 11330 + if (var1 == 205) { // L: 11331 + Client.logoutTimer = 250; // L: 11332 + return true; // L: 11333 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 11335 + var2 = (var1 - 300) / 2; // L: 11336 + var3 = var1 & 1; // L: 11337 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11338 + } + + if (var1 >= 314 && var1 <= 323) { // L: 11340 + var2 = (var1 - 314) / 2; // L: 11341 + var3 = var1 & 1; // L: 11342 + Client.playerAppearance.method4148(var2, var3 == 1); // L: 11343 + } + + if (var1 == 324) { // L: 11345 + Client.playerAppearance.changeSex(false); + } + + if (var1 == 325) { // L: 11346 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 11347 + PacketBufferNode var4 = class4.getPacketBufferNode(ClientPacket.field2335, Client.packetWriter.isaacCipher); // L: 11349 + Client.playerAppearance.write(var4.packetBuffer); // L: 11350 + Client.packetWriter.addNode(var4); // L: 11351 + return true; // L: 11352 + } else { + return false; // L: 11354 + } + } + } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index e84ccd38f5..5c4dce41e4 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -1,28 +1,29 @@ +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("ik") +@ObfuscatedName("ig") +@Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1332454231 + intValue = 420940101 ) + @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lev;" ) + @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -955851785 + intValue = -1267423299 ) + @Export("type") public int type; static { @@ -33,11 +34,12 @@ public class VarpDefinition extends DualNode { this.type = 0; // L: 13 } // L: 15 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "1437653896" + descriptor = "(Lkb;B)V", + garbageValue = "125" ) + @Export("decode") void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); // L: 34 @@ -49,144 +51,16 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;IS)V", - garbageValue = "24454" + descriptor = "(Lkb;II)V", + garbageValue = "822246894" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 5) { // L: 41 this.type = var1.readUnsignedShort(); } } // L: 43 - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(Lbf;ZI)V", - garbageValue = "-1746985052" - ) - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4260 - var0.isUnanimated = false; // L: 4261 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4262 4263 - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; // L: 4265 - int var3 = var0.y >> 7; // L: 4266 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4267 - long var4 = class227.calculateTag(0, 0, 0, false, var0.index); // L: 4268 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4269 - var0.isUnanimated = false; // L: 4270 - var0.tileHeight = ArchiveLoader.getTileHeight(var0.x, var0.y, Huffman.Client_plane); // L: 4271 - var0.playerCycle = Client.cycle; // L: 4272 - ScriptEvent.scene.addNullableObject(Huffman.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field649, var0.field635, var0.field651, var0.field643); // L: 4273 - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4276 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4277 - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4278 - } - - var0.tileHeight = ArchiveLoader.getTileHeight(var0.x, var0.y, Huffman.Client_plane); // L: 4280 - var0.playerCycle = Client.cycle; // L: 4281 - ScriptEvent.scene.drawEntity(Huffman.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4282 - } - } - } - - } // L: 4286 - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(Lbf;IIII)V", - garbageValue = "-1811983965" - ) - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (WorldMapLabelSize.localPlayer != var0) { // L: 8564 - if (Client.menuOptionsCount < 400) { // L: 8565 - String var4; - int var7; - if (var0.skillLevel == 0) { // L: 8567 - String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 8568 - var7 = var0.combatLevel; // L: 8570 - int var8 = WorldMapLabelSize.localPlayer.combatLevel; // L: 8571 - int var9 = var8 - var7; // L: 8573 - String var6; - if (var9 < -9) { // L: 8574 - var6 = WorldMapAreaData.colorStartTag(16711680); // L: 8575 - } else if (var9 < -6) { // L: 8578 - var6 = WorldMapAreaData.colorStartTag(16723968); // L: 8579 - } else if (var9 < -3) { // L: 8582 - var6 = WorldMapAreaData.colorStartTag(16740352); // L: 8583 - } else if (var9 < 0) { // L: 8586 - var6 = WorldMapAreaData.colorStartTag(16756736); // L: 8587 - } else if (var9 > 9) { // L: 8590 - var6 = WorldMapAreaData.colorStartTag(65280); // L: 8591 - } else if (var9 > 6) { // L: 8594 - var6 = WorldMapAreaData.colorStartTag(4259584); // L: 8595 - } else if (var9 > 3) { // L: 8598 - var6 = WorldMapAreaData.colorStartTag(8453888); // L: 8599 - } else if (var9 > 0) { // L: 8602 - var6 = WorldMapAreaData.colorStartTag(12648192); // L: 8603 - } else { - var6 = WorldMapAreaData.colorStartTag(16776960); // L: 8606 - } - - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 8608 - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 8610 - } - - int var10; - if (Client.isItemSelected == 1) { // L: 8611 - StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 8612 - } else if (Client.isSpellSelected) { // L: 8615 - if ((UserComparator8.selectedSpellFlags & 8) == 8) { // L: 8616 - StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 8617 - } - } else { - for (var10 = 7; var10 >= 0; --var10) { // L: 8622 - if (Client.playerMenuActions[var10] != null) { // L: 8623 - short var11 = 0; // L: 8624 - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 8625 - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { // L: 8626 - continue; - } - - if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > WorldMapLabelSize.localPlayer.combatLevel) { // L: 8627 - var11 = 2000; // L: 8628 - } - - if (WorldMapLabelSize.localPlayer.team != 0 && var0.team != 0) { // L: 8630 - if (var0.team == WorldMapLabelSize.localPlayer.team) { // L: 8631 - var11 = 2000; - } else { - var11 = 0; // L: 8632 - } - } - } else if (Client.playerOptionsPriorities[var10]) { // L: 8635 - var11 = 2000; - } - - boolean var12 = false; // L: 8636 - var7 = Client.playerMenuOpcodes[var10] + var11; // L: 8637 - StructDefinition.insertMenuItemNoShift(Client.playerMenuActions[var10], WorldMapAreaData.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 8638 - } - } - } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 8643 - if (Client.menuOpcodes[var10] == 23) { // L: 8644 - Client.menuTargets[var10] = WorldMapAreaData.colorStartTag(16777215) + var4; // L: 8645 - break; - } - } - - } - } - } // L: 8649 } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index f562ef7146..d3bb145c0c 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,203 +1,91 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("hs") +@Implements("Varps") public class Varps { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1581164719 - ) - static int Interpreter_stringStackSize; static { Varps_masks = new int[32]; // L: 6 - int var0 = 2; // L: 9 + int var0 = 2; - for (int var1 = 0; var1 < 32; ++var1) { // L: 10 - Varps_masks[var1] = var0 - 1; // L: 11 - var0 += var0; // L: 12 + for (int var1 = 0; var1 < 32; ++var1) { + Varps_masks[var1] = var0 - 1; + var0 += var0; } Varps_temp = new int[4000]; // L: 16 Varps_main = new int[4000]; // L: 17 } - @ObfuscatedName("t") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Liw;IIIBZI)V", - garbageValue = "-1882336793" + descriptor = "(Liw;Liw;Liw;Liw;I)V", + garbageValue = "-990913751" ) - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 271 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 272 - if (var8 == null) { // L: 273 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 274 - if (var8 == null) { // L: 275 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 276 - if (var8 != null) { // L: 277 - if (var5) { // L: 278 - var8.removeDual(); // L: 279 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 280 - --NetCache.NetCache_pendingWritesCount; // L: 281 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 282 - } + public static void method4126(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + Decimator.Widget_archive = var0; // L: 186 + GameBuild.Widget_modelsArchive = var1; // L: 187 + Widget.Widget_spritesArchive = var2; // L: 188 + Widget.Widget_fontsArchive = var3; // L: 189 + Widget.Widget_interfaceComponents = new Widget[Decimator.Widget_archive.getGroupCount()][]; // L: 190 + Widget.Widget_loadedInterfaces = new boolean[Decimator.Widget_archive.getGroupCount()]; // L: 191 + } // L: 192 - } else { - if (!var5) { // L: 286 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 287 - if (var8 != null) { // L: 288 - return; - } - } - - var8 = new NetFileRequest(); // L: 290 - var8.archive = var0; // L: 291 - var8.crc = var3; // L: 292 - var8.padding = var4; // L: 293 - if (var5) { // L: 294 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 295 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 296 - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 299 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 300 - ++NetCache.NetCache_pendingWritesCount; // L: 301 - } - - } - } + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1995457762" + ) + public static int method4122(int var0, int var1, int var2) { + var2 &= 3; // L: 9 + if (var2 == 0) { // L: 10 + return var0; + } else if (var2 == 1) { // L: 11 + return var1; + } else { + return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 } - } // L: 284 303 + } - @ObfuscatedName("w") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1116846800" + descriptor = "(Lbi;III)V", + garbageValue = "-843887273" ) - public static void method4066() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 157 - } // L: 158 - - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "0" - ) - static final void method4067(int var0, int var1, boolean var2) { - if (!var2 || var0 != class52.field396 || SpotAnimationDefinition.field3261 != var1) { // L: 5077 - class52.field396 = var0; // L: 5080 - SpotAnimationDefinition.field3261 = var1; // L: 5081 - CollisionMap.updateGameState(25); // L: 5082 - Actor.drawLoadingMessage("Loading - please wait.", true); // L: 5083 - int var3 = WorldMapManager.baseX; // L: 5084 - int var4 = WorldMapLabel.baseY; // L: 5085 - WorldMapManager.baseX = (var0 - 6) * 8; // L: 5086 - WorldMapLabel.baseY = (var1 - 6) * 8; // L: 5087 - int var5 = WorldMapManager.baseX - var3; // L: 5088 - int var6 = WorldMapLabel.baseY - var4; // L: 5089 - var3 = WorldMapManager.baseX; // L: 5090 - var4 = WorldMapLabel.baseY; // L: 5091 - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 5092 - NPC var19 = Client.npcs[var7]; // L: 5093 - if (var19 != null) { // L: 5094 - for (var9 = 0; var9 < 10; ++var9) { // L: 5095 - var10000 = var19.pathX; // L: 5096 - var10000[var9] -= var5; - var10000 = var19.pathY; // L: 5097 - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; // L: 5099 - var19.y -= var6 * 128; // L: 5100 - } + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 4177 + int var3 = class105.SequenceDefinition_get(var1).field3551; // L: 4178 + if (var3 == 1) { // L: 4179 + var0.sequenceFrame = 0; // L: 4180 + var0.sequenceFrameCycle = 0; // L: 4181 + var0.sequenceDelay = var2; // L: 4182 + var0.field1022 = 0; // L: 4183 } - for (var7 = 0; var7 < 2048; ++var7) { // L: 5103 - Player var22 = Client.players[var7]; // L: 5104 - if (var22 != null) { // L: 5105 - for (var9 = 0; var9 < 10; ++var9) { // L: 5106 - var10000 = var22.pathX; // L: 5107 - var10000[var9] -= var5; - var10000 = var22.pathY; // L: 5108 - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; // L: 5110 - var22.y -= var6 * 128; // L: 5111 - } + if (var3 == 2) { // L: 4185 + var0.field1022 = 0; // L: 4186 } - - byte var20 = 0; // L: 5114 - byte var8 = 104; // L: 5115 - byte var21 = 1; // L: 5116 - if (var5 < 0) { // L: 5117 - var20 = 103; // L: 5118 - var8 = -1; // L: 5119 - var21 = -1; // L: 5120 - } - - byte var10 = 0; // L: 5122 - byte var11 = 104; // L: 5123 - byte var12 = 1; // L: 5124 - if (var6 < 0) { // L: 5125 - var10 = 103; // L: 5126 - var11 = -1; // L: 5127 - var12 = -1; // L: 5128 - } - - int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5130 - for (var14 = var10; var11 != var14; var14 += var12) { // L: 5131 - int var15 = var5 + var13; // L: 5132 - int var16 = var14 + var6; // L: 5133 - - for (int var17 = 0; var17 < 4; ++var17) { // L: 5134 - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5135 - } else { - Client.groundItems[var17][var13][var14] = null; // L: 5136 - } - } - } - } - - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5140 5141 5145 - var18.x -= var5; // L: 5142 - var18.y -= var6; // L: 5143 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5144 - var18.remove(); - } - } - - if (Client.destinationX != 0) { // L: 5147 - Client.destinationX -= var5; // L: 5148 - Client.destinationY -= var6; // L: 5149 - } - - Client.soundEffectCount = 0; // L: 5151 - Client.isCameraLocked = false; // L: 5152 - VertexNormal.cameraX -= var5 << 7; // L: 5153 - AbstractWorldMapData.cameraZ -= var6 << 7; // L: 5154 - GrandExchangeOfferWorldComparator.oculusOrbFocalPointX -= var5 << 7; // L: 5155 - MouseHandler.oculusOrbFocalPointY -= var6 << 7; // L: 5156 - Client.field902 = -1; // L: 5157 - Client.graphicsObjects.clear(); // L: 5158 - Client.projectiles.clear(); // L: 5159 - - for (var14 = 0; var14 < 4; ++var14) { // L: 5160 - Client.collisionMaps[var14].clear(); - } - + } else if (var1 == -1 || var0.sequence == -1 || class105.SequenceDefinition_get(var1).field3545 >= class105.SequenceDefinition_get(var0.sequence).field3545) { // L: 4189 + var0.sequence = var1; // L: 4190 + var0.sequenceFrame = 0; // L: 4191 + var0.sequenceFrameCycle = 0; // L: 4192 + var0.sequenceDelay = var2; // L: 4193 + var0.field1022 = 0; // L: 4194 + var0.field1034 = var0.pathLength; // L: 4195 } - } // L: 5078 5161 + + } // L: 4197 } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index a85ca7875f..bd22f227e0 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -1,40 +1,44 @@ +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.ScriptOpcodes; -@ObfuscatedName("eg") +@ObfuscatedName("ep") +@Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("hg") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1417653903 - ) - static int cameraX; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -213210241 - ) - int magnitude; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 525564355 + intValue = -1734980481 ) + @Export("x") int x; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1643627841 + intValue = 1170582091 ) + @Export("y") int y; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1440997727 + intValue = -1919036787 ) + @Export("z") int z; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 2072706825 + ) + @Export("magnitude") + int magnitude; VertexNormal() { } // L: 9 @ObfuscatedSignature( - descriptor = "(Leg;)V" + descriptor = "(Lep;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; // L: 12 @@ -42,4 +46,185 @@ public class VertexNormal { this.z = var1.z; // L: 14 this.magnitude = var1.magnitude; // L: 15 } // L: 16 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "84" + ) + static void method3136(Component var0) { + var0.setFocusTraversalKeysEnabled(false); // L: 150 + var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 151 + var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 152 + } // L: 153 + + @ObfuscatedName("b") + static final void method3135(long var0) { + try { + Thread.sleep(var0); // L: 20 + } catch (InterruptedException var3) { // L: 22 + } + + } // L: 23 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1764411765" + ) + public static void method3133(int var0) { + class206.musicPlayerStatus = 1; // L: 55 + class23.musicTrackArchive = null; // L: 56 + TileItem.musicTrackGroupId = -1; // L: 57 + class206.musicTrackFileId = -1; // L: 58 + class206.musicTrackVolume = 0; // L: 59 + class195.musicTrackBoolean = false; // L: 60 + MusicPatch.pcmSampleLength = var0; // L: 61 + } // L: 62 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-1937553317" + ) + static int method3134(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1723 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.cycle; // L: 1724 + return 1; // L: 1725 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1727 + MilliClock.Interpreter_intStackSize -= 2; // L: 1728 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1729 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1730 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.method183(var3, var4); // L: 1731 + return 1; // L: 1732 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1734 + MilliClock.Interpreter_intStackSize -= 2; // L: 1735 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1736 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1737 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapSection1.ItemContainer_getCount(var3, var4); // L: 1738 + return 1; // L: 1739 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1741 + MilliClock.Interpreter_intStackSize -= 2; // L: 1742 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1743 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1744 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = BuddyRankComparator.method3557(var3, var4); // L: 1745 + return 1; // L: 1746 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1748 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1749 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ScriptEvent.getInvDefinition(var3).size; // L: 1750 + return 1; // L: 1751 + } else if (var0 == ScriptOpcodes.STAT) { // L: 1753 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1754 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1755 + return 1; // L: 1756 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1758 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1759 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1760 + return 1; // L: 1761 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1763 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1764 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1765 + return 1; // L: 1766 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 1768 + var3 = GrandExchangeOfferUnitPriceComparator.Client_plane; // L: 1769 + var4 = (PlayerType.localPlayer.x >> 7) + FloorDecoration.baseX; // L: 1770 + var5 = (PlayerType.localPlayer.y >> 7) + WorldMapData_0.baseY; // L: 1771 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1772 + return 1; // L: 1773 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 1775 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1776 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1777 + return 1; // L: 1778 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1780 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1781 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1782 + return 1; // L: 1783 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 1785 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1786 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1787 + return 1; // L: 1788 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1790 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1791 + return 1; // L: 1792 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1794 + MilliClock.Interpreter_intStackSize -= 2; // L: 1795 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] + 32768; // L: 1796 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1797 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.method183(var3, var4); // L: 1798 + return 1; // L: 1799 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1801 + MilliClock.Interpreter_intStackSize -= 2; // L: 1802 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] + 32768; // L: 1803 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1804 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapSection1.ItemContainer_getCount(var3, var4); // L: 1805 + return 1; // L: 1806 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1808 + MilliClock.Interpreter_intStackSize -= 2; // L: 1809 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] + 32768; // L: 1810 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1811 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = BuddyRankComparator.method3557(var3, var4); // L: 1812 + return 1; // L: 1813 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1815 + if (Client.staffModLevel >= 2) { // L: 1816 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1817 + } + + return 1; // L: 1818 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1820 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1821 + return 1; // L: 1822 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1824 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.worldId; // L: 1825 + return 1; // L: 1826 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1828 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1829 + return 1; // L: 1830 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1832 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.weight; // L: 1833 + return 1; // L: 1834 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1836 + if (Client.playerMod) { // L: 1837 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1838 + } + + return 1; // L: 1839 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1841 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1842 + return 1; // L: 1843 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1845 + MilliClock.Interpreter_intStackSize -= 4; // L: 1846 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 1847 + var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 1848 + var5 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 1849 + int var6 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3]; // L: 1850 + var3 += var4 << 14; // L: 1851 + var3 += var5 << 28; // L: 1852 + var3 += var6; // L: 1853 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var3; // L: 1854 + return 1; // L: 1855 + } else { + return 2; // L: 1857 + } + } + } + } + + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(Lht;B)Z", + garbageValue = "35" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 11532 + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 6364636fb3..f249a8da5d 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -1,52 +1,65 @@ +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("it") +@ObfuscatedName("ir") +@Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lir;" ) - field3221(1, 0), - @ObfuscatedName("k") + field3223(0, 0), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lir;" ) - VerticalAlignment_centered(0, 1), - @ObfuscatedName("s") + @Export("VerticalAlignment_centered") + VerticalAlignment_centered(1, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lir;" ) - field3225(2, 2); + field3226(2, 2); - @ObfuscatedName("jh") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lkq;" ) - static Widget hoveredItemContainer; - @ObfuscatedName("t") + @Export("ItemDefinition_fontPlain11") + public static Font ItemDefinition_fontPlain11; + @ObfuscatedName("fk") @ObfuscatedGetter( - intValue = -1300403611 + longValue = -2374158009127196223L ) + static long field3222; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1433173469 + ) + @Export("value") public final int value; - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -496509631 + intValue = 273023803 ) + @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; // L: 14 - this.id = var4; // L: 15 - } // L: 16 + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 19 + return this.id; // L: 23 } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index c18ae3c5a5..c4e28428fc 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -1,51 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("ep") +@ObfuscatedName("ew") +@Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("z") - static boolean ViewportMouse_isInViewport; - @ObfuscatedName("k") + @ObfuscatedName("f") + @Export("ViewportMouse_isInViewport") + public static boolean ViewportMouse_isInViewport; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1355902097 + intValue = -758081505 ) - static int ViewportMouse_x; - @ObfuscatedName("s") + @Export("ViewportMouse_x") + public static int ViewportMouse_x; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1743017163 + intValue = -1320055371 ) - static int ViewportMouse_y; - @ObfuscatedName("t") - static boolean ViewportMouse_false0; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1199867819 - ) - static int field1768; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1371000863 - ) - static int field1769; + @Export("ViewportMouse_y") + public static int ViewportMouse_y; @ObfuscatedName("m") + @Export("ViewportMouse_false0") + public static boolean ViewportMouse_false0; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1954448985 + intValue = -2115742795 ) static int field1770; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 91913629 + intValue = -167939353 + ) + static int field1768; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1914713633 ) static int field1771; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1953465913 + intValue = -1576236925 ) + static int field1772; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -904988337 + ) + @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; + @ObfuscatedName("af") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("du") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("hm") + @ObfuscatedGetter( + intValue = 1308821627 + ) + @Export("cameraYaw") + static int cameraYaw; static { ViewportMouse_isInViewport = false; // L: 4 @@ -55,76 +78,4 @@ public class ViewportMouse { ViewportMouse_entityCount = 0; // L: 17 ViewportMouse_entityTags = new long[1000]; // L: 18 } - - @ObfuscatedName("ey") - @ObfuscatedSignature( - descriptor = "(Liw;Ljava/lang/String;B)V", - garbageValue = "-71" - ) - static void method3082(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1421 - Client.archiveLoaders.add(var2); // L: 1422 - Client.field949 += var2.groupCount; // L: 1423 - } // L: 1424 - - @ObfuscatedName("ea") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "173237024" - ) - static final void logOut() { - Client.packetWriter.close(); // L: 2485 - Actor.method1805(); // L: 2486 - ScriptEvent.scene.clear(); // L: 2487 - - for (int var0 = 0; var0 < 4; ++var0) { // L: 2488 - Client.collisionMaps[var0].clear(); - } - - System.gc(); // L: 2489 - class58.method915(2); // L: 2490 - Client.currentTrackGroupId = -1; // L: 2491 - Client.field704 = false; // L: 2492 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 2494 - if (var1.stream1 != null) { // L: 2495 - Players.pcmStreamMixer.removeSubStream(var1.stream1); // L: 2496 - var1.stream1 = null; // L: 2497 - } - - if (var1.stream2 != null) { // L: 2499 - Players.pcmStreamMixer.removeSubStream(var1.stream2); // L: 2500 - var1.stream2 = null; // L: 2501 - } - } - - ObjectSound.objectSounds.clear(); // L: 2504 - CollisionMap.updateGameState(10); // L: 2506 - } // L: 2507 - - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "323383255" - ) - static void method3098(String var0) { - class200.field2403 = var0; // L: 10765 - - try { - String var1 = class2.client.getParameter(Integer.toString(18)); // L: 10767 - String var2 = class2.client.getParameter(Integer.toString(13)); // L: 10768 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 10769 - if (var0.length() == 0) { // L: 10770 - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - var3 = var3 + "; Expires=" + WorldMapSection1.method650(PacketWriter.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 10771 - } - - Client var4 = class2.client; // L: 10772 - String var5 = "document.cookie=\"" + var3 + "\""; // L: 10773 - JSObject.getWindow(var4).eval(var5); // L: 10776 - } catch (Throwable var6) { // L: 10779 - } - - } // L: 10780 } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 43c91d6a6e..104db29d3b 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -1,18 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("db") +@ObfuscatedName("dl") +@Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("dimensions") int dimensions; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("entries") int entries; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("t") - int[] field1372; - @ObfuscatedName("i") - float[][] field1369; - @ObfuscatedName("o") + @ObfuscatedName("m") + int[] field1374; + @ObfuscatedName("z") + float[][] field1375; + @ObfuscatedName("q") + @Export("keys") int[] keys; VorbisCodebook() { @@ -28,7 +35,7 @@ public class VorbisCodebook { var2 = 0; // L: 28 for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 - int var4 = VorbisSample.readBits(DevicePcmPlayerProvider.iLog(this.entries - var2)); // L: 31 + int var4 = VorbisSample.readBits(JagexCache.iLog(this.entries - var2)); // L: 31 for (var5 = 0; var5 < var4; ++var5) { // L: 32 this.lengthMap[var2++] = var3; @@ -46,7 +53,7 @@ public class VorbisCodebook { } } - this.method2430(); // L: 43 + this.method2475(); // L: 43 var2 = VorbisSample.readBits(4); // L: 44 if (var2 > 0) { // L: 45 float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 @@ -60,14 +67,14 @@ public class VorbisCodebook { var7 = this.entries * this.dimensions; // L: 52 } - this.field1372 = new int[var7]; // L: 53 + this.field1374 = new int[var7]; // L: 53 int var8; for (var8 = 0; var8 < var7; ++var8) { // L: 54 - this.field1372[var8] = VorbisSample.readBits(var5); + this.field1374[var8] = VorbisSample.readBits(var5); } - this.field1369 = new float[this.entries][this.dimensions]; // L: 55 + this.field1375 = new float[this.entries][this.dimensions]; // L: 55 float var9; int var10; int var11; @@ -78,8 +85,8 @@ public class VorbisCodebook { for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 int var12 = var8 / var10 % var7; // L: 61 - float var13 = (float)this.field1372[var12] * var16 + var15 + var9; // L: 62 - this.field1369[var8][var11] = var13; // L: 63 + float var13 = (float)this.field1374[var12] * var16 + var15 + var9; // L: 62 + this.field1375[var8][var11] = var13; // L: 63 if (var6) { // L: 64 var9 = var13; } @@ -93,8 +100,8 @@ public class VorbisCodebook { var10 = var8 * this.dimensions; // L: 72 for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 - float var17 = (float)this.field1372[var10] * var16 + var15 + var9; // L: 74 - this.field1369[var8][var11] = var17; // L: 75 + float var17 = (float)this.field1374[var10] * var16 + var15 + var9; // L: 74 + this.field1375[var8][var11] = var17; // L: 75 if (var6) { // L: 76 var9 = var17; } @@ -107,8 +114,8 @@ public class VorbisCodebook { } // L: 82 - @ObfuscatedName("k") - void method2430() { + @ObfuscatedName("b") + void method2475() { int[] var1 = new int[this.entries]; // L: 85 int[] var2 = new int[33]; // L: 87 @@ -201,8 +208,8 @@ public class VorbisCodebook { } // L: 148 - @ObfuscatedName("s") - int method2432() { + @ObfuscatedName("l") + int method2472() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 } @@ -210,15 +217,16 @@ public class VorbisCodebook { return ~this.keys[var1]; // L: 153 } - @ObfuscatedName("t") - float[] method2440() { - return this.field1369[this.method2432()]; // L: 157 + @ObfuscatedName("m") + float[] method2473() { + return this.field1375[this.method2472()]; // L: 157 } - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; Client.method1789(var2, var1) > var0; --var2) { // L: 16 17 + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class194.method3753(var2, var1) > var0; --var2) { // L: 16 17 } return var2; // L: 18 diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 3409af1c96..db1f788591 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -1,34 +1,44 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("da") +@ObfuscatedName("dm") +@Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("z") - static final int[] field1422; - @ObfuscatedName("k") + @ObfuscatedName("f") + static final int[] field1425; + @ObfuscatedName("b") + @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("m") - static int[] field1418; - @ObfuscatedName("n") - static int[] field1428; - @ObfuscatedName("d") - static boolean[] field1425; - @ObfuscatedName("s") - int[] field1420; @ObfuscatedName("t") - int multiplier; - @ObfuscatedName("i") - int[] partitionClassList; + static int[] field1429; + @ObfuscatedName("e") + static int[] field1430; @ObfuscatedName("o") + static boolean[] field1431; + @ObfuscatedName("l") + int[] field1422; + @ObfuscatedName("m") + @Export("multiplier") + int multiplier; + @ObfuscatedName("z") + @Export("partitionClassList") + int[] partitionClassList; + @ObfuscatedName("q") + @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("subclassBooks") int[][] subclassBooks; static { - field1422 = new int[]{256, 128, 86, 64}; // L: 8 + field1425 = new int[]{256, 128, 86, 64}; // L: 8 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}; // L: 9 } @@ -82,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field1420 = new int[var5]; // L: 137 - this.field1420[0] = 0; // L: 138 - this.field1420[1] = 1 << var4; // L: 139 + this.field1422 = new int[var5]; // L: 137 + this.field1422[0] = 0; // L: 138 + this.field1422[1] = 1 << var4; // L: 139 var5 = 2; // L: 140 for (var6 = 0; var6 < var2; ++var6) { // L: 141 var7 = this.partitionClassList[var6]; // L: 142 for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 - this.field1420[var5++] = VorbisSample.readBits(var4); + this.field1422[var5++] = VorbisSample.readBits(var4); } } - if (field1418 == null || field1418.length < var5) { // L: 145 - field1418 = new int[var5]; // L: 146 - field1428 = new int[var5]; // L: 147 - field1425 = new boolean[var5]; // L: 148 + if (field1429 == null || field1429.length < var5) { // L: 145 + field1429 = new int[var5]; // L: 146 + field1430 = new int[var5]; // L: 147 + field1431 = new boolean[var5]; // L: 148 } } } // L: 150 - @ObfuscatedName("s") - int method2504(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("l") + int method2556(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; // L: 50 int var7 = var3 - var1; // L: 51 int var8 = var6 < 0 ? -var6 : var6; // L: 52 @@ -114,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("t") - void method2496(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("m") + void method2534(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; // L: 59 int var8 = var3 - var1; // L: 60 int var9 = var7 < 0 ? -var7 : var7; // L: 61 @@ -143,52 +153,54 @@ public class VorbisFloor { } // L: 80 - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { // L: 83 int var3 = var1; // L: 84 - int var4 = field1418[var1]; // L: 85 - int var5 = field1428[var1]; // L: 86 - boolean var6 = field1425[var1]; // L: 87 + int var4 = field1429[var1]; // L: 85 + int var5 = field1430[var1]; // L: 86 + boolean var6 = field1431[var1]; // L: 87 for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field1418[var7]; // L: 89 + int var8 = field1429[var7]; // L: 89 if (var8 < var4) { // L: 90 - field1418[var3] = var8; // L: 91 - field1428[var3] = field1428[var7]; // L: 92 - field1425[var3] = field1425[var7]; // L: 93 + field1429[var3] = var8; // L: 91 + field1430[var3] = field1430[var7]; // L: 92 + field1431[var3] = field1431[var7]; // L: 93 ++var3; // L: 94 - field1418[var7] = field1418[var3]; // L: 95 - field1428[var7] = field1428[var3]; // L: 96 - field1425[var7] = field1425[var3]; // L: 97 + field1429[var7] = field1429[var3]; // L: 95 + field1430[var7] = field1430[var3]; // L: 96 + field1431[var7] = field1431[var3]; // L: 97 } } - field1418[var3] = var4; // L: 100 - field1428[var3] = var5; // L: 101 - field1425[var3] = var6; // L: 102 + field1429[var3] = var4; // L: 100 + field1430[var3] = var5; // L: 101 + field1431[var3] = var6; // L: 102 this.VarbisFloor_sort(var1, var3 - 1); // L: 103 this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } } // L: 105 - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; // L: 153 if (!var1) { // L: 154 return false; } else { - int var2 = this.field1420.length; // L: 155 + int var2 = this.field1422.length; // L: 155 int var3; for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field1418[var3] = this.field1420[var3]; + field1429[var3] = this.field1422[var3]; } - var3 = field1422[this.multiplier - 1]; // L: 157 - int var4 = DevicePcmPlayerProvider.iLog(var3 - 1); // L: 158 - field1428[0] = VorbisSample.readBits(var4); // L: 159 - field1428[1] = VorbisSample.readBits(var4); // L: 160 + var3 = field1425[this.multiplier - 1]; // L: 157 + int var4 = JagexCache.iLog(var3 - 1); // L: 158 + field1430[0] = VorbisSample.readBits(var4); // L: 159 + field1430[1] = VorbisSample.readBits(var4); // L: 160 int var5 = 2; // L: 161 for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 @@ -198,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; // L: 166 int var11 = 0; // L: 167 if (var9 > 0) { // L: 168 - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2432(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2472(); } for (int var12 = 0; var12 < var8; ++var12) { // L: 169 int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 var11 >>>= var9; // L: 171 - field1428[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2432() : 0; // L: 172 + field1430[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2472() : 0; // L: 172 } } @@ -212,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("x") - void method2501(float[] var1, int var2) { - int var3 = this.field1420.length; // L: 179 - int var4 = field1422[this.multiplier - 1]; // L: 180 - boolean[] var5 = field1425; // L: 181 - field1425[1] = true; // L: 182 + @ObfuscatedName("k") + void method2537(float[] var1, int var2) { + int var3 = this.field1422.length; // L: 179 + int var4 = field1425[this.multiplier - 1]; // L: 180 + boolean[] var5 = field1431; // L: 181 + field1431[1] = true; // L: 182 var5[0] = true; // L: 183 int var6; @@ -226,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method2506(field1418, var6); // L: 185 - var8 = method2495(field1418, var6); // L: 186 - var9 = this.method2504(field1418[var7], field1428[var7], field1418[var8], field1428[var8], field1418[var6]); // L: 187 - var10 = field1428[var6]; // L: 188 + var7 = method2549(field1429, var6); // L: 185 + var8 = method2532(field1429, var6); // L: 186 + var9 = this.method2556(field1429[var7], field1430[var7], field1429[var8], field1430[var8], field1429[var6]); // L: 187 + var10 = field1430[var6]; // L: 188 int var11 = var4 - var9; // L: 189 int var13 = (var11 < var9 ? var11 : var9) << 1; // L: 191 if (var10 != 0) { // L: 192 - boolean[] var14 = field1425; // L: 193 - field1425[var8] = true; // L: 195 + boolean[] var14 = field1431; // L: 193 + field1431[var8] = true; // L: 195 var14[var7] = true; // L: 196 - field1425[var6] = true; // L: 197 + field1431[var6] = true; // L: 197 if (var10 >= var13) { // L: 198 - field1428[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + field1430[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field1428[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field1430[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field1425[var6] = false; // L: 206 - field1428[var6] = var9; // L: 207 + field1431[var6] = false; // L: 206 + field1430[var6] = var9; // L: 207 } } this.VarbisFloor_sort(0, var3 - 1); // L: 210 var6 = 0; // L: 211 - var7 = field1428[0] * this.multiplier; // L: 212 + var7 = field1430[0] * this.multiplier; // L: 212 for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field1425[var8]) { // L: 214 - var9 = field1418[var8]; // L: 215 - var10 = field1428[var8] * this.multiplier; // L: 216 - this.method2496(var6, var7, var9, var10, var1, var2); // L: 217 + if (field1431[var8]) { // L: 214 + var9 = field1429[var8]; // L: 215 + var10 = field1430[var8] * this.multiplier; // L: 216 + this.method2534(var6, var7, var9, var10, var1, var2); // L: 217 if (var9 >= var2) { // L: 218 return; } @@ -274,8 +286,8 @@ public class VorbisFloor { } // L: 225 - @ObfuscatedName("z") - static int method2506(int[] var0, int var1) { + @ObfuscatedName("f") + static int method2549(int[] var0, int var1) { int var2 = var0[var1]; // L: 22 int var3 = -1; // L: 23 int var4 = Integer.MIN_VALUE; // L: 24 @@ -291,8 +303,8 @@ public class VorbisFloor { return var3; // L: 32 } - @ObfuscatedName("k") - static int method2495(int[] var0, int var1) { + @ObfuscatedName("b") + static int method2532(int[] var0, int var1) { int var2 = var0[var1]; // L: 36 int var3 = -1; // L: 37 int var4 = Integer.MAX_VALUE; // L: 38 diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index de3bd97e29..1e0b074235 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -1,14 +1,21 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dn") +@ObfuscatedName("di") +@Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("submaps") int submaps; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("mappingMux") int mappingMux; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("submapResidue") int[] submapResidue; VorbisMapping() { diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 4516857382..7259a6e937 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -1,20 +1,30 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("do") +@ObfuscatedName("dj") +@Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("residueType") int residueType; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("begin") int begin; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("end") int end; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("partitionSize") int partitionSize; - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("classifications") int classifications; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("classbook") int classbook; - @ObfuscatedName("x") + @ObfuscatedName("k") + @Export("cascade") int[] cascade; VorbisResidue() { @@ -46,8 +56,8 @@ public class VorbisResidue { } // L: 31 - @ObfuscatedName("z") - void method2616(float[] var1, int var2, boolean var3) { + @ObfuscatedName("f") + void method2656(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; @@ -66,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2432(); // L: 45 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2472(); // L: 45 for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 if (var9 + var11 < var6) { // L: 47 @@ -88,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; // L: 60 for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method2440(); // L: 62 + float[] var20 = var14.method2473(); // L: 62 for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -98,7 +108,7 @@ public class VorbisResidue { var15 = 0; // L: 67 while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method2440(); // L: 69 + float[] var16 = var14.method2473(); // L: 69 for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 var1[var13 + var15] += var16[var17]; // L: 71 diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index 607c4a2cba..859c6237f4 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -1,98 +1,118 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("dp") +@Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("x") - static byte[] VorbisSample_bytes; - @ObfuscatedName("w") - static int VorbisSample_byteOffset; - @ObfuscatedName("g") - static int VorbisSample_bitOffset; - @ObfuscatedName("m") - static int VorbisSample_blockSize0; - @ObfuscatedName("n") - static int VorbisSample_blockSize1; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "[Ldb;" - ) - static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "[Lda;" - ) - static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "[Ldo;" - ) - static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "[Ldn;" - ) - static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("c") - static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("f") - static int[] VorbisSample_mapping; - @ObfuscatedName("y") - static boolean field1410; - @ObfuscatedName("p") - static float[] field1401; - @ObfuscatedName("b") - static float[] field1405; - @ObfuscatedName("l") - static float[] field1403; - @ObfuscatedName("e") - static float[] field1384; - @ObfuscatedName("ab") - static float[] field1392; - @ObfuscatedName("ag") - static float[] field1406; - @ObfuscatedName("ao") - static float[] field1407; - @ObfuscatedName("ae") - static int[] field1408; - @ObfuscatedName("an") - static int[] field1409; - @ObfuscatedName("z") - byte[][] field1397; @ObfuscatedName("k") - int sampleRate; - @ObfuscatedName("s") - int sampleCount; - @ObfuscatedName("t") - int start; - @ObfuscatedName("i") - int end; - @ObfuscatedName("o") - boolean field1395; - @ObfuscatedName("v") - float[] field1390; - @ObfuscatedName("j") - int field1394; - @ObfuscatedName("r") - int field1399; + @Export("VorbisSample_bytes") + static byte[] VorbisSample_bytes; + @ObfuscatedName("c") + @Export("VorbisSample_byteOffset") + static int VorbisSample_byteOffset; @ObfuscatedName("u") - boolean field1400; - @ObfuscatedName("am") + @Export("VorbisSample_bitOffset") + static int VorbisSample_bitOffset; + @ObfuscatedName("t") + @Export("VorbisSample_blockSize0") + static int VorbisSample_blockSize0; + @ObfuscatedName("e") + @Export("VorbisSample_blockSize1") + static int VorbisSample_blockSize1; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "[Ldl;" + ) + @Export("VorbisSample_codebooks") + static VorbisCodebook[] VorbisSample_codebooks; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "[Ldm;" + ) + @Export("VorbisSample_floors") + static VorbisFloor[] VorbisSample_floors; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "[Ldj;" + ) + @Export("VorbisSample_residues") + static VorbisResidue[] VorbisSample_residues; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "[Ldi;" + ) + @Export("VorbisSample_mappings") + static VorbisMapping[] VorbisSample_mappings; + @ObfuscatedName("r") + @Export("VorbisSample_blockFlags") + static boolean[] VorbisSample_blockFlags; + @ObfuscatedName("y") + @Export("VorbisSample_mapping") + static int[] VorbisSample_mapping; + @ObfuscatedName("s") + static boolean field1389; + @ObfuscatedName("a") + static float[] field1391; + @ObfuscatedName("g") + static float[] field1399; + @ObfuscatedName("h") + static float[] field1405; + @ObfuscatedName("i") + static float[] field1403; + @ObfuscatedName("ab") + static float[] field1407; + @ObfuscatedName("ac") + static float[] field1412; + @ObfuscatedName("ao") + static float[] field1409; + @ObfuscatedName("af") + static int[] field1381; + @ObfuscatedName("av") + static int[] field1411; + @ObfuscatedName("f") + byte[][] field1397; + @ObfuscatedName("b") + @Export("sampleRate") + int sampleRate; + @ObfuscatedName("l") + @Export("sampleCount") + int sampleCount; + @ObfuscatedName("m") + @Export("start") + int start; + @ObfuscatedName("z") + @Export("end") + int end; + @ObfuscatedName("q") + boolean field1386; + @ObfuscatedName("j") + float[] field1410; + @ObfuscatedName("w") + int field1400; + @ObfuscatedName("v") + int field1401; + @ObfuscatedName("d") + boolean field1402; + @ObfuscatedName("ar") + @Export("samples") byte[] samples; - @ObfuscatedName("ap") - int field1383; - @ObfuscatedName("au") - int field1412; + @ObfuscatedName("ay") + int field1398; + @ObfuscatedName("ah") + int field1414; static { - field1410 = false; // L: 28 + field1389 = false; // L: 28 } VorbisSample(byte[] var1) { - this.read(var1); // L: 401 - } // L: 402 + this.read(var1); // L: 417 + } // L: 418 - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 this.sampleRate = var2.readInt(); // L: 90 @@ -101,7 +121,7 @@ public class VorbisSample extends Node { this.end = var2.readInt(); // L: 93 if (this.end < 0) { // L: 94 this.end = ~this.end; // L: 95 - this.field1395 = true; // L: 96 + this.field1386 = true; // L: 96 } int var3 = var2.readInt(); // L: 98 @@ -123,314 +143,316 @@ public class VorbisSample extends Node { } // L: 111 - @ObfuscatedName("x") - float[] method2467(int var1) { - VorbisSample_setData(this.field1397[var1], 0); // L: 182 - readBit(); // L: 183 - int var2 = readBits(DevicePcmPlayerProvider.iLog(VorbisSample_mapping.length - 1)); // L: 184 - boolean var3 = VorbisSample_blockFlags[var2]; // L: 185 - int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186 - boolean var5 = false; // L: 187 - boolean var6 = false; // L: 188 - if (var3) { // L: 189 - var5 = readBit() != 0; // L: 190 - var6 = readBit() != 0; // L: 191 + @ObfuscatedName("k") + float[] method2504(int var1) { + VorbisSample_setData(this.field1397[var1], 0); // L: 198 + readBit(); // L: 199 + int var2 = readBits(JagexCache.iLog(VorbisSample_mapping.length - 1)); // L: 200 + boolean var3 = VorbisSample_blockFlags[var2]; // L: 201 + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202 + boolean var5 = false; // L: 203 + boolean var6 = false; // L: 204 + if (var3) { // L: 205 + var5 = readBit() != 0; // L: 206 + var6 = readBit() != 0; // L: 207 } - int var7 = var4 >> 1; // L: 193 + int var7 = var4 >> 1; // L: 209 int var8; int var9; int var10; - if (var3 && !var5) { // L: 197 - var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198 - var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199 - var10 = VorbisSample_blockSize0 >> 1; // L: 200 + if (var3 && !var5) { // L: 213 + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214 + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215 + var10 = VorbisSample_blockSize0 >> 1; // L: 216 } else { - var8 = 0; // L: 203 - var9 = var7; // L: 204 - var10 = var4 >> 1; // L: 205 + var8 = 0; // L: 219 + var9 = var7; // L: 220 + var10 = var4 >> 1; // L: 221 } int var11; int var12; int var13; - if (var3 && !var6) { // L: 210 - var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211 - var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212 - var13 = VorbisSample_blockSize0 >> 1; // L: 213 + if (var3 && !var6) { // L: 226 + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227 + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228 + var13 = VorbisSample_blockSize0 >> 1; // L: 229 } else { - var11 = var7; // L: 216 - var12 = var4; // L: 217 - var13 = var4 >> 1; // L: 218 + var11 = var7; // L: 232 + var12 = var4; // L: 233 + var13 = var4 >> 1; // L: 234 } - VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220 - int var16 = var14.mappingMux; // L: 223 - int var17 = var14.submapFloor[var16]; // L: 224 - boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225 - boolean var45 = var15; // L: 227 + VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236 + int var16 = var14.mappingMux; // L: 239 + int var17 = var14.submapFloor[var16]; // L: 240 + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241 + boolean var45 = var15; // L: 243 - for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228 - VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229 - float[] var44 = field1401; // L: 230 - var42.method2616(var44, var4 >> 1, var45); // L: 231 + for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 + float[] var44 = field1391; // L: 246 + var42.method2656(var44, var4 >> 1, var45); // L: 247 } int var18; - if (!var15) { // L: 234 - var17 = var14.mappingMux; // L: 235 - var18 = var14.submapFloor[var17]; // L: 236 - VorbisSample_floors[var18].method2501(field1401, var4 >> 1); // L: 237 + if (!var15) { // L: 250 + var17 = var14.mappingMux; // L: 251 + var18 = var14.submapFloor[var17]; // L: 252 + VorbisSample_floors[var18].method2537(field1391, var4 >> 1); // L: 253 } int var19; - if (var15) { // L: 240 - for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 - field1401[var17] = 0.0F; + if (var15) { // L: 256 + for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 + field1391[var17] = 0.0F; } } else { - var17 = var4 >> 1; // L: 244 - var18 = var4 >> 2; // L: 245 - var19 = var4 >> 3; // L: 246 - float[] var20 = field1401; // L: 247 + var17 = var4 >> 1; // L: 260 + var18 = var4 >> 2; // L: 261 + var19 = var4 >> 3; // L: 262 + float[] var20 = field1391; // L: 263 int var21; - for (var21 = 0; var21 < var17; ++var21) { // L: 248 + for (var21 = 0; var21 < var17; ++var21) { // L: 264 var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { // L: 249 + for (var21 = var17; var21 < var4; ++var21) { // L: 265 var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field1392 : field1405; // L: 250 - float[] var22 = var3 ? field1406 : field1403; // L: 251 - float[] var23 = var3 ? field1407 : field1384; // L: 252 - int[] var24 = var3 ? field1409 : field1408; // L: 253 + float[] var40 = var3 ? field1407 : field1399; // L: 266 + float[] var22 = var3 ? field1412 : field1405; // L: 267 + float[] var23 = var3 ? field1409 : field1403; // L: 268 + int[] var24 = var3 ? field1411 : field1381; // L: 269 int var25; float var26; float var27; float var28; float var29; - for (var25 = 0; var25 < var18; ++var25) { // L: 254 - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255 - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256 - var28 = var40[var25 * 2]; // L: 257 - var29 = var40[var25 * 2 + 1]; // L: 258 - var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259 - var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260 + for (var25 = 0; var25 < var18; ++var25) { // L: 270 + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271 + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272 + var28 = var40[var25 * 2]; // L: 273 + var29 = var40[var25 * 2 + 1]; // L: 274 + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275 + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276 } float var30; float var31; - for (var25 = 0; var25 < var19; ++var25) { // L: 262 - var26 = var20[var17 + var25 * 4 + 3]; // L: 263 - var27 = var20[var17 + var25 * 4 + 1]; // L: 264 - var28 = var20[var25 * 4 + 3]; // L: 265 - var29 = var20[var25 * 4 + 1]; // L: 266 - var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267 - var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268 - var30 = var40[var17 - 4 - var25 * 4]; // L: 269 - var31 = var40[var17 - 3 - var25 * 4]; // L: 270 - var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271 - var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272 + for (var25 = 0; var25 < var19; ++var25) { // L: 278 + var26 = var20[var17 + var25 * 4 + 3]; // L: 279 + var27 = var20[var17 + var25 * 4 + 1]; // L: 280 + var28 = var20[var25 * 4 + 3]; // L: 281 + var29 = var20[var25 * 4 + 1]; // L: 282 + var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283 + var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284 + var30 = var40[var17 - 4 - var25 * 4]; // L: 285 + var31 = var40[var17 - 3 - var25 * 4]; // L: 286 + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287 + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288 } - var25 = DevicePcmPlayerProvider.iLog(var4 - 1); // L: 274 + var25 = JagexCache.iLog(var4 - 1); // L: 290 int var46; int var47; int var48; int var49; - for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275 - var47 = var4 >> var46 + 2; // L: 276 - var48 = 8 << var46; // L: 277 + for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291 + var47 = var4 >> var46 + 2; // L: 292 + var48 = 8 << var46; // L: 293 - for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278 - int var50 = var4 - var47 * var49 * 2; // L: 279 - int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280 + for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294 + int var50 = var4 - var47 * var49 * 2; // L: 295 + int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296 - for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281 - int var33 = var32 * 4; // L: 282 - float var34 = var20[var50 - 1 - var33]; // L: 283 - float var35 = var20[var50 - 3 - var33]; // L: 284 - float var36 = var20[var51 - 1 - var33]; // L: 285 - float var37 = var20[var51 - 3 - var33]; // L: 286 - var20[var50 - 1 - var33] = var34 + var36; // L: 287 - var20[var50 - 3 - var33] = var35 + var37; // L: 288 - float var38 = var40[var32 * var48]; // L: 289 - float var39 = var40[var32 * var48 + 1]; // L: 290 - var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291 - var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292 + for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297 + int var33 = var32 * 4; // L: 298 + float var34 = var20[var50 - 1 - var33]; // L: 299 + float var35 = var20[var50 - 3 - var33]; // L: 300 + float var36 = var20[var51 - 1 - var33]; // L: 301 + float var37 = var20[var51 - 3 - var33]; // L: 302 + var20[var50 - 1 - var33] = var34 + var36; // L: 303 + var20[var50 - 3 - var33] = var35 + var37; // L: 304 + float var38 = var40[var32 * var48]; // L: 305 + float var39 = var40[var32 * var48 + 1]; // L: 306 + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307 + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308 } } } - for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296 - var47 = var24[var46]; // L: 297 - if (var46 < var47) { // L: 298 - var48 = var46 * 8; // L: 299 - var49 = var47 * 8; // L: 300 - var30 = var20[var48 + 1]; // L: 302 - var20[var48 + 1] = var20[var49 + 1]; // L: 303 - var20[var49 + 1] = var30; // L: 304 - var30 = var20[var48 + 3]; // L: 305 - var20[var48 + 3] = var20[var49 + 3]; // L: 306 - var20[var49 + 3] = var30; // L: 307 - var30 = var20[var48 + 5]; // L: 308 - var20[var48 + 5] = var20[var49 + 5]; // L: 309 - var20[var49 + 5] = var30; // L: 310 - var30 = var20[var48 + 7]; // L: 311 - var20[var48 + 7] = var20[var49 + 7]; // L: 312 - var20[var49 + 7] = var30; // L: 313 + for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 312 + var47 = var24[var46]; // L: 313 + if (var46 < var47) { // L: 314 + var48 = var46 * 8; // L: 315 + var49 = var47 * 8; // L: 316 + var30 = var20[var48 + 1]; // L: 318 + var20[var48 + 1] = var20[var49 + 1]; // L: 319 + var20[var49 + 1] = var30; // L: 320 + var30 = var20[var48 + 3]; // L: 321 + var20[var48 + 3] = var20[var49 + 3]; // L: 322 + var20[var49 + 3] = var30; // L: 323 + var30 = var20[var48 + 5]; // L: 324 + var20[var48 + 5] = var20[var49 + 5]; // L: 325 + var20[var49 + 5] = var30; // L: 326 + var30 = var20[var48 + 7]; // L: 327 + var20[var48 + 7] = var20[var49 + 7]; // L: 328 + var20[var49 + 7] = var30; // L: 329 } } - for (var46 = 0; var46 < var17; ++var46) { // L: 316 + for (var46 = 0; var46 < var17; ++var46) { // L: 332 var20[var46] = var20[var46 * 2 + 1]; } - for (var46 = 0; var46 < var19; ++var46) { // L: 317 - var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318 - var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319 - var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320 - var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321 + for (var46 = 0; var46 < var19; ++var46) { // L: 333 + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334 + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335 + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336 + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337 } - for (var46 = 0; var46 < var19; ++var46) { // L: 323 - var27 = var23[var46 * 2]; // L: 324 - var28 = var23[var46 * 2 + 1]; // L: 325 - var29 = var20[var17 + var46 * 2]; // L: 326 - var30 = var20[var17 + var46 * 2 + 1]; // L: 327 - var31 = var20[var4 - 2 - var46 * 2]; // L: 328 - float var52 = var20[var4 - 1 - var46 * 2]; // L: 329 - float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330 - var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331 - var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332 - var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333 - var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334 - var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335 + for (var46 = 0; var46 < var19; ++var46) { // L: 339 + var27 = var23[var46 * 2]; // L: 340 + var28 = var23[var46 * 2 + 1]; // L: 341 + var29 = var20[var17 + var46 * 2]; // L: 342 + var30 = var20[var17 + var46 * 2 + 1]; // L: 343 + var31 = var20[var4 - 2 - var46 * 2]; // L: 344 + float var52 = var20[var4 - 1 - var46 * 2]; // L: 345 + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346 + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347 + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348 + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349 + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350 + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351 } - for (var46 = 0; var46 < var18; ++var46) { // L: 337 - var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338 - var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339 + for (var46 = 0; var46 < var18; ++var46) { // L: 353 + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354 + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355 } - for (var46 = 0; var46 < var18; ++var46) { // L: 341 + for (var46 = 0; var46 < var18; ++var46) { // L: 357 var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 342 + for (var46 = 0; var46 < var18; ++var46) { // L: 358 var20[var46] = var20[var18 + var46]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 343 + for (var46 = 0; var46 < var18; ++var46) { // L: 359 var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var46 = 0; var46 < var18; ++var46) { // L: 344 + for (var46 = 0; var46 < var18; ++var46) { // L: 360 var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - for (var46 = var8; var46 < var9; ++var46) { // L: 345 - var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 346 - var10000 = field1401; // L: 347 + for (var46 = var8; var46 < var9; ++var46) { // L: 361 + var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362 + var10000 = field1391; // L: 363 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var46 = var11; var46 < var12; ++var46) { // L: 349 - var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350 - var10000 = field1401; // L: 351 + for (var46 = var11; var46 < var12; ++var46) { // L: 365 + var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366 + var10000 = field1391; // L: 367 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; // L: 354 - if (this.field1394 > 0) { // L: 355 - var18 = var4 + this.field1394 >> 2; // L: 356 - var41 = new float[var18]; // L: 357 + float[] var41 = null; // L: 370 + if (this.field1400 > 0) { // L: 371 + var18 = var4 + this.field1400 >> 2; // L: 372 + var41 = new float[var18]; // L: 373 int var43; - if (!this.field1400) { // L: 358 - for (var19 = 0; var19 < this.field1399; ++var19) { // L: 359 - var43 = var19 + (this.field1394 >> 1); // L: 360 - var41[var19] += this.field1390[var43]; // L: 361 + if (!this.field1402) { // L: 374 + for (var19 = 0; var19 < this.field1401; ++var19) { // L: 375 + var43 = var19 + (this.field1400 >> 1); // L: 376 + var41[var19] += this.field1410[var43]; // L: 377 } } - if (!var15) { // L: 364 - for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365 - var43 = var41.length - (var4 >> 1) + var19; // L: 366 - var41[var43] += field1401[var19]; // L: 367 + if (!var15) { // L: 380 + for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 + var43 = var41.length - (var4 >> 1) + var19; // L: 382 + var41[var43] += field1391[var19]; // L: 383 } } } - float[] var54 = this.field1390; // L: 371 - this.field1390 = field1401; // L: 372 - field1401 = var54; // L: 373 - this.field1394 = var4; // L: 374 - this.field1399 = var12 - (var4 >> 1); // L: 375 - this.field1400 = var15; // L: 376 - return var41; // L: 377 + float[] var54 = this.field1410; // L: 387 + this.field1410 = field1391; // L: 388 + field1391 = var54; // L: 389 + this.field1400 = var4; // L: 390 + this.field1401 = var12 - (var4 >> 1); // L: 391 + this.field1402 = var15; // L: 392 + return var41; // L: 393 } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([I)Lde;" + descriptor = "([I)Ldo;" ) + @Export("toRawSound") RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { // L: 405 + if (var1 != null && var1[0] <= 0) { // L: 421 return null; } else { - if (this.samples == null) { // L: 406 - this.field1394 = 0; // L: 407 - this.field1390 = new float[VorbisSample_blockSize1]; // L: 408 - this.samples = new byte[this.sampleCount]; // L: 409 - this.field1383 = 0; // L: 410 - this.field1412 = 0; // L: 411 + if (this.samples == null) { // L: 422 + this.field1400 = 0; // L: 423 + this.field1410 = new float[VorbisSample_blockSize1]; // L: 424 + this.samples = new byte[this.sampleCount]; // L: 425 + this.field1398 = 0; // L: 426 + this.field1414 = 0; // L: 427 } - for (; this.field1412 < this.field1397.length; ++this.field1412) { // L: 413 428 - if (var1 != null && var1[0] <= 0) { // L: 414 + for (; this.field1414 < this.field1397.length; ++this.field1414) { // L: 429 444 + if (var1 != null && var1[0] <= 0) { // L: 430 return null; } - float[] var2 = this.method2467(this.field1412); // L: 415 - if (var2 != null) { // L: 416 - int var3 = this.field1383; // L: 417 - int var4 = var2.length; // L: 418 - if (var4 > this.sampleCount - var3) { // L: 419 + float[] var2 = this.method2504(this.field1414); // L: 431 + if (var2 != null) { // L: 432 + int var3 = this.field1398; // L: 433 + int var4 = var2.length; // L: 434 + if (var4 > this.sampleCount - var3) { // L: 435 var4 = this.sampleCount - var3; } - for (int var5 = 0; var5 < var4; ++var5) { // L: 420 - int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421 - if ((var6 & -256) != 0) { // L: 422 + for (int var5 = 0; var5 < var4; ++var5) { // L: 436 + int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437 + if ((var6 & -256) != 0) { // L: 438 var6 = ~var6 >> 31; } - this.samples[var3++] = (byte)(var6 - 128); // L: 423 + this.samples[var3++] = (byte)(var6 - 128); // L: 439 } - if (var1 != null) { // L: 425 - var1[0] -= var3 - this.field1383; + if (var1 != null) { // L: 441 + var1[0] -= var3 - this.field1398; } - this.field1383 = var3; // L: 426 + this.field1398 = var3; // L: 442 } } - this.field1390 = null; // L: 430 - byte[] var7 = this.samples; // L: 431 - this.samples = null; // L: 432 - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1395); // L: 433 + this.field1410 = null; // L: 446 + byte[] var7 = this.samples; // L: 447 + this.samples = null; // L: 448 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1386); // L: 449 } } - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; // L: 47 int var2 = var0 & Integer.MIN_VALUE; // L: 48 @@ -442,14 +464,16 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 VorbisSample_byteOffset = var1; // L: 56 VorbisSample_bitOffset = 0; // L: 57 } // L: 58 - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 ++VorbisSample_bitOffset; // L: 62 @@ -458,7 +482,8 @@ public class VorbisSample extends Node { return var0; // L: 65 } - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -482,12 +507,12 @@ public class VorbisSample extends Node { return var1; // L: 85 } - @ObfuscatedName("o") - static void method2466(byte[] var0) { + @ObfuscatedName("q") + static void method2503(byte[] var0) { VorbisSample_setData(var0, 0); // L: 114 VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field1401 = new float[VorbisSample_blockSize1]; // L: 117 + field1391 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; @@ -499,123 +524,133 @@ public class VorbisSample extends Node { var3 = var2 >> 1; // L: 120 var4 = var2 >> 2; // L: 121 var5 = var2 >> 3; // L: 122 - float[] var12 = new float[var3]; // L: 123 + float[] var18 = new float[var3]; // L: 123 for (int var7 = 0; var7 < var4; ++var7) { // L: 124 - var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 - var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 + var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 + var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 } - float[] var13 = new float[var3]; // L: 128 + float[] var19 = new float[var3]; // L: 128 for (int var8 = 0; var8 < var4; ++var8) { // L: 129 - var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 - var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 + var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 + var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 } - float[] var14 = new float[var4]; // L: 133 + float[] var20 = new float[var4]; // L: 133 for (int var9 = 0; var9 < var5; ++var9) { // L: 134 - var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 - var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 + var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 + var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 } - int[] var15 = new int[var5]; // L: 138 - int var10 = DevicePcmPlayerProvider.iLog(var5 - 1); // L: 139 + int[] var21 = new int[var5]; // L: 138 + int var10 = JagexCache.iLog(var5 - 1); // L: 139 for (int var11 = 0; var11 < var5; ++var11) { // L: 140 - var15[var11] = GameShell.method996(var11, var10); + int var15 = var11; // L: 144 + int var16 = var10; // L: 145 + + int var17; + for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151 + var17 = var17 << 1 | var15 & 1; // L: 149 + var15 >>>= 1; // L: 150 + } + + var21[var11] = var17; // L: 155 } - if (var1 != 0) { // L: 141 - field1392 = var12; // L: 142 - field1406 = var13; // L: 143 - field1407 = var14; // L: 144 - field1409 = var15; // L: 145 + if (var1 != 0) { // L: 157 + field1407 = var18; // L: 158 + field1412 = var19; // L: 159 + field1409 = var20; // L: 160 + field1411 = var21; // L: 161 } else { - field1405 = var12; // L: 148 - field1403 = var13; // L: 149 - field1384 = var14; // L: 150 - field1408 = var15; // L: 151 + field1399 = var18; // L: 164 + field1405 = var19; // L: 165 + field1403 = var20; // L: 166 + field1381 = var21; // L: 167 } } - var1 = readBits(8) + 1; // L: 154 - VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155 + var1 = readBits(8) + 1; // L: 170 + VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171 - for (var2 = 0; var2 < var1; ++var2) { // L: 156 + for (var2 = 0; var2 < var1; ++var2) { // L: 172 VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; // L: 158 + var2 = readBits(6) + 1; // L: 174 - for (var3 = 0; var3 < var2; ++var3) { // L: 159 + for (var3 = 0; var3 < var2; ++var3) { // L: 175 readBits(16); } - var2 = readBits(6) + 1; // L: 161 - VorbisSample_floors = new VorbisFloor[var2]; // L: 162 + var2 = readBits(6) + 1; // L: 177 + VorbisSample_floors = new VorbisFloor[var2]; // L: 178 - for (var3 = 0; var3 < var2; ++var3) { // L: 163 + for (var3 = 0; var3 < var2; ++var3) { // L: 179 VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; // L: 164 - VorbisSample_residues = new VorbisResidue[var3]; // L: 165 + var3 = readBits(6) + 1; // L: 180 + VorbisSample_residues = new VorbisResidue[var3]; // L: 181 - for (var4 = 0; var4 < var3; ++var4) { // L: 166 + for (var4 = 0; var4 < var3; ++var4) { // L: 182 VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; // L: 167 - VorbisSample_mappings = new VorbisMapping[var4]; // L: 168 + var4 = readBits(6) + 1; // L: 183 + VorbisSample_mappings = new VorbisMapping[var4]; // L: 184 - for (var5 = 0; var5 < var4; ++var5) { // L: 169 + for (var5 = 0; var5 < var4; ++var5) { // L: 185 VorbisSample_mappings[var5] = new VorbisMapping(); } - var5 = readBits(6) + 1; // L: 170 - VorbisSample_blockFlags = new boolean[var5]; // L: 171 - VorbisSample_mapping = new int[var5]; // L: 172 + var5 = readBits(6) + 1; // L: 186 + VorbisSample_blockFlags = new boolean[var5]; // L: 187 + VorbisSample_mapping = new int[var5]; // L: 188 - for (int var6 = 0; var6 < var5; ++var6) { // L: 173 - VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174 - readBits(16); // L: 175 - readBits(16); // L: 176 - VorbisSample_mapping[var6] = readBits(8); // L: 177 + for (int var6 = 0; var6 < var5; ++var6) { // L: 189 + VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190 + readBits(16); // L: 191 + readBits(16); // L: 192 + VorbisSample_mapping[var6] = readBits(8); // L: 193 } - } // L: 179 + } // L: 195 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lic;)Z" + descriptor = "(Liw;)Z" ) - static boolean method2468(AbstractArchive var0) { - if (!field1410) { // L: 381 - byte[] var1 = var0.takeFile(0, 0); // L: 382 - if (var1 == null) { // L: 383 + static boolean method2505(AbstractArchive var0) { + if (!field1389) { // L: 397 + byte[] var1 = var0.takeFile(0, 0); // L: 398 + if (var1 == null) { // L: 399 return false; } - method2466(var1); // L: 384 - field1410 = true; // L: 385 + method2503(var1); // L: 400 + field1389 = true; // L: 401 } - return true; // L: 387 + return true; // L: 403 } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lic;II)Ldk;" + descriptor = "(Liw;II)Ldp;" ) + @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2468(var0)) { // L: 391 - var0.tryLoadFile(var1, var2); // L: 392 - return null; // L: 393 + if (!method2505(var0)) { // L: 407 + var0.tryLoadFile(var1, var2); // L: 408 + return null; // L: 409 } else { - byte[] var3 = var0.takeFile(var1, var2); // L: 395 - return var3 == null ? null : new VorbisSample(var3); // L: 396 + byte[] var3 = var0.takeFile(var1, var2); // L: 411 + return var3 == null ? null : new VorbisSample(var3); // L: 412 } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 68fe76fe95..3d6bb2eb4d 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -1,63 +1,81 @@ +import java.net.URL; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("ey") +@Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("z") + @ObfuscatedName("gd") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1170791361 - ) - int orientation; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 85116123 + intValue = -1368883061 ) + @Export("tileHeight") int tileHeight; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 841011539 + intValue = 1255836875 ) + @Export("x") int x; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 321574291 + intValue = 1394186747 ) + @Export("y") int y; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -429102155 - ) - int orientation2; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -978448895 - ) - int xOffset; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 2017479075 - ) - int yOffset; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lez;" - ) - public Entity entity1; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lez;" - ) - public Entity entity2; @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -8703832368131294063L + intValue = -1069815711 ) - public long tag; - @ObfuscatedName("n") + @Export("orientation") + int orientation; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2069520015 + intValue = -1005575771 ) + @Export("orientation2") + int orientation2; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 287109355 + ) + @Export("xOffset") + int xOffset; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -872509349 + ) + @Export("yOffset") + int yOffset; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lej;" + ) + @Export("entity1") + public Entity entity1; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lej;" + ) + @Export("entity2") + public Entity entity2; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = -3894207238426267157L + ) + @Export("tag") + public long tag; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -237175035 + ) + @Export("flags") int flags; WallDecoration() { @@ -65,22 +83,43 @@ public final class WallDecoration { this.flags = 0; // L: 14 } // L: 16 - @ObfuscatedName("t") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-807916273" + descriptor = "(B)Z", + garbageValue = "28" ) - public static void method3409() { - synchronized(MouseHandler.MouseHandler_instance) { // L: 58 - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 59 - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 60 - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 61 - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 62 - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 63 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 64 - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 65 - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 66 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 67 + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (class248.World_request == null) { // L: 31 + class248.World_request = class52.urlRequester.request(new URL(PcmPlayer.worldListURL)); + } else if (class248.World_request.isDone()) { // L: 33 + byte[] var0 = class248.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + DefaultsGroup.World_worlds = new World[World.World_count]; // L: 38 + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 + var3 = DefaultsGroup.World_worlds[var2] = new World(); // L: 40 + var3.id = var1.readUnsignedShort(); // L: 41 + var3.properties = var1.readInt(); // L: 42 + var3.host = var1.readStringCp1252NullTerminated(); // L: 43 + var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 + var3.location = var1.readUnsignedByte(); // L: 45 + var3.population = var1.readShort(); // L: 46 + } + + ModeWhere.sortWorlds(DefaultsGroup.World_worlds, 0, DefaultsGroup.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + class248.World_request = null; // L: 50 + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + class248.World_request = null; // L: 57 } - } // L: 69 + + return false; // L: 59 + } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 3cdd7f6e7e..afa1e86363 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1,556 +1,696 @@ -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("hq") +@ObfuscatedName("ht") +@Implements("Widget") public class Widget extends Node { + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "[[Lht;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("c") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("Widget_cachedSprites") + public static EvictingDualNodeHashTable Widget_cachedSprites; @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[[Lhq;" + descriptor = "Lev;" ) - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("g") + @Export("Widget_cachedModels") + public static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lev;" ) - public static AbstractArchive Widget_archive; - @ObfuscatedName("m") + @Export("Widget_cachedFonts") + public static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lev;" ) - public static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("f") - public static boolean field2611; + @Export("Widget_cachedSpriteMasks") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; @ObfuscatedName("y") + public static boolean field2677; + @ObfuscatedName("s") + @Export("isIf3") public boolean isIf3; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1189552295 - ) - public int id; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1997993253 + intValue = -583486671 ) + @Export("id") + public int id; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1360175439 + ) + @Export("childIndex") public int childIndex; - @ObfuscatedName("r") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -531389959 + intValue = -1823014479 ) + @Export("type") public int type; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -271172565 + intValue = 1601942739 ) + @Export("buttonType") public int buttonType; - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -784599883 + intValue = 1509263011 ) + @Export("contentType") public int contentType; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -160427093 + intValue = -577014137 ) + @Export("xAlignment") public int xAlignment; - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1846560629 + intValue = 1228051433 ) + @Export("yAlignment") public int yAlignment; - @ObfuscatedName("e") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 84465573 + intValue = 841889031 ) + @Export("widthAlignment") public int widthAlignment; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1226090749 + intValue = -300976641 ) + @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -2088624487 + intValue = -1326300873 ) + @Export("rawX") public int rawX; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1233836267 + intValue = 1422648317 ) + @Export("rawY") public int rawY; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = 1843073905 - ) - public int rawWidth; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = -1879271747 - ) - public int rawHeight; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -1517732015 - ) - public int x; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = 256308969 - ) - public int y; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 1613274363 - ) - public int width; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 1991496335 - ) - public int height; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -1488324875 - ) - public int field2622; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = -1765523627 - ) - public int field2623; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 1948885583 - ) - public int parentId; - @ObfuscatedName("al") - public boolean isHidden; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = -1183715667 - ) - public int scrollX; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = -699502093 - ) - public int scrollY; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -1556531767 - ) - public int scrollWidth; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = 1626628049 - ) - public int scrollHeight; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = 1201601061 - ) - public int color; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = -1272515191 - ) - public int color2; - @ObfuscatedName("ai") - @ObfuscatedGetter( - intValue = -5591483 - ) - public int mouseOverColor; - @ObfuscatedName("ay") - @ObfuscatedGetter( - intValue = 1367295317 - ) - public int mouseOverColor2; - @ObfuscatedName("aj") - public boolean fill; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Llm;" - ) - public FillMode fillMode; @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 955254737 + intValue = 497062529 ) - public int transparencyTop; + @Export("rawWidth") + public int rawWidth; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = -682926215 + ) + @Export("rawHeight") + public int rawHeight; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = 371785153 + ) + @Export("x") + public int x; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = 766965945 + ) + @Export("y") + public int y; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = 410180701 + ) + @Export("width") + public int width; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = -1661593933 + ) + @Export("height") + public int height; @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1148839493 + intValue = -370918947 ) + public int field2610; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -1940118895 + ) + public int field2611; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = 1412750483 + ) + @Export("parentId") + public int parentId; + @ObfuscatedName("ax") + @Export("isHidden") + public boolean isHidden; + @ObfuscatedName("ag") + @ObfuscatedGetter( + intValue = -182885719 + ) + @Export("scrollX") + public int scrollX; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = 192866787 + ) + @Export("scrollY") + public int scrollY; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = -999155981 + ) + @Export("scrollWidth") + public int scrollWidth; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = -1625501093 + ) + @Export("scrollHeight") + public int scrollHeight; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -1857019467 + ) + @Export("color") + public int color; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 808301363 + ) + @Export("color2") + public int color2; + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = -153387015 + ) + @Export("mouseOverColor") + public int mouseOverColor; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -2099006501 + ) + @Export("mouseOverColor2") + public int mouseOverColor2; + @ObfuscatedName("aj") + @Export("fill") + public boolean fill; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Llu;" + ) + @Export("fillMode") + public FillMode fillMode; + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = 527341201 + ) + @Export("transparencyTop") + public int transparencyTop; + @ObfuscatedName("ap") + @ObfuscatedGetter( + intValue = 509195953 + ) + @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ac") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1328949873 + intValue = 854987601 ) + @Export("lineWid") public int lineWid; - @ObfuscatedName("bl") - public boolean field2639; - @ObfuscatedName("bc") + @ObfuscatedName("bb") + public boolean field2627; + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1969239081 + intValue = 372301921 ) + @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bz") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -250118287 + intValue = -402783927 ) + @Export("spriteId") public int spriteId; - @ObfuscatedName("bj") - @ObfuscatedGetter( - intValue = -237364125 - ) - public int spriteAngle; - @ObfuscatedName("bh") - public boolean spriteTiling; - @ObfuscatedName("bi") - @ObfuscatedGetter( - intValue = -1634007559 - ) - public int outline; @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1037474535 + intValue = 1106974971 ) + @Export("spriteAngle") + public int spriteAngle; + @ObfuscatedName("bc") + @Export("spriteTiling") + public boolean spriteTiling; + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -90624959 + ) + @Export("outline") + public int outline; + @ObfuscatedName("bl") + @ObfuscatedGetter( + intValue = 980647975 + ) + @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("br") - public boolean spriteFlipV; - @ObfuscatedName("bp") - public boolean spriteFlipH; @ObfuscatedName("bn") - @ObfuscatedGetter( - intValue = 1324605985 - ) - public int modelType; - @ObfuscatedName("bw") - @ObfuscatedGetter( - intValue = 734022747 - ) - public int modelId; + @Export("spriteFlipV") + public boolean spriteFlipV; + @ObfuscatedName("bo") + @Export("spriteFlipH") + public boolean spriteFlipH; @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1986373533 + intValue = -498393033 ) - int modelType2; - @ObfuscatedName("bu") - @ObfuscatedGetter( - intValue = -651946363 - ) - int modelId2; + @Export("modelType") + public int modelType; @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1530355915 + intValue = -259490959 ) - public int sequenceId; + @Export("modelId") + public int modelId; + @ObfuscatedName("bt") + @ObfuscatedGetter( + intValue = 1852201437 + ) + @Export("modelType2") + int modelType2; + @ObfuscatedName("bw") + @ObfuscatedGetter( + intValue = 1086899159 + ) + @Export("modelId2") + int modelId2; @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1814107681 + intValue = -1208440245 ) - public int sequenceId2; - @ObfuscatedName("bd") - @ObfuscatedGetter( - intValue = 1684215659 - ) - public int modelOffsetX; - @ObfuscatedName("bb") - @ObfuscatedGetter( - intValue = -2011277719 - ) - public int modelOffsetY; - @ObfuscatedName("bx") - @ObfuscatedGetter( - intValue = -1767129155 - ) - public int modelAngleX; - @ObfuscatedName("bq") - @ObfuscatedGetter( - intValue = 21691605 - ) - public int modelAngleY; + @Export("sequenceId") + public int sequenceId; @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1295427891 + intValue = 931568329 ) - public int modelAngleZ; - @ObfuscatedName("bo") + @Export("sequenceId2") + public int sequenceId2; + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 1679520267 + intValue = -858623233 ) + @Export("modelOffsetX") + public int modelOffsetX; + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = -741084995 + ) + @Export("modelOffsetY") + public int modelOffsetY; + @ObfuscatedName("br") + @ObfuscatedGetter( + intValue = -2065006749 + ) + @Export("modelAngleX") + public int modelAngleX; + @ObfuscatedName("bs") + @ObfuscatedGetter( + intValue = 989386551 + ) + @Export("modelAngleY") + public int modelAngleY; + @ObfuscatedName("bd") + @ObfuscatedGetter( + intValue = 1566757881 + ) + @Export("modelAngleZ") + public int modelAngleZ; + @ObfuscatedName("bh") + @ObfuscatedGetter( + intValue = 695055175 + ) + @Export("modelZoom") public int modelZoom; @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1534988333 + intValue = 200052753 ) - public int field2728; - @ObfuscatedName("bv") + public int field2678; + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1067909943 + intValue = 2066974309 ) - public int field2633; - @ObfuscatedName("bf") + public int field2734; + @ObfuscatedName("bi") + @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bt") + @ObfuscatedName("bu") + @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bs") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 1750770011 + intValue = -484301607 ) + @Export("itemQuantityMode") public int itemQuantityMode; + @ObfuscatedName("cs") + @ObfuscatedGetter( + intValue = 272063495 + ) + @Export("fontId") + public int fontId; + @ObfuscatedName("ce") + @Export("text") + public String text; + @ObfuscatedName("cf") + @Export("text2") + public String text2; @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 228754721 - ) - public int fontId; - @ObfuscatedName("ca") - public String text; - @ObfuscatedName("ct") - public String text2; - @ObfuscatedName("cv") - @ObfuscatedGetter( - intValue = 22170567 + intValue = 1323405895 ) + @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("ce") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 372737821 + intValue = 1997351313 ) + @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cr") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 188319241 + intValue = -1635883311 ) + @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cn") + @ObfuscatedName("cl") + @Export("textShadowed") public boolean textShadowed; @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 1239558509 + intValue = 1844469737 ) + @Export("paddingX") public int paddingX; - @ObfuscatedName("cm") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 684939999 + intValue = 1233173447 ) + @Export("paddingY") public int paddingY; - @ObfuscatedName("cu") - public int[] inventoryXOffsets; - @ObfuscatedName("cw") - public int[] inventoryYOffsets; - @ObfuscatedName("cq") - public int[] inventorySprites; - @ObfuscatedName("cc") - public String[] itemActions; - @ObfuscatedName("cf") - @ObfuscatedGetter( - intValue = 1387630371 - ) - public int flags; - @ObfuscatedName("cj") - public boolean field2676; - @ObfuscatedName("cd") - public byte[][] field2626; @ObfuscatedName("cx") - public byte[][] field2719; - @ObfuscatedName("ck") - public int[] field2682; - @ObfuscatedName("co") - public int[] field2683; - @ObfuscatedName("dx") + @Export("inventoryXOffsets") + public int[] inventoryXOffsets; + @ObfuscatedName("ca") + @Export("inventoryYOffsets") + public int[] inventoryYOffsets; + @ObfuscatedName("cn") + @Export("inventorySprites") + public int[] inventorySprites; + @ObfuscatedName("cw") + @Export("itemActions") + public String[] itemActions; + @ObfuscatedName("cu") + @ObfuscatedGetter( + intValue = 59391427 + ) + @Export("flags") + public int flags; + @ObfuscatedName("cq") + public boolean field2667; + @ObfuscatedName("cd") + public byte[][] field2668; + @ObfuscatedName("cj") + public byte[][] field2649; + @ObfuscatedName("cv") + public int[] field2670; + @ObfuscatedName("cz") + public int[] field2671; + @ObfuscatedName("dg") + @Export("dataText") public String dataText; - @ObfuscatedName("dq") + @ObfuscatedName("db") + @Export("actions") public String[] actions; @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Lhq;" + descriptor = "Lht;" ) + @Export("parent") public Widget parent; - @ObfuscatedName("dh") + @ObfuscatedName("df") @ObfuscatedGetter( - intValue = -1668184029 + intValue = 1496607755 ) + @Export("dragZoneSize") public int dragZoneSize; @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = -1282838075 + intValue = -149689265 ) + @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("db") + @ObfuscatedName("dl") + @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dj") + @ObfuscatedName("dq") + @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dk") + @ObfuscatedName("dp") + @Export("hasListener") public boolean hasListener; - @ObfuscatedName("de") + @ObfuscatedName("do") + @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("da") + @ObfuscatedName("dm") + @Export("onClick") public Object[] onClick; - @ObfuscatedName("dr") + @ObfuscatedName("dh") + @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dw") + @ObfuscatedName("da") + @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dy") + @ObfuscatedName("dz") + @Export("onHold") public Object[] onHold; @ObfuscatedName("ds") + @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dl") - public Object[] onMouseRepeat; - @ObfuscatedName("di") - public Object[] onMouseLeave; - @ObfuscatedName("do") - public Object[] onDrag; - @ObfuscatedName("df") - public Object[] onDragComplete; - @ObfuscatedName("dm") - public Object[] onTargetEnter; - @ObfuscatedName("du") - public Object[] onTargetLeave; @ObfuscatedName("dc") - public Object[] onVarTransmit; - @ObfuscatedName("dn") - public int[] varTransmitTriggers; - @ObfuscatedName("dz") - public Object[] onInvTransmit; - @ObfuscatedName("dp") - public int[] invTransmitTriggers; + @Export("onMouseRepeat") + public Object[] onMouseRepeat; + @ObfuscatedName("dy") + @Export("onMouseLeave") + public Object[] onMouseLeave; + @ObfuscatedName("dj") + @Export("onDrag") + public Object[] onDrag; + @ObfuscatedName("dw") + @Export("onDragComplete") + public Object[] onDragComplete; + @ObfuscatedName("dx") + @Export("onTargetEnter") + public Object[] onTargetEnter; @ObfuscatedName("dt") + @Export("onTargetLeave") + public Object[] onTargetLeave; + @ObfuscatedName("de") + @Export("onVarTransmit") + public Object[] onVarTransmit; + @ObfuscatedName("di") + @Export("varTransmitTriggers") + public int[] varTransmitTriggers; + @ObfuscatedName("dk") + @Export("onInvTransmit") + public Object[] onInvTransmit; + @ObfuscatedName("dn") + @Export("invTransmitTriggers") + public int[] invTransmitTriggers; + @ObfuscatedName("du") + @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dg") + @ObfuscatedName("dr") + @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ee") - public Object[] onTimer; @ObfuscatedName("en") - public Object[] onOp; - @ObfuscatedName("eu") - public Object[] onScroll; - @ObfuscatedName("eo") - public Object[] onChatTransmit; - @ObfuscatedName("es") - public Object[] onKey; - @ObfuscatedName("ek") - public Object[] onFriendTransmit; - @ObfuscatedName("er") - public Object[] onClanTransmit; - @ObfuscatedName("ep") - public Object[] onMiscTransmit; - @ObfuscatedName("eg") - public Object[] onDialogAbort; + @Export("onTimer") + public Object[] onTimer; @ObfuscatedName("eq") - public Object[] onSubChange; - @ObfuscatedName("em") - public Object[] onResize; - @ObfuscatedName("eh") - public Object[] onStockTransmit; - @ObfuscatedName("ec") - public Object[] field2722; - @ObfuscatedName("ej") - public int[][] cs1Instructions; + @Export("onOp") + public Object[] onOp; + @ObfuscatedName("ek") + @Export("onScroll") + public Object[] onScroll; @ObfuscatedName("ez") - public int[] cs1Comparisons; - @ObfuscatedName("eb") - public int[] cs1ComparisonValues; - @ObfuscatedName("et") - @ObfuscatedGetter( - intValue = -1041425319 - ) - public int mouseOverRedirect; - @ObfuscatedName("ef") - public String spellName; - @ObfuscatedName("ey") - public String buttonText; + @Export("onChatTransmit") + public Object[] onChatTransmit; + @ObfuscatedName("er") + @Export("onKey") + public Object[] onKey; + @ObfuscatedName("eo") + @Export("onFriendTransmit") + public Object[] onFriendTransmit; + @ObfuscatedName("eh") + @Export("onClanTransmit") + public Object[] onClanTransmit; @ObfuscatedName("ew") - public int[] itemIds; - @ObfuscatedName("ex") - public int[] itemQuantities; - @ObfuscatedName("ed") - @ObfuscatedGetter( - intValue = -419140007 - ) - public int itemId; - @ObfuscatedName("ev") - @ObfuscatedGetter( - intValue = -239895029 - ) - public int itemQuantity; + @Export("onMiscTransmit") + public Object[] onMiscTransmit; + @ObfuscatedName("ep") + @Export("onDialogAbort") + public Object[] onDialogAbort; + @ObfuscatedName("et") + @Export("onSubChange") + public Object[] onSubChange; + @ObfuscatedName("eu") + @Export("onResize") + public Object[] onResize; @ObfuscatedName("ei") + @Export("onStockTransmit") + public Object[] onStockTransmit; + @ObfuscatedName("ef") + public Object[] field2669; + @ObfuscatedName("ec") + @Export("cs1Instructions") + public int[][] cs1Instructions; + @ObfuscatedName("ej") + @Export("cs1Comparisons") + public int[] cs1Comparisons; + @ObfuscatedName("em") + @Export("cs1ComparisonValues") + public int[] cs1ComparisonValues; + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = -844392783 + intValue = 493890133 ) - public int modelFrame; + @Export("mouseOverRedirect") + public int mouseOverRedirect; + @ObfuscatedName("ex") + @Export("spellName") + public String spellName; + @ObfuscatedName("ea") + @Export("buttonText") + public String buttonText; + @ObfuscatedName("ed") + @Export("itemIds") + public int[] itemIds; + @ObfuscatedName("ey") + @Export("itemQuantities") + public int[] itemQuantities; @ObfuscatedName("el") @ObfuscatedGetter( - intValue = -450327171 + intValue = -659047965 ) - public int modelFrameCycle; - @ObfuscatedName("ea") - @ObfuscatedSignature( - descriptor = "[Lhq;" - ) - public Widget[] children; - @ObfuscatedName("fq") - public boolean containsMouse; - @ObfuscatedName("fx") - public boolean isClicked; - @ObfuscatedName("fp") + @Export("itemId") + public int itemId; + @ObfuscatedName("es") @ObfuscatedGetter( - intValue = -1974330189 + intValue = 1581915613 ) - public int field2664; + @Export("itemQuantity") + public int itemQuantity; + @ObfuscatedName("eg") + @ObfuscatedGetter( + intValue = 1715464223 + ) + @Export("modelFrame") + public int modelFrame; + @ObfuscatedName("ev") + @ObfuscatedGetter( + intValue = 540822947 + ) + @Export("modelFrameCycle") + public int modelFrameCycle; + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "[Lht;" + ) + @Export("children") + public Widget[] children; + @ObfuscatedName("fs") + @Export("containsMouse") + public boolean containsMouse; + @ObfuscatedName("fw") + @Export("isClicked") + public boolean isClicked; + @ObfuscatedName("fi") + @ObfuscatedGetter( + intValue = -884134671 + ) + public int field2726; @ObfuscatedName("fj") @ObfuscatedGetter( - intValue = 786737003 - ) - public int field2618; - @ObfuscatedName("fs") - @ObfuscatedGetter( - intValue = 421837705 + intValue = 1253917553 ) public int field2727; - @ObfuscatedName("fv") + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = 1990354289 + intValue = 1015869805 ) - public int field2681; - @ObfuscatedName("fz") + public int field2728; + @ObfuscatedName("fo") @ObfuscatedGetter( - intValue = -390238451 + intValue = 884540733 ) + public int field2729; + @ObfuscatedName("fy") + @ObfuscatedGetter( + intValue = 651630769 + ) + @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fk") + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = 1135189541 + intValue = -536480473 ) + @Export("cycle") public int cycle; - @ObfuscatedName("fe") - public int[] field2661; @ObfuscatedName("fb") + public int[] field2594; + @ObfuscatedName("fv") + @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fc") + @ObfuscatedName("fk") + @Export("noScrollThrough") public boolean noScrollThrough; @ObfuscatedName("fm") + @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; static { @@ -558,7 +698,7 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32 Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33 Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34 - field2611 = false; // L: 35 + field2677 = false; // L: 35 } public Widget() { @@ -579,8 +719,8 @@ public class Widget extends Node { this.y = 0; // L: 51 this.width = 0; // L: 52 this.height = 0; // L: 53 - this.field2622 = 1; // L: 54 - this.field2623 = 1; // L: 55 + this.field2610 = 1; // L: 54 + this.field2611 = 1; // L: 55 this.parentId = -1; // L: 56 this.isHidden = false; // L: 57 this.scrollX = 0; // L: 58 @@ -596,7 +736,7 @@ public class Widget extends Node { this.transparencyTop = 0; // L: 68 this.transparencyBot = 0; // L: 69 this.lineWid = 1; // L: 70 - this.field2639 = false; // L: 71 + this.field2627 = false; // L: 71 this.spriteId2 = -1; // L: 72 this.spriteId = -1; // L: 73 this.spriteAngle = 0; // L: 74 @@ -615,8 +755,8 @@ public class Widget extends Node { this.modelAngleY = 0; // L: 89 this.modelAngleZ = 0; // L: 90 this.modelZoom = 100; // L: 91 - this.field2728 = 0; // L: 92 - this.field2633 = 0; // L: 93 + this.field2678 = 0; // L: 92 + this.field2734 = 0; // L: 93 this.modelOrthog = false; // L: 94 this.modelTransparency = false; // L: 95 this.itemQuantityMode = 2; // L: 96 @@ -630,7 +770,7 @@ public class Widget extends Node { this.paddingX = 0; // L: 104 this.paddingY = 0; // L: 105 this.flags = 0; // L: 110 - this.field2676 = false; // L: 111 + this.field2667 = false; // L: 111 this.dataText = ""; // L: 120 this.parent = null; // L: 122 this.dragZoneSize = 0; // L: 123 @@ -647,582 +787,608 @@ public class Widget extends Node { this.modelFrameCycle = 0; // L: 170 this.containsMouse = false; // L: 172 this.isClicked = false; // L: 173 - this.field2664 = -1; // L: 174 - this.field2618 = 0; // L: 175 - this.field2727 = 0; // L: 176 - this.field2681 = 0; // L: 177 + this.field2726 = -1; // L: 174 + this.field2727 = 0; // L: 175 + this.field2728 = 0; // L: 176 + this.field2729 = 0; // L: 177 this.rootIndex = -1; // L: 178 this.cycle = -1; // L: 179 this.noClickThrough = false; // L: 181 this.noScrollThrough = false; // L: 182 this.prioritizeMenuEntry = false; // L: 183 - } // L: 705 + } // L: 728 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "-56" + descriptor = "(Lkb;I)V", + garbageValue = "1764104870" ) + @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; - this.type = var1.readUnsignedByte(); // L: 244 - this.buttonType = var1.readUnsignedByte(); // L: 245 - this.contentType = var1.readUnsignedShort(); // L: 246 - this.rawX = var1.readShort(); - this.rawY = var1.readShort(); // L: 248 - this.rawWidth = var1.readUnsignedShort(); - this.rawHeight = var1.readUnsignedShort(); - this.transparencyTop = var1.readUnsignedByte(); - this.parentId = var1.readUnsignedShort(); // L: 252 - if (this.parentId == 65535) { // L: 253 + this.isIf3 = false; // L: 252 + this.type = var1.readUnsignedByte(); // L: 253 + this.buttonType = var1.readUnsignedByte(); // L: 254 + this.contentType = var1.readUnsignedShort(); // L: 255 + this.rawX = var1.readShort(); // L: 256 + this.rawY = var1.readShort(); // L: 257 + this.rawWidth = var1.readUnsignedShort(); // L: 258 + this.rawHeight = var1.readUnsignedShort(); // L: 259 + this.transparencyTop = var1.readUnsignedByte(); // L: 260 + this.parentId = var1.readUnsignedShort(); // L: 261 + if (this.parentId == 65535) { // L: 262 this.parentId = -1; } else { - this.parentId += this.id & -65536; + this.parentId += this.id & -65536; // L: 263 } - this.mouseOverRedirect = var1.readUnsignedShort(); - if (this.mouseOverRedirect == 65535) { + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 264 + if (this.mouseOverRedirect == 65535) { // L: 265 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 257 + int var2 = var1.readUnsignedByte(); // L: 266 int var3; - if (var2 > 0) { // L: 258 - this.cs1Comparisons = new int[var2]; - this.cs1ComparisonValues = new int[var2]; + if (var2 > 0) { // L: 267 + this.cs1Comparisons = new int[var2]; // L: 268 + this.cs1ComparisonValues = new int[var2]; // L: 269 - for (var3 = 0; var3 < var2; ++var3) { - this.cs1Comparisons[var3] = var1.readUnsignedByte(); - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); + for (var3 = 0; var3 < var2; ++var3) { // L: 270 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 271 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 272 } } - var3 = var1.readUnsignedByte(); + var3 = var1.readUnsignedByte(); // L: 275 int var4; int var5; int var6; - if (var3 > 0) { - this.cs1Instructions = new int[var3][]; + if (var3 > 0) { // L: 276 + this.cs1Instructions = new int[var3][]; // L: 277 - for (var4 = 0; var4 < var3; ++var4) { // L: 269 - var5 = var1.readUnsignedShort(); // L: 270 - this.cs1Instructions[var4] = new int[var5]; // L: 271 + for (var4 = 0; var4 < var3; ++var4) { // L: 278 + var5 = var1.readUnsignedShort(); // L: 279 + this.cs1Instructions[var4] = new int[var5]; // L: 280 - for (var6 = 0; var6 < var5; ++var6) { // L: 272 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 273 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 274 + for (var6 = 0; var6 < var5; ++var6) { // L: 281 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 282 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 283 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 278 - this.scrollHeight = var1.readUnsignedShort(); // L: 279 - this.isHidden = var1.readUnsignedByte() == 1; // L: 280 + if (this.type == 0) { // L: 287 + this.scrollHeight = var1.readUnsignedShort(); // L: 288 + this.isHidden = var1.readUnsignedByte() == 1; // L: 289 } - if (this.type == 1) { // L: 282 - var1.readUnsignedShort(); // L: 283 - var1.readUnsignedByte(); // L: 284 + if (this.type == 1) { // L: 291 + var1.readUnsignedShort(); // L: 292 + var1.readUnsignedByte(); // L: 293 } - if (this.type == 2) { // L: 286 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 287 - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 288 - var4 = var1.readUnsignedByte(); // L: 289 - if (var4 == 1) { // L: 290 + if (this.type == 2) { // L: 295 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 296 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 297 + var4 = var1.readUnsignedByte(); // L: 298 + if (var4 == 1) { // L: 299 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 291 - if (var5 == 1) { // L: 292 + var5 = var1.readUnsignedByte(); // L: 300 + if (var5 == 1) { // L: 301 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 293 - if (var6 == 1) { // L: 294 + var6 = var1.readUnsignedByte(); // L: 302 + if (var6 == 1) { // L: 303 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 295 - if (var7 == 1) { // L: 296 + int var7 = var1.readUnsignedByte(); // L: 304 + if (var7 == 1) { // L: 305 this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); // L: 297 - this.paddingY = var1.readUnsignedByte(); // L: 298 - this.inventoryXOffsets = new int[20]; // L: 299 - this.inventoryYOffsets = new int[20]; // L: 300 - this.inventorySprites = new int[20]; // L: 301 + this.paddingX = var1.readUnsignedByte(); // L: 306 + this.paddingY = var1.readUnsignedByte(); // L: 307 + this.inventoryXOffsets = new int[20]; // L: 308 + this.inventoryYOffsets = new int[20]; // L: 309 + this.inventorySprites = new int[20]; // L: 310 int var8; - for (var8 = 0; var8 < 20; ++var8) { // L: 302 - int var11 = var1.readUnsignedByte(); // L: 303 - if (var11 == 1) { // L: 304 - this.inventoryXOffsets[var8] = var1.readShort(); // L: 305 - this.inventoryYOffsets[var8] = var1.readShort(); // L: 306 - this.inventorySprites[var8] = var1.readInt(); // L: 307 + for (var8 = 0; var8 < 20; ++var8) { // L: 311 + int var11 = var1.readUnsignedByte(); // L: 312 + if (var11 == 1) { // L: 313 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 314 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 315 + this.inventorySprites[var8] = var1.readInt(); // L: 316 } else { - this.inventorySprites[var8] = -1; // L: 309 + this.inventorySprites[var8] = -1; // L: 318 } } - this.itemActions = new String[5]; // L: 311 + this.itemActions = new String[5]; // L: 320 - for (var8 = 0; var8 < 5; ++var8) { // L: 312 - String var9 = var1.readStringCp1252NullTerminated(); // L: 313 - if (var9.length() > 0) { // L: 314 - this.itemActions[var8] = var9; // L: 315 - this.flags |= 1 << var8 + 23; // L: 316 + for (var8 = 0; var8 < 5; ++var8) { // L: 321 + String var9 = var1.readStringCp1252NullTerminated(); // L: 322 + if (var9.length() > 0) { // L: 323 + this.itemActions[var8] = var9; // L: 324 + this.flags |= 1 << var8 + 23; // L: 325 } } } - if (this.type == 3) { // L: 320 - this.fill = var1.readUnsignedByte() == 1; // L: 321 + if (this.type == 3) { // L: 329 + this.fill = var1.readUnsignedByte() == 1; // L: 330 } - if (this.type == 4 || this.type == 1) { // L: 323 - this.textXAlignment = var1.readUnsignedByte(); // L: 324 - this.textYAlignment = var1.readUnsignedByte(); // L: 325 - this.textLineHeight = var1.readUnsignedByte(); // L: 326 - this.fontId = var1.readUnsignedShort(); // L: 327 - if (this.fontId == 65535) { // L: 328 + if (this.type == 4 || this.type == 1) { // L: 332 + this.textXAlignment = var1.readUnsignedByte(); // L: 333 + this.textYAlignment = var1.readUnsignedByte(); // L: 334 + this.textLineHeight = var1.readUnsignedByte(); // L: 335 + this.fontId = var1.readUnsignedShort(); // L: 336 + if (this.fontId == 65535) { // L: 337 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 329 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 338 } - if (this.type == 4) { // L: 331 - this.text = var1.readStringCp1252NullTerminated(); // L: 332 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 333 + if (this.type == 4) { // L: 340 + this.text = var1.readStringCp1252NullTerminated(); // L: 341 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 342 } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 335 + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 344 this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { // L: 336 - this.color2 = var1.readInt(); // L: 337 - this.mouseOverColor = var1.readInt(); // L: 338 - this.mouseOverColor2 = var1.readInt(); // L: 339 + if (this.type == 3 || this.type == 4) { // L: 345 + this.color2 = var1.readInt(); // L: 346 + this.mouseOverColor = var1.readInt(); // L: 347 + this.mouseOverColor2 = var1.readInt(); // L: 348 } - if (this.type == 5) { // L: 341 - this.spriteId2 = var1.readInt(); // L: 342 - this.spriteId = var1.readInt(); // L: 343 + if (this.type == 5) { // L: 350 + this.spriteId2 = var1.readInt(); // L: 351 + this.spriteId = var1.readInt(); // L: 352 } - if (this.type == 6) { // L: 345 - this.modelType = 1; // L: 346 - this.modelId = var1.readUnsignedShort(); // L: 347 - if (this.modelId == 65535) { // L: 348 + if (this.type == 6) { // L: 354 + this.modelType = 1; // L: 355 + this.modelId = var1.readUnsignedShort(); // L: 356 + if (this.modelId == 65535) { // L: 357 this.modelId = -1; } - this.modelType2 = 1; // L: 349 - this.modelId2 = var1.readUnsignedShort(); // L: 350 - if (this.modelId2 == 65535) { // L: 351 + this.modelType2 = 1; // L: 358 + this.modelId2 = var1.readUnsignedShort(); // L: 359 + if (this.modelId2 == 65535) { // L: 360 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 352 - if (this.sequenceId == 65535) { // L: 353 + this.sequenceId = var1.readUnsignedShort(); // L: 361 + if (this.sequenceId == 65535) { // L: 362 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 354 - if (this.sequenceId2 == 65535) { // L: 355 + this.sequenceId2 = var1.readUnsignedShort(); // L: 363 + if (this.sequenceId2 == 65535) { // L: 364 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 356 - this.modelAngleX = var1.readUnsignedShort(); // L: 357 - this.modelAngleY = var1.readUnsignedShort(); // L: 358 + this.modelZoom = var1.readUnsignedShort(); // L: 365 + this.modelAngleX = var1.readUnsignedShort(); // L: 366 + this.modelAngleY = var1.readUnsignedShort(); // L: 367 } - if (this.type == 7) { // L: 360 - this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 361 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 362 - this.textXAlignment = var1.readUnsignedByte(); // L: 363 - this.fontId = var1.readUnsignedShort(); // L: 364 - if (this.fontId == 65535) { // L: 365 + if (this.type == 7) { // L: 369 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 370 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 371 + this.textXAlignment = var1.readUnsignedByte(); // L: 372 + this.fontId = var1.readUnsignedShort(); // L: 373 + if (this.fontId == 65535) { // L: 374 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 366 - this.color = var1.readInt(); // L: 367 - this.paddingX = var1.readShort(); // L: 368 - this.paddingY = var1.readShort(); // L: 369 - var4 = var1.readUnsignedByte(); // L: 370 - if (var4 == 1) { // L: 371 - this.flags |= 1073741824; + this.textShadowed = var1.readUnsignedByte() == 1; // L: 375 + this.color = var1.readInt(); // L: 376 + this.paddingX = var1.readShort(); // L: 377 + this.paddingY = var1.readShort(); // L: 378 + var4 = var1.readUnsignedByte(); // L: 379 + if (var4 == 1) { + this.flags |= 1073741824; // L: 380 } - this.itemActions = new String[5]; // L: 372 + this.itemActions = new String[5]; // L: 381 - for (var5 = 0; var5 < 5; ++var5) { // L: 373 - String var10 = var1.readStringCp1252NullTerminated(); // L: 374 - if (var10.length() > 0) { // L: 375 - this.itemActions[var5] = var10; // L: 376 - this.flags |= 1 << var5 + 23; // L: 377 + for (var5 = 0; var5 < 5; ++var5) { // L: 382 + String var10 = var1.readStringCp1252NullTerminated(); // L: 383 + if (var10.length() > 0) { // L: 384 + this.itemActions[var5] = var10; // L: 385 + this.flags |= 1 << var5 + 23; // L: 386 } } } - if (this.type == 8) { // L: 381 - this.text = var1.readStringCp1252NullTerminated(); // L: 382 + if (this.type == 8) { // L: 390 + this.text = var1.readStringCp1252NullTerminated(); // L: 391 } - if (this.buttonType == 2 || this.type == 2) { // L: 384 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 385 - this.spellName = var1.readStringCp1252NullTerminated(); // L: 386 - var4 = var1.readUnsignedShort() & 63; // L: 387 - this.flags |= var4 << 11; // L: 388 + if (this.buttonType == 2 || this.type == 2) { // L: 393 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 394 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 395 + var4 = var1.readUnsignedShort() & 63; // L: 396 + this.flags |= var4 << 11; // L: 397 } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 390 - this.buttonText = var1.readStringCp1252NullTerminated(); // L: 391 - if (this.buttonText.length() == 0) { // L: 392 - if (this.buttonType == 1) { // L: 393 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 399 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 400 + if (this.buttonText.length() == 0) { // L: 401 + if (this.buttonType == 1) { // L: 402 this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 394 + if (this.buttonType == 4) { // L: 403 this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 395 + if (this.buttonType == 5) { // L: 404 this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 396 + if (this.buttonType == 6) { // L: 405 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 399 - this.flags |= 4194304; // L: 400 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 408 + this.flags |= 4194304; // L: 409 } - if (this.buttonType == 6) { // L: 402 - this.flags |= 1; // L: 403 + if (this.buttonType == 6) { // L: 411 + this.flags |= 1; // L: 412 } - } // L: 405 + } // L: 414 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "-1100284620" + descriptor = "(Lkb;I)V", + garbageValue = "-517843839" ) + @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); // L: 408 - this.isIf3 = true; // L: 409 - this.type = var1.readUnsignedByte(); // L: 410 - this.contentType = var1.readUnsignedShort(); // L: 411 - this.rawX = var1.readShort(); // L: 412 - this.rawY = var1.readShort(); // L: 413 - this.rawWidth = var1.readUnsignedShort(); // L: 414 - if (this.type == 9) { // L: 415 + var1.readUnsignedByte(); // L: 417 + this.isIf3 = true; // L: 418 + this.type = var1.readUnsignedByte(); // L: 419 + this.contentType = var1.readUnsignedShort(); // L: 420 + this.rawX = var1.readShort(); // L: 421 + this.rawY = var1.readShort(); // L: 422 + this.rawWidth = var1.readUnsignedShort(); // L: 423 + if (this.type == 9) { // L: 424 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 416 + this.rawHeight = var1.readUnsignedShort(); // L: 425 } - this.widthAlignment = var1.readByte(); // L: 417 - this.heightAlignment = var1.readByte(); // L: 418 - this.xAlignment = var1.readByte(); // L: 419 - this.yAlignment = var1.readByte(); // L: 420 - this.parentId = var1.readUnsignedShort(); // L: 421 - if (this.parentId == 65535) { // L: 422 + this.widthAlignment = var1.readByte(); // L: 426 + this.heightAlignment = var1.readByte(); // L: 427 + this.xAlignment = var1.readByte(); // L: 428 + this.yAlignment = var1.readByte(); // L: 429 + this.parentId = var1.readUnsignedShort(); // L: 430 + if (this.parentId == 65535) { // L: 431 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 423 + this.parentId += this.id & -65536; // L: 432 } - this.isHidden = var1.readUnsignedByte() == 1; // L: 424 - if (this.type == 0) { // L: 425 - this.scrollWidth = var1.readUnsignedShort(); // L: 426 - this.scrollHeight = var1.readUnsignedShort(); // L: 427 - this.noClickThrough = var1.readUnsignedByte() == 1; // L: 428 + this.isHidden = var1.readUnsignedByte() == 1; // L: 433 + if (this.type == 0) { // L: 434 + this.scrollWidth = var1.readUnsignedShort(); // L: 435 + this.scrollHeight = var1.readUnsignedShort(); // L: 436 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 437 } - if (this.type == 5) { // L: 430 - this.spriteId2 = var1.readInt(); // L: 431 - this.spriteAngle = var1.readUnsignedShort(); // L: 432 - this.spriteTiling = var1.readUnsignedByte() == 1; // L: 433 - this.transparencyTop = var1.readUnsignedByte(); // L: 434 - this.outline = var1.readUnsignedByte(); // L: 435 - this.spriteShadow = var1.readInt(); // L: 436 - this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 437 - this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 438 + if (this.type == 5) { // L: 439 + this.spriteId2 = var1.readInt(); // L: 440 + this.spriteAngle = var1.readUnsignedShort(); // L: 441 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 442 + this.transparencyTop = var1.readUnsignedByte(); // L: 443 + this.outline = var1.readUnsignedByte(); // L: 444 + this.spriteShadow = var1.readInt(); // L: 445 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 446 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 447 } - if (this.type == 6) { // L: 440 - this.modelType = 1; // L: 441 - this.modelId = var1.readUnsignedShort(); // L: 442 - if (this.modelId == 65535) { // L: 443 + if (this.type == 6) { // L: 449 + this.modelType = 1; // L: 450 + this.modelId = var1.readUnsignedShort(); // L: 451 + if (this.modelId == 65535) { // L: 452 this.modelId = -1; } - this.modelOffsetX = var1.readShort(); // L: 444 - this.modelOffsetY = var1.readShort(); // L: 445 - this.modelAngleX = var1.readUnsignedShort(); // L: 446 - this.modelAngleY = var1.readUnsignedShort(); // L: 447 - this.modelAngleZ = var1.readUnsignedShort(); // L: 448 - this.modelZoom = var1.readUnsignedShort(); // L: 449 - this.sequenceId = var1.readUnsignedShort(); // L: 450 - if (this.sequenceId == 65535) { // L: 451 + this.modelOffsetX = var1.readShort(); // L: 453 + this.modelOffsetY = var1.readShort(); // L: 454 + this.modelAngleX = var1.readUnsignedShort(); // L: 455 + this.modelAngleY = var1.readUnsignedShort(); // L: 456 + this.modelAngleZ = var1.readUnsignedShort(); // L: 457 + this.modelZoom = var1.readUnsignedShort(); // L: 458 + this.sequenceId = var1.readUnsignedShort(); // L: 459 + if (this.sequenceId == 65535) { // L: 460 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 452 - var1.readUnsignedShort(); // L: 453 - if (this.widthAlignment != 0) { // L: 454 - this.field2728 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 461 + var1.readUnsignedShort(); // L: 462 + if (this.widthAlignment != 0) { // L: 463 + this.field2678 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 455 - var1.readUnsignedShort(); // L: 456 + if (this.heightAlignment != 0) { // L: 464 + var1.readUnsignedShort(); // L: 465 } } - if (this.type == 4) { // L: 459 - this.fontId = var1.readUnsignedShort(); // L: 460 - if (this.fontId == 65535) { // L: 461 + if (this.type == 4) { // L: 468 + this.fontId = var1.readUnsignedShort(); // L: 469 + if (this.fontId == 65535) { // L: 470 this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); // L: 462 - this.textLineHeight = var1.readUnsignedByte(); // L: 463 - this.textXAlignment = var1.readUnsignedByte(); // L: 464 - this.textYAlignment = var1.readUnsignedByte(); // L: 465 - this.textShadowed = var1.readUnsignedByte() == 1; // L: 466 - this.color = var1.readInt(); // L: 467 - } - - if (this.type == 3) { // L: 469 - this.color = var1.readInt(); // L: 470 - this.fill = var1.readUnsignedByte() == 1; // L: 471 - this.transparencyTop = var1.readUnsignedByte(); // L: 472 - } - - if (this.type == 9) { // L: 474 - this.lineWid = var1.readUnsignedByte(); // L: 475 + this.text = var1.readStringCp1252NullTerminated(); // L: 471 + this.textLineHeight = var1.readUnsignedByte(); // L: 472 + this.textXAlignment = var1.readUnsignedByte(); // L: 473 + this.textYAlignment = var1.readUnsignedByte(); // L: 474 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 475 this.color = var1.readInt(); // L: 476 - this.field2639 = var1.readUnsignedByte() == 1; // L: 477 } - this.flags = var1.readMedium(); // L: 479 - this.dataText = var1.readStringCp1252NullTerminated(); // L: 480 - int var2 = var1.readUnsignedByte(); // L: 481 - if (var2 > 0) { // L: 482 - this.actions = new String[var2]; // L: 483 + if (this.type == 3) { // L: 478 + this.color = var1.readInt(); // L: 479 + this.fill = var1.readUnsignedByte() == 1; // L: 480 + this.transparencyTop = var1.readUnsignedByte(); // L: 481 + } - for (int var3 = 0; var3 < var2; ++var3) { // L: 484 + if (this.type == 9) { // L: 483 + this.lineWid = var1.readUnsignedByte(); // L: 484 + this.color = var1.readInt(); // L: 485 + this.field2627 = var1.readUnsignedByte() == 1; // L: 486 + } + + this.flags = var1.readMedium(); // L: 488 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 489 + int var2 = var1.readUnsignedByte(); // L: 490 + if (var2 > 0) { // L: 491 + this.actions = new String[var2]; // L: 492 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 493 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); // L: 486 - this.dragThreshold = var1.readUnsignedByte(); // L: 487 - this.isScrollBar = var1.readUnsignedByte() == 1; // L: 488 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 489 - this.onLoad = this.readListener(var1); // L: 490 - this.onMouseOver = this.readListener(var1); // L: 491 - this.onMouseLeave = this.readListener(var1); // L: 492 - this.onTargetLeave = this.readListener(var1); // L: 493 - this.onTargetEnter = this.readListener(var1); // L: 494 - this.onVarTransmit = this.readListener(var1); // L: 495 - this.onInvTransmit = this.readListener(var1); // L: 496 - this.onStatTransmit = this.readListener(var1); // L: 497 - this.onTimer = this.readListener(var1); // L: 498 - this.onOp = this.readListener(var1); // L: 499 - this.onMouseRepeat = this.readListener(var1); // L: 500 - this.onClick = this.readListener(var1); // L: 501 - this.onClickRepeat = this.readListener(var1); // L: 502 - this.onRelease = this.readListener(var1); // L: 503 - this.onHold = this.readListener(var1); // L: 504 - this.onDrag = this.readListener(var1); // L: 505 - this.onDragComplete = this.readListener(var1); // L: 506 - this.onScroll = this.readListener(var1); // L: 507 - this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 508 - this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 509 - this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 510 - } // L: 511 + this.dragZoneSize = var1.readUnsignedByte(); // L: 495 + this.dragThreshold = var1.readUnsignedByte(); // L: 496 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 497 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 498 + this.onLoad = this.readListener(var1); // L: 499 + this.onMouseOver = this.readListener(var1); // L: 500 + this.onMouseLeave = this.readListener(var1); // L: 501 + this.onTargetLeave = this.readListener(var1); // L: 502 + this.onTargetEnter = this.readListener(var1); // L: 503 + this.onVarTransmit = this.readListener(var1); // L: 504 + this.onInvTransmit = this.readListener(var1); // L: 505 + this.onStatTransmit = this.readListener(var1); // L: 506 + this.onTimer = this.readListener(var1); // L: 507 + this.onOp = this.readListener(var1); // L: 508 + this.onMouseRepeat = this.readListener(var1); // L: 509 + this.onClick = this.readListener(var1); // L: 510 + this.onClickRepeat = this.readListener(var1); // L: 511 + this.onRelease = this.readListener(var1); // L: 512 + this.onHold = this.readListener(var1); // L: 513 + this.onDrag = this.readListener(var1); // L: 514 + this.onDragComplete = this.readListener(var1); // L: 515 + this.onScroll = this.readListener(var1); // L: 516 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 517 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 518 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 519 + } // L: 520 - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lkf;I)[Ljava/lang/Object;", - garbageValue = "1410086858" + descriptor = "(Lkb;I)[Ljava/lang/Object;", + garbageValue = "1938670345" ) + @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 514 - if (var2 == 0) { // L: 515 + int var2 = var1.readUnsignedByte(); // L: 523 + if (var2 == 0) { // L: 524 return null; } else { - Object[] var3 = new Object[var2]; // L: 516 + Object[] var3 = new Object[var2]; // L: 525 - for (int var4 = 0; var4 < var2; ++var4) { // L: 517 - int var5 = var1.readUnsignedByte(); // L: 518 + for (int var4 = 0; var4 < var2; ++var4) { // L: 526 + int var5 = var1.readUnsignedByte(); // L: 527 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 519 - } else if (var5 == 1) { // L: 520 + var3[var4] = new Integer(var1.readInt()); // L: 528 + } else if (var5 == 1) { // L: 529 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 522 - return var3; // L: 523 + this.hasListener = true; // L: 531 + return var3; // L: 532 } } - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkf;I)[I", - garbageValue = "931068469" + descriptor = "(Lkb;S)[I", + garbageValue = "22328" ) + @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 527 - if (var2 == 0) { // L: 528 + int var2 = var1.readUnsignedByte(); // L: 536 + if (var2 == 0) { // L: 537 return null; } else { - int[] var3 = new int[var2]; // L: 529 + int[] var3 = new int[var2]; // L: 538 - for (int var4 = 0; var4 < var2; ++var4) { // L: 530 - var3[var4] = var1.readInt(); // L: 531 + for (int var4 = 0; var4 < var2; ++var4) { // L: 539 + var3[var4] = var1.readInt(); // L: 540 } - return var3; // L: 533 + return var3; // L: 542 } } - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1248652086" + descriptor = "(IIB)V", + garbageValue = "49" ) + @Export("swapItems") public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; // L: 537 - this.itemIds[var2] = this.itemIds[var1]; // L: 538 - this.itemIds[var1] = var3; // L: 539 - var3 = this.itemQuantities[var2]; // L: 540 - this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 541 - this.itemQuantities[var1] = var3; // L: 542 - } // L: 543 + int var3 = this.itemIds[var2]; // L: 546 + this.itemIds[var2] = this.itemIds[var1]; // L: 547 + this.itemIds[var1] = var3; // L: 548 + var3 = this.itemQuantities[var2]; // L: 549 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 550 + this.itemQuantities[var1] = var3; // L: 551 + } // L: 552 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ZB)Llp;", - garbageValue = "-13" + descriptor = "(ZI)Llc;", + garbageValue = "1009735615" ) + @Export("getSprite") public Sprite getSprite(boolean var1) { - field2611 = false; // L: 546 + field2677 = false; // L: 555 int var2; - if (var1) { // L: 548 + if (var1) { // L: 557 var2 = this.spriteId; } else { - var2 = this.spriteId2; // L: 549 + var2 = this.spriteId2; // L: 558 } - if (var2 == -1) { // L: 550 + if (var2 == -1) { // L: 559 return null; } else { - long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); // L: 551 - Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); // L: 552 - if (var5 != null) { // L: 553 + long var3 = ((long)this.spriteShadow << 40) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 560 + Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); // L: 561 + if (var5 != null) { // L: 562 return var5; } else { - var5 = AbstractUserComparator.SpriteBuffer_getSprite(Messages.Widget_spritesArchive, var2, 0); // L: 554 - if (var5 == null) { // L: 555 - field2611 = true; // L: 556 - return null; // L: 557 + var5 = FloorDecoration.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); // L: 563 + if (var5 == null) { // L: 564 + field2677 = true; // L: 565 + return null; // L: 566 } else { - if (this.spriteFlipV) { // L: 559 + if (this.spriteFlipV) { // L: 568 var5.flipVertically(); } - if (this.spriteFlipH) { // L: 560 + if (this.spriteFlipH) { // L: 569 var5.flipHorizontally(); } - if (this.outline > 0) { // L: 561 + if (this.outline > 0) { // L: 570 var5.pad(this.outline); } - if (this.outline >= 1) { // L: 562 + if (this.outline >= 1) { // L: 571 var5.outline(1); } - if (this.outline >= 2) { // L: 563 + if (this.outline >= 2) { // L: 572 var5.outline(16777215); } - if (this.spriteShadow != 0) { // L: 564 + if (this.spriteShadow != 0) { // L: 573 var5.shadow(this.spriteShadow); } - Widget_cachedSprites.put(var5, var3); // L: 565 - return var5; // L: 566 + Widget_cachedSprites.put(var5, var3); // L: 574 + return var5; // L: 575 } } } } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lkq;", + garbageValue = "-1856461280" + ) + @Export("getFont") + public Font getFont() { + field2677 = false; // L: 579 + if (this.fontId == -1) { // L: 580 + return null; + } else { + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 581 + if (var1 != null) { // L: 582 + return var1; + } else { + AbstractArchive var3 = Widget_spritesArchive; // L: 584 + AbstractArchive var4 = Widget_fontsArchive; // L: 585 + int var5 = this.fontId; // L: 586 + byte[] var7 = var3.takeFile(var5, 0); // L: 590 + boolean var6; + if (var7 == null) { // L: 591 + var6 = false; // L: 592 + } else { + class217.SpriteBuffer_decode(var7); // L: 595 + var6 = true; // L: 596 + } + + Font var2; + if (!var6) { // L: 598 + var2 = null; // L: 599 + } else { + var2 = UrlRequester.method3430(var4.takeFile(var5, 0)); // L: 602 + } + + if (var2 != null) { + Widget_cachedFonts.put(var2, (long)this.fontId); // L: 605 + } else { + field2677 = true; // L: 606 + } + + return var2; // L: 607 + } + } + } + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Lkr;", - garbageValue = "-5714739" - ) - public Font getFont() { - field2611 = false; // L: 570 - if (this.fontId == -1) { // L: 571 - return null; - } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 572 - if (var1 != null) { // L: 573 - return var1; - } else { - var1 = RouteStrategy.method3688(Messages.Widget_spritesArchive, HealthBar.Widget_fontsArchive, this.fontId, 0); // L: 574 - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); // L: 575 - } else { - field2611 = true; // L: 576 - } - - return var1; // L: 577 - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IB)Llp;", - garbageValue = "45" + descriptor = "(II)Llc;", + garbageValue = "-521963360" ) + @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2611 = false; // L: 581 - if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 582 - int var2 = this.inventorySprites[var1]; // L: 583 - if (var2 == -1) { // L: 584 + field2677 = false; // L: 611 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 612 + int var2 = this.inventorySprites[var1]; // L: 613 + if (var2 == -1) { // L: 614 return null; } else { - Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); // L: 585 - if (var3 != null) { // L: 586 + Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); // L: 615 + if (var3 != null) { // L: 616 return var3; } else { - var3 = AbstractUserComparator.SpriteBuffer_getSprite(Messages.Widget_spritesArchive, var2, 0); // L: 587 - if (var3 != null) { // L: 588 + var3 = FloorDecoration.SpriteBuffer_getSprite(Widget_spritesArchive, var2, 0); // L: 617 + if (var3 != null) { // L: 618 Widget_cachedSprites.put(var3, (long)var2); } else { - field2611 = true; // L: 589 + field2677 = true; // L: 619 } - return var3; // L: 590 + return var3; // L: 620 } } } else { @@ -1230,286 +1396,174 @@ public class Widget extends Node { } } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljm;IZLha;I)Ler;", - garbageValue = "-1710688056" + descriptor = "(Ljg;IZLhu;I)Leh;", + garbageValue = "1269686702" ) + @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2611 = false; // L: 594 + field2677 = false; // L: 624 int var5; int var6; - if (var3) { // L: 597 - var5 = this.modelType2; // L: 598 - var6 = this.modelId2; // L: 599 + if (var3) { // L: 627 + var5 = this.modelType2; // L: 628 + var6 = this.modelId2; // L: 629 } else { - var5 = this.modelType; // L: 602 - var6 = this.modelId; // L: 603 + var5 = this.modelType; // L: 632 + var6 = this.modelId; // L: 633 } - if (var5 == 0) { // L: 605 + if (var5 == 0) { // L: 635 return null; - } else if (var5 == 1 && var6 == -1) { // L: 606 + } else if (var5 == 1 && var6 == -1) { // L: 636 return null; } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 607 - if (var7 == null) { // L: 608 + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 637 + if (var7 == null) { // L: 638 ModelData var8; - if (var5 == 1) { // L: 610 - var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); // L: 611 - if (var8 == null) { // L: 612 - field2611 = true; // L: 613 - return null; // L: 614 + if (var5 == 1) { // L: 640 + var8 = ModelData.ModelData_get(GameBuild.Widget_modelsArchive, var6, 0); // L: 641 + if (var8 == null) { // L: 642 + field2677 = true; // L: 643 + return null; // L: 644 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 616 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 646 } - if (var5 == 2) { // L: 618 - var8 = Skeleton.getNpcDefinition(var6).getModelData(); // L: 619 - if (var8 == null) { // L: 620 - field2611 = true; // L: 621 - return null; // L: 622 + if (var5 == 2) { // L: 648 + var8 = Clock.getNpcDefinition(var6).getModelData(); // L: 649 + if (var8 == null) { // L: 650 + field2677 = true; // L: 651 + return null; // L: 652 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 624 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 654 } - if (var5 == 3) { // L: 626 - if (var4 == null) { // L: 627 + if (var5 == 3) { // L: 656 + if (var4 == null) { // L: 657 return null; } - var8 = var4.getModelData(); // L: 628 - if (var8 == null) { // L: 629 - field2611 = true; // L: 630 - return null; // L: 631 + var8 = var4.getModelData(); // L: 658 + if (var8 == null) { // L: 659 + field2677 = true; // L: 660 + return null; // L: 661 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 633 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 663 } - if (var5 == 4) { // L: 635 - ItemDefinition var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 636 - var8 = var9.getModelData(10); // L: 637 - if (var8 == null) { // L: 638 - field2611 = true; // L: 639 - return null; // L: 640 + if (var5 == 4) { // L: 665 + ItemDefinition var9 = AbstractWorldMapData.ItemDefinition_get(var6); // L: 666 + var8 = var9.getModelData(10); // L: 667 + if (var8 == null) { // L: 668 + field2677 = true; // L: 669 + return null; // L: 670 } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 642 + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 672 } - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 644 + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 674 } - if (var1 != null) { // L: 646 - var7 = var1.transformWidgetModel(var7, var2); // L: 647 + if (var1 != null) { // L: 676 + var7 = var1.transformWidgetModel(var7, var2); // L: 677 } - return var7; // L: 649 + return var7; // L: 679 } } - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ZI)Lhz;", - garbageValue = "1282321676" + descriptor = "(ZB)Lho;", + garbageValue = "-13" ) + @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 653 + if (this.spriteId == -1) { // L: 683 var1 = false; } - int var2 = var1 ? this.spriteId * 1800888721 * -250118287 : this.spriteId2 * -408987673 * -1969239081; // L: 654 - if (var2 == -1) { // L: 655 + int var2 = var1 ? this.spriteId * -402783927 * -1960132359 : this.spriteId2 * 372301921 * -755383391; // L: 684 + if (var2 == -1) { // L: 685 return null; } else { - long var3 = ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 656 - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 657 - if (var5 != null) { // L: 658 + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.spriteShadow << 40); // L: 686 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 687 + if (var5 != null) { // L: 688 return var5; } else { - Sprite var6 = this.getSprite(var1); // L: 659 - if (var6 == null) { // L: 660 + Sprite var6 = this.getSprite(var1); // L: 689 + if (var6 == null) { // L: 690 return null; } else { - Sprite var7 = var6.copyNormalized(); // L: 661 - int[] var8 = new int[var7.subHeight]; // L: 662 - int[] var9 = new int[var7.subHeight]; // L: 663 + Sprite var7 = var6.copyNormalized(); // L: 691 + int[] var8 = new int[var7.subHeight]; // L: 692 + int[] var9 = new int[var7.subHeight]; // L: 693 - for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 664 - int var11 = 0; // L: 665 - int var12 = var7.subWidth; // L: 666 + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 694 + int var11 = 0; // L: 695 + int var12 = var7.subWidth; // L: 696 int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 667 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 668 - var11 = var13; // L: 669 + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 697 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 698 + var11 = var13; // L: 699 break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 673 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 674 - var12 = var13 + 1; // L: 675 + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 703 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 704 + var12 = var13 + 1; // L: 705 break; } } - var8[var10] = var11; // L: 679 - var9[var10] = var12 - var11; // L: 680 + var8[var10] = var11; // L: 709 + var9[var10] = var12 - var11; // L: 710 } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 682 - Widget_cachedSpriteMasks.put(var5, var3); // L: 683 - return var5; // L: 684 + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 712 + Widget_cachedSpriteMasks.put(var5, var3); // L: 713 + return var5; // L: 714 } } } } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-1337078024" + garbageValue = "1671583868" ) + @Export("setAction") public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { // L: 695 - String[] var3 = new String[var1 + 1]; // L: 696 - if (this.actions != null) { // L: 697 - for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 698 + if (this.actions == null || this.actions.length <= var1) { // L: 718 + String[] var3 = new String[var1 + 1]; // L: 719 + if (this.actions != null) { // L: 720 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 721 var3[var4] = this.actions[var4]; } } - this.actions = var3; // L: 700 + this.actions = var3; // L: 723 } - this.actions[var1] = var2; // L: 702 - } // L: 703 + this.actions[var1] = var2; // L: 725 + } // L: 726 - @ObfuscatedName("k") + @ObfuscatedName("gd") @ObfuscatedSignature( - descriptor = "(Lln;ZI)V", - garbageValue = "-846882241" + descriptor = "(B)Z", + garbageValue = "0" ) - public static void method4173(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { // L: 193 - try { - NetCache.NetCache_socket.close(); // L: 195 - } catch (Exception var8) { // L: 197 - } - - NetCache.NetCache_socket = null; // L: 198 - } - - NetCache.NetCache_socket = var0; // L: 200 - Buffer var2; - if (NetCache.NetCache_socket != null) { // L: 202 - try { - var2 = new Buffer(4); // L: 204 - var2.writeByte(var1 ? 2 : 3); // L: 205 - var2.writeMedium(0); // L: 206 - NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 207 - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); // L: 211 - } catch (Exception var6) { // L: 213 - } - - ++NetCache.NetCache_ioExceptions; // L: 214 - NetCache.NetCache_socket = null; // L: 215 - } - } - - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 218 - TilePaint.NetCache_currentResponse = null; // L: 219 - class224.NetCache_responseArchiveBuffer = null; // L: 220 - NetCache.field3205 = 0; // L: 221 - - while (true) { - NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 223 - if (var9 == null) { // L: 224 - while (true) { - var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 230 - if (var9 == null) { // L: 231 - if (NetCache.field3208 != 0) { // L: 237 - try { - var2 = new Buffer(4); // L: 239 - var2.writeByte(4); // L: 240 - var2.writeByte(NetCache.field3208); // L: 241 - var2.writeShort(0); // L: 242 - NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 243 - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); // L: 247 - } catch (Exception var4) { // L: 249 - } - - ++NetCache.NetCache_ioExceptions; // L: 250 - NetCache.NetCache_socket = null; // L: 251 - } - } - - NetCache.NetCache_loadTime = 0; // L: 254 - NetCache.field3195 = PacketWriter.currentTimeMillis(); // L: 255 - return; // L: 256 - } - - NetCache.NetCache_pendingWritesQueue.addLast(var9); // L: 232 - NetCache.NetCache_pendingWrites.put(var9, var9.key); // L: 233 - ++NetCache.NetCache_pendingWritesCount; // L: 234 - --NetCache.NetCache_pendingResponsesCount; // L: 235 - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); // L: 225 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 226 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 227 - } + static boolean method4239() { + return (Client.drawPlayerNames & 2) != 0; // L: 4922 } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Liw;IS)V", - garbageValue = "1604" - ) - static void method4174(Archive var0, int var1) { - if (MenuAction.NetCache_reference != null) { // L: 259 - MenuAction.NetCache_reference.offset = var1 * 8 + 5; // L: 260 - int var2 = MenuAction.NetCache_reference.readInt(); // L: 261 - int var3 = MenuAction.NetCache_reference.readInt(); // L: 262 - var0.loadIndex(var2, var3); // L: 263 - } else { - Varps.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 266 - NetCache.NetCache_archives[var1] = var0; // L: 267 - } - } // L: 264 268 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "37" - ) - public static boolean method4172(int var0) { - return (var0 >> 29 & 1) != 0; // L: 25 - } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "757638710" - ) - static final void method4175(int var0) { - if (var0 >= 0) { // L: 7239 - int var1 = Client.menuArguments1[var0]; // L: 7240 - int var2 = Client.menuArguments2[var0]; // L: 7241 - int var3 = Client.menuOpcodes[var0]; // L: 7242 - int var4 = Client.menuIdentifiers[var0]; // L: 7243 - String var5 = Client.menuActions[var0]; // L: 7244 - String var6 = Client.menuTargets[var0]; // L: 7245 - SecureRandomCallable.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7246 - } - } // L: 7247 } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index f0a470add7..42e16f926c 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -1,51 +1,77 @@ +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("ct") +@ObfuscatedName("cf") +@Implements("World") public class World { + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1210898659 + ) + @Export("World_count") + static int World_count; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1957007005 + ) + @Export("World_listCount") + static int World_listCount; + @ObfuscatedName("c") + @Export("World_sortOption2") + static int[] World_sortOption2; + @ObfuscatedName("u") + @Export("World_sortOption1") + static int[] World_sortOption1; + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "[Llc;" + ) + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; + @ObfuscatedName("ht") + @ObfuscatedGetter( + intValue = 1159940701 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 2091631839 + ) + @Export("id") + int id; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1992113923 + intValue = -1024222647 ) - static int World_count; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1564802557 - ) - static int World_listCount; - @ObfuscatedName("w") - static int[] World_sortOption2; - @ObfuscatedName("g") - static int[] World_sortOption1; + @Export("properties") + int properties; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1790821377 - ) - int id; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -370098411 - ) - int properties; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1089553333 + intValue = 407096125 ) + @Export("population") int population; - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("host") String host; - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("activity") String activity; - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -82869953 + intValue = 362603231 ) + @Export("location") int location; - @ObfuscatedName("f") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1577335433 + intValue = 271602597 ) + @Export("index") int index; static { @@ -58,85 +84,83 @@ public class World { World() { } // L: 27 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "17" + descriptor = "(I)Z", + garbageValue = "-5354489" ) + @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; // L: 247 } + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-677783544" + ) + boolean method1901() { + return (2 & this.properties) != 0; // L: 251 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1450485210" + ) + @Export("isPvp") + boolean isPvp() { + return (4 & this.properties) != 0; // L: 255 + } + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-2022198526" + garbageValue = "-920722517" ) - boolean method1821() { - return (2 & this.properties) != 0; // L: 251 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1058529393" - ) - boolean isPvp() { - return (4 & this.properties) != 0; // L: 255 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-973887328" - ) - boolean method1823() { + boolean method1888() { return (8 & this.properties) != 0; // L: 259 } - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-101" + descriptor = "(I)Z", + garbageValue = "233132577" ) + @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; // L: 263 } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-249036975" + descriptor = "(B)Z", + garbageValue = "50" ) + @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; // L: 267 } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1700714003" + descriptor = "(B)Z", + garbageValue = "1" ) - boolean method1826() { + boolean method1880() { return (1073741824 & this.properties) != 0; // L: 271 } - @ObfuscatedName("k") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-1732366534" + descriptor = "(IZIZI)V", + garbageValue = "-738767899" ) - public static boolean isNumber(CharSequence var0) { - return class92.method2141(var0, 10, true); // L: 34 - } + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (DefaultsGroup.World_worlds != null) { // L: 171 + class1.doWorldSorting(0, DefaultsGroup.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 + } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIS)I", - garbageValue = "500" - ) - static int method1845(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 313 - return TilePaint.NetCache_currentResponse != null && var2 == TilePaint.NetCache_currentResponse.key ? class224.NetCache_responseArchiveBuffer.offset * 99 / (class224.NetCache_responseArchiveBuffer.array.length - TilePaint.NetCache_currentResponse.padding) + 1 : 0; // L: 314 315 - } + } // L: 174 } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 30edfd2cbd..9c60092f6e 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -4,241 +4,286 @@ import java.util.HashSet; import java.util.Iterator; 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; -@ObfuscatedName("mx") +@ObfuscatedName("mi") +@Implements("WorldMap") public class WorldMap { - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkz;" + descriptor = "Lko;" ) + @Export("fontNameVerdana11") static final FontName fontNameVerdana11; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("fontNameVerdana13") + static final FontName fontNameVerdana13; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lko;" + ) + @Export("fontNameVerdana15") + static final FontName fontNameVerdana15; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("WorldMap_archive") + AbstractArchive WorldMap_archive; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("WorldMap_geographyArchive") + AbstractArchive WorldMap_geographyArchive; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("WorldMap_groundArchive") + AbstractArchive WorldMap_groundArchive; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkz;" - ) - static final FontName fontNameVerdana13; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lkz;" - ) - static final FontName fontNameVerdana15; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - AbstractArchive WorldMap_archive; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "Lkq;" ) + @Export("font") Font font; - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("fonts") HashMap fonts; - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lls;" + descriptor = "[Lle;" ) + @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("c") + @ObfuscatedName("r") + @Export("details") HashMap details; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lar;" - ) - WorldMapArea mainMapArea; @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lak;" ) - WorldMapArea currentMapArea; - @ObfuscatedName("v") + @Export("mainMapArea") + WorldMapArea mainMapArea; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Lak;" ) - WorldMapArea field3995; + @Export("currentMapArea") + WorldMapArea currentMapArea; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Lak;" ) - WorldMapManager worldMapManager; - @ObfuscatedName("r") + WorldMapArea field3995; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmd;" + descriptor = "Lat;" ) + @Export("worldMapManager") + WorldMapManager worldMapManager; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lma;" + ) + @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -611163949 + intValue = -1285200665 ) + @Export("centerTileX") int centerTileX; - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1065399067 + intValue = -1921873827 ) + @Export("centerTileY") int centerTileY; - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -681769299 + intValue = 975563565 ) + @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1693054595 + intValue = 602728647 ) + @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("e") + @ObfuscatedName("i") + @Export("zoom") float zoom; @ObfuscatedName("ab") + @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1569686885 + intValue = -265310855 ) + @Export("worldMapDisplayWidth") int worldMapDisplayWidth; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 358605679 + intValue = -497921421 ) + @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -2122847541 + intValue = 1466269365 ) + @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = -2116246555 - ) - int worldMapDisplayY; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = 52853051 - ) - int maxFlashCount; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = 1639517063 - ) - int cyclesPerFlash; - @ObfuscatedName("au") - boolean perpetualFlash; - @ObfuscatedName("aa") - HashSet flashingElements; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = 1602251249 - ) - int flashCount; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = -1930209769 - ) - int flashCycle; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = -2046405399 - ) - int field4037; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = -1792714989 - ) - int field4015; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = 517874941 - ) - int field4034; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -86397235 + intValue = 1810186345 ) - int field4017; + @Export("worldMapDisplayY") + int worldMapDisplayY; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = 1907516453 + ) + @Export("maxFlashCount") + int maxFlashCount; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = -1084516547 + ) + @Export("cyclesPerFlash") + int cyclesPerFlash; + @ObfuscatedName("ah") + @Export("perpetualFlash") + boolean perpetualFlash; + @ObfuscatedName("az") + @Export("flashingElements") + HashSet flashingElements; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = -1272835311 + ) + @Export("flashCount") + int flashCount; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = 1158286595 + ) + @Export("flashCycle") + int flashCycle; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = 977802637 + ) + int field4024; @ObfuscatedName("ax") @ObfuscatedGetter( - longValue = 599475952816375777L + intValue = 1843671129 ) - long field4018; - @ObfuscatedName("as") + int field4025; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1972713683 + intValue = -413712101 ) - int field4028; - @ObfuscatedName("az") + int field4026; + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1655893285 - ) - int field4035; - @ObfuscatedName("ad") - boolean field4021; - @ObfuscatedName("aj") - HashSet enabledElements; - @ObfuscatedName("aw") - HashSet enabledCategories; - @ObfuscatedName("af") - HashSet enabledElementIds; - @ObfuscatedName("ak") - HashSet field4025; - @ObfuscatedName("ac") - boolean elementsDisabled; - @ObfuscatedName("bl") - @ObfuscatedGetter( - intValue = -1876166455 + intValue = -1365818697 ) int field4027; - @ObfuscatedName("bz") - final int[] menuOpcodes; - @ObfuscatedName("bj") - List field4029; - @ObfuscatedName("bh") - Iterator iconIterator; - @ObfuscatedName("bi") - HashSet field4007; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lhg;" + @ObfuscatedName("aw") + @ObfuscatedGetter( + longValue = -8715931618239812219L ) - Coord mouseCoord; - @ObfuscatedName("br") - public boolean showCoord; + long field3988; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 718100987 + ) + int field4029; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = 813311499 + ) + int field4033; + @ObfuscatedName("aa") + boolean field4031; + @ObfuscatedName("aj") + @Export("enabledElements") + HashSet enabledElements; + @ObfuscatedName("ae") + @Export("enabledCategories") + HashSet enabledCategories; + @ObfuscatedName("al") + @Export("enabledElementIds") + HashSet enabledElementIds; + @ObfuscatedName("ap") + HashSet field4010; + @ObfuscatedName("ad") + @Export("elementsDisabled") + boolean elementsDisabled; + @ObfuscatedName("bb") + @ObfuscatedGetter( + intValue = 1745024237 + ) + int field4037; @ObfuscatedName("bp") + @Export("menuOpcodes") + final int[] menuOpcodes; + @ObfuscatedName("bg") + List field4003; + @ObfuscatedName("bc") + @Export("iconIterator") + Iterator iconIterator; + @ObfuscatedName("bj") + HashSet field4041; + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lhw;" ) - Sprite sprite; + @Export("mouseCoord") + Coord mouseCoord; @ObfuscatedName("bn") - @ObfuscatedGetter( - intValue = -1176520287 + @Export("showCoord") + public boolean showCoord; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Llc;" ) - int cachedPixelsPerTile; - @ObfuscatedName("bw") - @ObfuscatedGetter( - intValue = 627351645 - ) - int minCachedTileX; + @Export("sprite") + Sprite sprite; @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 357245399 + intValue = 1733644049 ) - int minCachedTileY; - @ObfuscatedName("bu") + @Export("cachedPixelsPerTile") + int cachedPixelsPerTile; + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -486020465 + intValue = -237601579 ) - int field4038; + @Export("minCachedTileX") + int minCachedTileX; + @ObfuscatedName("bt") + @ObfuscatedGetter( + intValue = 753914953 + ) + @Export("minCachedTileY") + int minCachedTileY; + @ObfuscatedName("bw") + @ObfuscatedGetter( + intValue = -1869185885 + ) + int field4048; static { fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 @@ -259,31 +304,32 @@ public class WorldMap { this.flashingElements = null; // L: 71 this.flashCount = -1; // L: 72 this.flashCycle = -1; // L: 73 - this.field4037 = -1; // L: 74 - this.field4015 = -1; // L: 75 - this.field4034 = -1; // L: 76 - this.field4017 = -1; // L: 77 - this.field4021 = true; // L: 81 + this.field4024 = -1; // L: 74 + this.field4025 = -1; // L: 75 + this.field4026 = -1; // L: 76 + this.field4027 = -1; // L: 77 + this.field4031 = true; // L: 81 this.enabledElements = new HashSet(); // L: 84 this.enabledCategories = new HashSet(); // L: 85 this.enabledElementIds = new HashSet(); // L: 86 - this.field4025 = new HashSet(); // L: 87 + this.field4010 = new HashSet(); // L: 87 this.elementsDisabled = false; // L: 88 - this.field4027 = 0; // L: 89 + this.field4037 = 0; // L: 89 this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field4007 = new HashSet(); // L: 94 + this.field4041 = new HashSet(); // L: 94 this.mouseCoord = null; // L: 95 this.showCoord = false; // L: 96 this.minCachedTileX = -1; // L: 99 this.minCachedTileY = -1; // L: 100 - this.field4038 = -1; // L: 101 + this.field4048 = -1; // L: 101 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;Lic;Lic;Lkr;Ljava/util/HashMap;[Lls;I)V", - garbageValue = "-926248913" + descriptor = "(Liw;Liw;Liw;Lkq;Ljava/util/HashMap;[Lle;I)V", + garbageValue = "848642369" ) + @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { this.mapSceneSprites = var6; // L: 105 this.WorldMap_archive = var1; // L: 106 @@ -295,7 +341,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112 this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113 this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114 - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field322.name); // L: 115 + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field320.name); // L: 115 int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 this.details = new HashMap(var8.length); // L: 117 @@ -313,20 +359,21 @@ public class WorldMap { this.field3995 = null; // L: 128 } // L: 129 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "680469506" + descriptor = "(B)V", + garbageValue = "-96" ) - public void method6428() { + public void method6454() { WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 } // L: 135 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIZIIIII)V", - garbageValue = "-1994141756" + garbageValue = "-2023472681" ) + @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { if (this.cacheLoader.isLoaded()) { // L: 138 this.smoothZoom(); // L: 141 @@ -334,27 +381,27 @@ public class WorldMap { if (var3) { // L: 143 int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146 int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147 - List var10 = this.worldMapManager.method721(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); // L: 148 + List var10 = this.worldMapManager.method738(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); // L: 148 HashSet var11 = new HashSet(); // L: 149 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); Script.runScriptEvent(var14)) { // L: 150 163 + for (var12 = var10.iterator(); var12.hasNext(); Entity.runScriptEvent(var14)) { // L: 150 163 var13 = (AbstractWorldMapIcon)var12.next(); // L: 151 var11.add(var13); // L: 153 var14 = new ScriptEvent(); // L: 154 var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155 var14.setArgs(new Object[]{var15, var1, var2}); // L: 156 - if (this.field4007.contains(var13)) { // L: 157 + if (this.field4041.contains(var13)) { // L: 157 var14.setType(17); // L: 158 } else { var14.setType(15); // L: 161 } } - var12 = this.field4007.iterator(); // L: 166 + var12 = this.field4041.iterator(); // L: 166 while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 @@ -363,72 +410,72 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171 var14.setArgs(new Object[]{var15, var1, var2}); // L: 172 var14.setType(16); // L: 173 - Script.runScriptEvent(var14); // L: 174 + Entity.runScriptEvent(var14); // L: 174 } } - this.field4007 = var11; // L: 178 + this.field4041 = var11; // L: 178 } } } // L: 139 144 179 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIZZB)V", - garbageValue = "81" + garbageValue = "0" ) - public void method6430(int var1, int var2, boolean var3, boolean var4) { - long var5 = PacketWriter.currentTimeMillis(); // L: 182 - this.method6431(var1, var2, var4, var5); // L: 183 + public void method6456(int var1, int var2, boolean var3, boolean var4) { + long var5 = User.currentTimeMillis(); // L: 182 + this.method6457(var1, var2, var4, var5); // L: 183 if (this.hasTarget() || !var4 && !var3) { // L: 184 - this.method6439(); // L: 198 + this.method6461(); // L: 198 } else { if (var4) { // L: 185 - this.field4034 = var1; // L: 186 - this.field4017 = var2; // L: 187 - this.field4037 = this.centerTileX; // L: 188 - this.field4015 = this.centerTileY; // L: 189 + this.field4026 = var1; // L: 186 + this.field4027 = var2; // L: 187 + this.field4024 = this.centerTileX; // L: 188 + this.field4025 = this.centerTileY; // L: 189 } - if (this.field4037 != -1) { // L: 191 - int var7 = var1 - this.field4034; // L: 192 - int var8 = var2 - this.field4017; // L: 193 - this.setWorldMapPosition(this.field4037 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4015, false); // L: 194 + if (this.field4024 != -1) { // L: 191 + int var7 = var1 - this.field4026; // L: 192 + int var8 = var2 - this.field4027; // L: 193 + this.setWorldMapPosition(this.field4024 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4025, false); // L: 194 } } if (var4) { // L: 200 - this.field4018 = var5; // L: 201 - this.field4028 = var1; // L: 202 - this.field4035 = var2; // L: 203 + this.field3988 = var5; // L: 201 + this.field4029 = var1; // L: 202 + this.field4033 = var2; // L: 203 } } // L: 205 - @ObfuscatedName("i") - void method6431(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("z") + void method6457(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { // L: 208 int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209 int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210 this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211 if (this.mouseCoord != null && var3) { // L: 212 - if (JagexCache.method3576() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 213 - class92.method2143(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 214 + if (MilliClock.method3590() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 213 + class2.method42(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 214 } else { boolean var8 = true; // L: 217 - if (this.field4021) { // L: 218 - int var9 = var1 - this.field4028; // L: 219 - int var10 = var2 - this.field4035; // L: 220 - if (var4 - this.field4018 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 221 + if (this.field4031) { // L: 218 + int var9 = var1 - this.field4029; // L: 219 + int var10 = var2 - this.field4033; // L: 220 + if (var4 - this.field3988 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 221 var8 = false; // L: 222 } } if (var8) { // L: 225 - PacketBufferNode var11 = Client.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); // L: 226 - var11.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 227 + PacketBufferNode var11 = class4.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); // L: 226 + var11.packetBuffer.method5682(this.mouseCoord.packed()); // L: 227 Client.packetWriter.addNode(var11); // L: 228 - this.field4018 = 0L; // L: 229 + this.field3988 = 0L; // L: 229 } } } @@ -438,17 +485,18 @@ public class WorldMap { } // L: 235 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1666598951" + descriptor = "(B)V", + garbageValue = "116" ) + @Export("smoothZoom") void smoothZoom() { - if (ModelData0.field1901 != null) { // L: 238 + if (ModelData0.field1895 != null) { // L: 238 this.zoom = this.zoomTarget; // L: 239 } else { if (this.zoom < this.zoomTarget) { // L: 242 - this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 243 + this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 243 } if (this.zoom > this.zoomTarget) { // L: 245 @@ -458,11 +506,12 @@ public class WorldMap { } } // L: 240 248 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1854206843" ) + @Export("scrollToTarget") void scrollToTarget() { if (this.hasTarget()) { // L: 251 int var1 = this.worldMapTargetX - this.centerTileX; // L: 254 @@ -476,7 +525,7 @@ public class WorldMap { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 262 - if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 263 + if (this.centerTileX == this.worldMapTargetX && this.worldMapTargetY == this.centerTileY) { // L: 263 this.worldMapTargetX = -1; // L: 264 this.worldMapTargetY = -1; // L: 265 } @@ -484,53 +533,56 @@ public class WorldMap { } } // L: 252 267 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "1721878015" + garbageValue = "-628039810" ) + @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; // L: 270 this.centerTileY = var2; // L: 271 - PacketWriter.currentTimeMillis(); // L: 272 + User.currentTimeMillis(); // L: 272 if (var3) { - this.method6439(); // L: 273 + this.method6461(); // L: 273 } } // L: 274 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-29" + descriptor = "(I)V", + garbageValue = "1439565697" ) - final void method6439() { - this.field4017 = -1; // L: 277 - this.field4034 = -1; // L: 278 - this.field4015 = -1; // L: 279 - this.field4037 = -1; // L: 280 + final void method6461() { + this.field4027 = -1; // L: 277 + this.field4026 = -1; // L: 278 + this.field4025 = -1; // L: 279 + this.field4024 = -1; // L: 280 } // L: 281 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2112762378" + garbageValue = "-116080135" ) + @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 284 } - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIB)Lar;", - garbageValue = "-8" + descriptor = "(IIII)Lak;", + garbageValue = "-1599719722" ) + @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { Iterator var4 = this.details.values().iterator(); // L: 288 WorldMapArea var5; do { - if (!var4.hasNext()) { + if (!var4.hasNext()) { // L: 295 return null; // L: 296 } @@ -540,12 +592,12 @@ public class WorldMap { return var5; // L: 292 } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIZI)V", - garbageValue = "1089137052" + garbageValue = "-1947716560" ) - public void method6482(int var1, int var2, int var3, boolean var4) { + public void method6464(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 300 if (var5 == null) { // L: 301 if (!var4) { // L: 302 @@ -568,11 +620,12 @@ public class WorldMap { } // L: 316 - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-5" + descriptor = "(II)V", + garbageValue = "-1528896195" ) + @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { WorldMapArea var2 = this.getMapArea(var1); // L: 319 if (var2 != null) { // L: 320 @@ -581,29 +634,32 @@ public class WorldMap { } // L: 323 - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "84" + garbageValue = "1" ) + @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 326 327 329 } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)Lar;", - garbageValue = "-64" + descriptor = "(I)Lak;", + garbageValue = "-1553357344" ) + @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; // L: 333 } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lar;I)V", - garbageValue = "65867668" + descriptor = "(Lak;I)V", + garbageValue = "-479215549" ) + @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 337 this.initializeWorldMapManager(var1); // L: 340 @@ -611,23 +667,24 @@ public class WorldMap { } } // L: 338 342 - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lar;I)V", - garbageValue = "-1701354489" + descriptor = "(Lak;I)V", + garbageValue = "-218419929" ) + @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { this.currentMapArea = var1; // L: 345 this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 346 this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 347 } // L: 348 - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lar;Lhg;Lhg;ZB)V", - garbageValue = "65" + descriptor = "(Lak;Lhw;Lhw;ZB)V", + garbageValue = "106" ) - public void method6549(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method6470(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { // L: 351 if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 354 this.initializeWorldMapManager(var1); // L: 355 @@ -642,11 +699,12 @@ public class WorldMap { } } // L: 352 363 - @ObfuscatedName("u") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(IIIB)V", - garbageValue = "-6" + garbageValue = "-86" ) + @Export("jump") void jump(int var1, int var2, int var3) { if (this.currentMapArea != null) { // L: 366 int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 369 @@ -659,17 +717,18 @@ public class WorldMap { this.worldMapTargetY = -1; // L: 375 this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 376 this.zoomTarget = this.zoom; // L: 377 - this.field4029 = null; // L: 378 + this.field4003 = null; // L: 378 this.iconIterator = null; // L: 379 this.worldMapManager.clearIcons(); // L: 380 } } // L: 367 381 - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(IIIIII)V", - garbageValue = "1145142542" + garbageValue = "-1854887081" ) + @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { int[] var6 = new int[4]; // L: 384 Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 385 @@ -703,16 +762,16 @@ public class WorldMap { 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); // L: 411 if (!this.elementsDisabled) { // L: 412 boolean var10 = false; // L: 413 - if (var5 - this.field4027 > 100) { // L: 414 - this.field4027 = var5; // L: 415 + if (var5 - this.field4037 > 100) { // L: 414 + this.field4037 = var5; // L: 415 var10 = true; // L: 416 } - 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.field4025, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 418 + 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.field4010, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 418 } - this.method6448(var1, var2, var3, var4, var8, var9); // L: 420 - if (JagexCache.method3576() && this.showCoord && this.mouseCoord != null) { // L: 421 + this.method6474(var1, var2, var3, var4, var8, var9); // L: 420 + if (MilliClock.method3590() && this.showCoord && this.mouseCoord != null) { // L: 421 this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -724,19 +783,19 @@ public class WorldMap { } } // L: 391 427 - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIIIII)Z", - garbageValue = "-1751443053" + garbageValue = "-982047358" ) - boolean method6447(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6473(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { // L: 430 return true; } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 431 if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 432 return true; - } else if (this.field4038 != Client.field946) { // L: 433 - return true; + } else if (this.field4048 != Client.field950) { + return true; // L: 433 } else if (var3 <= 0 && var4 <= 0) { // L: 434 return var3 + var1 < var5 || var2 + var4 < var6; // L: 435 } else { @@ -747,13 +806,13 @@ public class WorldMap { } } - @ObfuscatedName("l") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "1983443961" + garbageValue = "1221811124" ) - void method6448(int var1, int var2, int var3, int var4, int var5, int var6) { - if (ModelData0.field1901 != null) { // L: 440 + void method6474(int var1, int var2, int var3, int var4, int var5, int var6) { + if (ModelData0.field1895 != null) { // L: 440 int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 441 int var8 = var3 + 512; // L: 442 int var9 = var4 + 512; // L: 443 @@ -764,7 +823,7 @@ public class WorldMap { int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 448 int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 449 int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 450 - if (this.method6447(var8, var9, var13, var14, var3, var4)) { // L: 451 + if (this.method6473(var8, var9, var13, var14, var3, var4)) { // L: 451 if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 452 Arrays.fill(this.sprite.pixels, 0); // L: 455 } else { @@ -774,27 +833,28 @@ public class WorldMap { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 456 this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 457 this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 458 - ModelData0.field1901.method4410(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 459 - this.field4038 = Client.field946; // L: 460 + ModelData0.field1895.method4475(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 459 + this.field4048 = Client.field950; // L: 460 var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 461 var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 462 } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 464 - if (var10 == 1.0F) { // L: 465 - this.sprite.method6260(var13, var14, 192); // L: 466 + if (1.0F == var10) { // L: 465 + this.sprite.method6290(var13, var14, 192); // L: 466 } else { - this.sprite.method6278(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 469 + this.sprite.method6293(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 469 } } } // L: 472 - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-31" + descriptor = "(IIIII)V", + garbageValue = "973687295" ) + @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { if (this.cacheLoader.isLoaded()) { // L: 475 if (!this.worldMapManager.isLoaded()) { // L: 478 @@ -811,17 +871,19 @@ public class WorldMap { @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1877509796" + garbageValue = "1066180861" ) + @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); // L: 488 } // L: 489 - @ObfuscatedName("ag") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1108867958" + descriptor = "(IIIIIB)V", + garbageValue = "9" ) + @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { byte var6 = 20; // L: 492 int var7 = var3 / 2 + var1; // L: 493 @@ -829,21 +891,22 @@ public class WorldMap { Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 495 Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 496 Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 497 - this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); // L: 498 + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 498 } // L: 499 @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)F", - garbageValue = "55" + descriptor = "(II)F", + garbageValue = "1491201346" ) + @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { if (var1 == 25) { // L: 502 return 1.0F; } else if (var1 == 37) { // L: 503 return 1.5F; - } else if (var1 == 50) { - return 2.0F; // L: 504 + } else if (var1 == 50) { // L: 504 + return 2.0F; } else if (var1 == 75) { // L: 505 return 3.0F; } else { @@ -851,48 +914,52 @@ public class WorldMap { } } - @ObfuscatedName("ae") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1167531031" + garbageValue = "-261728144" ) + @Export("getZoomLevel") public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { // L: 511 + if ((double)this.zoomTarget == 1.0D) { // L: 511 return 25; - } else if (1.5D == (double)this.zoomTarget) { // L: 512 + } else if ((double)this.zoomTarget == 1.5D) { // L: 512 return 37; } else if ((double)this.zoomTarget == 2.0D) { // L: 513 return 50; - } else if ((double)this.zoomTarget == 3.0D) { - return 75; // L: 514 + } else if ((double)this.zoomTarget == 3.0D) { // L: 514 + return 75; } else { - return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 515 516 + return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 515 516 } } - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1132818911" + garbageValue = "1032558196" ) + @Export("loadCache") public void loadCache() { this.cacheLoader.load(); // L: 520 } // L: 521 - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-683321726" + descriptor = "(B)Z", + garbageValue = "79" ) + @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); // L: 524 } - @ObfuscatedName("aa") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II)Lar;", - garbageValue = "-1578034984" + descriptor = "(II)Lak;", + garbageValue = "-439250111" ) + @Export("getMapArea") public WorldMapArea getMapArea(int var1) { Iterator var2 = this.details.values().iterator(); // L: 528 @@ -908,11 +975,12 @@ public class WorldMap { return var3; // L: 532 } - @ObfuscatedName("ar") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1263582707" + garbageValue = "-2025872140" ) + @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 540 this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 543 @@ -920,11 +988,12 @@ public class WorldMap { } } // L: 541 545 - @ObfuscatedName("at") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-39" + descriptor = "(III)V", + garbageValue = "-17498359" ) + @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { if (this.currentMapArea != null) { // L: 548 this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 551 @@ -933,11 +1002,12 @@ public class WorldMap { } } // L: 549 554 - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1993790921" + garbageValue = "2008714912" ) + @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { if (this.currentMapArea != null) { // L: 557 int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 560 @@ -948,11 +1018,12 @@ public class WorldMap { } } // L: 558 564 - @ObfuscatedName("al") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-367968117" + garbageValue = "-229646497" ) + @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { if (this.currentMapArea != null) { // L: 567 int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 570 @@ -963,56 +1034,62 @@ public class WorldMap { } } // L: 568 574 - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1157589126" + garbageValue = "951202457" ) + @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 577 578 580 } - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "423694608" + garbageValue = "1338500531" ) + @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 584 585 587 } - @ObfuscatedName("ax") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(I)Lhg;", - garbageValue = "1327996030" + descriptor = "(I)Lhw;", + garbageValue = "594943970" ) + @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 591 592 594 } - @ObfuscatedName("as") + @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1261786031" + garbageValue = "1464597509" ) + @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; // L: 598 } - @ObfuscatedName("az") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2040090881" + descriptor = "(B)I", + garbageValue = "-27" ) + @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; // L: 602 } - @ObfuscatedName("ad") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-83" + descriptor = "(II)V", + garbageValue = "-1585976321" ) + @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { if (var1 >= 1) { // L: 606 this.maxFlashCount = var1; // L: 607 @@ -1020,20 +1097,22 @@ public class WorldMap { } // L: 609 - @ObfuscatedName("ai") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "119" + descriptor = "(I)V", + garbageValue = "-2125624155" ) + @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; // L: 612 } // L: 613 - @ObfuscatedName("ay") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "147371535" + garbageValue = "-42452546" ) + @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { if (var1 >= 1) { // L: 616 this.cyclesPerFlash = var1; // L: 617 @@ -1041,29 +1120,32 @@ public class WorldMap { } // L: 619 - @ObfuscatedName("aj") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "561976387" + descriptor = "(B)V", + garbageValue = "8" ) + @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; // L: 622 } // L: 623 - @ObfuscatedName("aw") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "36" + descriptor = "(ZI)V", + garbageValue = "1208073894" ) + @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; // L: 626 } // L: 627 - @ObfuscatedName("af") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-1" + garbageValue = "23" ) + @Export("flashElement") public void flashElement(int var1) { this.flashingElements = new HashSet(); // L: 630 this.flashingElements.add(var1); // L: 631 @@ -1071,47 +1153,51 @@ public class WorldMap { this.flashCycle = 0; // L: 633 } // L: 634 - @ObfuscatedName("ak") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "-1227226392" ) + @Export("flashCategory") public void flashCategory(int var1) { this.flashingElements = new HashSet(); // L: 637 this.flashCount = 0; // L: 638 this.flashCycle = 0; // L: 639 - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 640 - if (WorldMapSection0.WorldMapElement_get(var2) != null && WorldMapSection0.WorldMapElement_get(var2).category == var1) { // L: 641 644 - this.flashingElements.add(WorldMapSection0.WorldMapElement_get(var2).objectId); // L: 645 + for (int var2 = 0; var2 < NPC.WorldMapElement_count; ++var2) { // L: 640 + if (class194.WorldMapElement_get(var2) != null && class194.WorldMapElement_get(var2).category == var1) { // L: 641 644 + this.flashingElements.add(class194.WorldMapElement_get(var2).objectId); // L: 645 } } } // L: 648 - @ObfuscatedName("ac") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "578188764" + garbageValue = "1665532753" ) + @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; // L: 651 } // L: 652 - @ObfuscatedName("bl") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-805542752" + descriptor = "(ZS)V", + garbageValue = "128" ) + @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; // L: 655 } // L: 656 - @ObfuscatedName("bc") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(IZS)V", - garbageValue = "5539" + descriptor = "(IZB)V", + garbageValue = "-47" ) + @Export("disableElement") public void disableElement(int var1, boolean var2) { if (!var2) { // L: 659 this.enabledElements.add(var1); // L: 660 @@ -1119,14 +1205,15 @@ public class WorldMap { this.enabledElements.remove(var1); // L: 663 } - this.method6480(); // L: 665 + this.method6506(); // L: 665 } // L: 666 - @ObfuscatedName("bz") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IZS)V", - garbageValue = "3311" + descriptor = "(IZI)V", + garbageValue = "1863382486" ) + @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { if (!var2) { // L: 669 this.enabledCategories.add(var1); // L: 670 @@ -1134,9 +1221,9 @@ public class WorldMap { this.enabledCategories.remove(var1); // L: 673 } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 675 - if (WorldMapSection0.WorldMapElement_get(var3) != null && WorldMapSection0.WorldMapElement_get(var3).category == var1) { // L: 676 679 - int var4 = WorldMapSection0.WorldMapElement_get(var3).objectId; // L: 680 + for (int var3 = 0; var3 < NPC.WorldMapElement_count; ++var3) { // L: 675 + if (class194.WorldMapElement_get(var3) != null && class194.WorldMapElement_get(var3).category == var1) { // L: 676 679 + int var4 = class194.WorldMapElement_get(var3).objectId; // L: 680 if (!var2) { // L: 681 this.enabledElementIds.add(var4); // L: 682 } else { @@ -1145,57 +1232,61 @@ public class WorldMap { } } - this.method6480(); // L: 689 + this.method6506(); // L: 689 } // L: 690 - @ObfuscatedName("bj") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1921316185" + descriptor = "(S)Z", + garbageValue = "-3673" ) + @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; // L: 693 } - @ObfuscatedName("bh") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1781251597" + descriptor = "(IB)Z", + garbageValue = "-112" ) + @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); // L: 697 } - @ObfuscatedName("bi") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1674259718" + descriptor = "(IB)Z", + garbageValue = "-49" ) + @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); // L: 701 } - @ObfuscatedName("bg") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1574604658" + descriptor = "(B)V", + garbageValue = "0" ) - void method6480() { - this.field4025.clear(); // L: 705 - this.field4025.addAll(this.enabledElements); // L: 706 - this.field4025.addAll(this.enabledElementIds); // L: 707 + void method6506() { + this.field4010.clear(); // L: 705 + this.field4010.addAll(this.enabledElements); // L: 706 + this.field4010.addAll(this.enabledElementIds); // L: 707 } // L: 708 - @ObfuscatedName("br") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "49" + descriptor = "(IIIIIII)V", + garbageValue = "-1573355878" ) + @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.cacheLoader.isLoaded()) { // L: 711 int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 714 int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 715 - List var9 = this.worldMapManager.method721(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); // L: 716 + List var9 = this.worldMapManager.method738(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); // L: 716 if (!var9.isEmpty()) { // L: 717 Iterator var10 = var9.iterator(); @@ -1206,12 +1297,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 721 - WorldMapElement var12 = WorldMapSection0.WorldMapElement_get(var11.getElement()); // L: 723 + WorldMapElement var12 = class194.WorldMapElement_get(var11.getElement()); // L: 723 var13 = false; // L: 724 for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 725 if (var12.menuActions[var14] != null) { // L: 726 - StructDefinition.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 727 + ModelData0.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 727 var13 = true; // L: 728 } } @@ -1221,12 +1312,12 @@ public class WorldMap { } } // L: 712 718 732 - @ObfuscatedName("bp") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(ILhg;S)Lhg;", - garbageValue = "11767" + descriptor = "(ILhw;I)Lhw;", + garbageValue = "1728876075" ) - public Coord method6507(int var1, Coord var2) { + public Coord method6481(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { // L: 739 return null; // L: 740 } else if (!this.worldMapManager.isLoaded()) { // L: 742 @@ -1245,7 +1336,7 @@ public class WorldMap { AbstractWorldMapIcon var8; int var11; do { - if (!var7.hasNext()) { + if (!var7.hasNext()) { // L: 769 return var5.coord2; // L: 770 } @@ -1269,38 +1360,40 @@ public class WorldMap { @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(IILhg;Lhg;I)V", - garbageValue = "-2008216886" + descriptor = "(IILhw;Lhw;B)V", + garbageValue = "81" ) + @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { ScriptEvent var5 = new ScriptEvent(); // L: 774 WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 775 var5.setArgs(new Object[]{var6}); // L: 776 switch(var1) { // L: 777 case 1008: - var5.setType(10); // L: 780 - break; + var5.setType(10); // L: 785 + break; // L: 786 case 1009: - var5.setType(11); // L: 790 - break; // L: 791 - case 1010: - var5.setType(12); // L: 800 - break; - case 1011: - var5.setType(13); // L: 795 + var5.setType(11); // L: 795 break; // L: 796 + case 1010: + var5.setType(12); // L: 790 + break; // L: 791 + case 1011: + var5.setType(13); // L: 780 + break; case 1012: - var5.setType(14); // L: 785 + var5.setType(14); // L: 800 } - Script.runScriptEvent(var5); // L: 804 + Entity.runScriptEvent(var5); // L: 804 } // L: 805 - @ObfuscatedName("bw") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(I)Laz;", - garbageValue = "-710181196" + descriptor = "(I)Lam;", + garbageValue = "-1173699486" ) + @Export("iconStart") public AbstractWorldMapIcon iconStart() { if (!this.cacheLoader.isLoaded()) { // L: 808 return null; // L: 809 @@ -1308,24 +1401,25 @@ public class WorldMap { return null; // L: 812 } else { HashMap var1 = this.worldMapManager.buildIcons(); // L: 814 - this.field4029 = new LinkedList(); // L: 815 + this.field4003 = new LinkedList(); // L: 815 Iterator var2 = var1.values().iterator(); // L: 816 while (var2.hasNext()) { List var3 = (List)var2.next(); // L: 817 - this.field4029.addAll(var3); // L: 819 + this.field4003.addAll(var3); // L: 819 } - this.iconIterator = this.field4029.iterator(); // L: 822 + this.iconIterator = this.field4003.iterator(); // L: 822 return this.iconNext(); // L: 823 } } @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(S)Laz;", - garbageValue = "-2586" + descriptor = "(S)Lam;", + garbageValue = "18450" ) + @Export("iconNext") public AbstractWorldMapIcon iconNext() { if (this.iconIterator == null) { // L: 827 return null; // L: 828 diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 65c257c8d1..65128d8836 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -1,26 +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("md") +@ObfuscatedName("ma") +@Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("i") + @ObfuscatedName("z") + @Export("cacheName") String cacheName; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("archive") AbstractArchive archive; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2018598251 + intValue = 1053326001 ) + @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("w") + @ObfuscatedName("c") + @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lic;)V" + descriptor = "(Liw;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; // L: 13 @@ -28,11 +35,12 @@ public class WorldMapArchiveLoader { this.archive = var1; // L: 17 } // L: 18 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1155527039" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "114" ) + @Export("reset") void reset(String var1) { if (var1 != null && !var1.isEmpty()) { // L: 21 if (var1 != this.cacheName) { // L: 24 @@ -44,14 +52,15 @@ public class WorldMapArchiveLoader { } } // L: 22 25 31 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-739480731" + garbageValue = "-1229000181" ) + @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field318.name, this.cacheName)) { // L: 35 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field319.name, this.cacheName)) { // L: 35 return this.percentLoaded; // L: 36 } @@ -59,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field327.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field327.name, this.cacheName)) { // L: 41 42 + if (this.archive.isValidFileName(WorldMapCacheName.field321.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field321.name, this.cacheName)) { // L: 41 42 return this.percentLoaded; // L: 43 } @@ -67,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field321.name)) { // L: 49 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field328.name)) { // L: 49 return this.percentLoaded; // L: 50 } @@ -78,20 +87,22 @@ public class WorldMapArchiveLoader { return this.percentLoaded; // L: 55 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-337934116" + garbageValue = "-336032525" ) + @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-64" + descriptor = "(I)I", + garbageValue = "-1960531717" ) + @Export("getPercentLoaded") int getPercentLoaded() { return this.percentLoaded; // L: 63 } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 210a1ce592..87f400d78a 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,64 +1,80 @@ import java.util.Iterator; import java.util.LinkedList; +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("ar") +@ObfuscatedName("ak") +@Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("sk") - @ObfuscatedSignature( - descriptor = "Lmr;" - ) - static PlatformInfo platformInfo; - @ObfuscatedName("z") + @ObfuscatedName("lx") @ObfuscatedGetter( - intValue = -2004467599 + intValue = -654673941 ) + @Export("menuY") + static int menuY; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1009159255 + ) + @Export("id") int id; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("internalName") String internalName; - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("externalName") String externalName; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 173771503 - ) - int backGroundColor; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1585723591 - ) - int zoom; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhg;" - ) - Coord origin; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -2050801149 - ) - int regionLowX; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1803706305 - ) - int regionHighX; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 2137946489 - ) - int regionLowY; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1133866307 + intValue = 519204621 ) + @Export("backGroundColor") + int backGroundColor; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1290828579 + ) + @Export("zoom") + int zoom; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhw;" + ) + @Export("origin") + Coord origin; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1500260549 + ) + @Export("regionLowX") + int regionLowX; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1947269635 + ) + @Export("regionHighX") + int regionHighX; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1494847727 + ) + @Export("regionLowY") + int regionLowY; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -255736363 + ) + @Export("regionHighY") int regionHighY; - @ObfuscatedName("n") + @ObfuscatedName("e") + @Export("isMain") boolean isMain; - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("sections") LinkedList sections; public WorldMapArea() { @@ -73,11 +89,12 @@ public class WorldMapArea { this.isMain = false; // L: 19 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;IB)V", - garbageValue = "24" + descriptor = "(Lkb;II)V", + garbageValue = "1783204022" ) + @Export("read") public void read(Buffer var1, int var2) { this.id = var2; // L: 23 this.internalName = var1.readStringCp1252NullTerminated(); // L: 24 @@ -97,78 +114,82 @@ public class WorldMapArea { this.setBounds(); // L: 36 } // L: 37 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;B)Lay;", - garbageValue = "-55" + descriptor = "(Lkb;I)Las;", + garbageValue = "1469324380" ) + @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 40 - WorldMapSectionType var3 = (WorldMapSectionType)TextureProvider.findEnumerated(WorldMapSectionType.method327(), var2); // L: 41 - Object var4 = null; // L: 42 - switch(var3.type) { // L: 43 + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; // L: 43 + WorldMapSectionType var4 = (WorldMapSectionType)class195.findEnumerated(var3, var2); // L: 45 + Object var5 = null; // L: 46 + switch(var4.type) { // L: 47 case 0: - var4 = new WorldMapSection3(); // L: 45 - break; + var5 = new WorldMapSection3(); // L: 52 + break; // L: 53 case 1: - var4 = new WorldMapSection1(); // L: 51 - break; // L: 52 + var5 = new WorldMapSection0(); // L: 55 + break; // L: 56 case 2: - var4 = new WorldMapSection2(); // L: 48 - break; // L: 49 + var5 = new WorldMapSection2(); // L: 58 + break; // L: 59 case 3: - var4 = new WorldMapSection0(); + var5 = new WorldMapSection1(); // L: 49 break; default: - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 61 } - ((WorldMapSection)var4).read(var1); // L: 59 - return (WorldMapSection)var4; + ((WorldMapSection)var5).read(var1); // L: 63 + return (WorldMapSection)var5; // L: 64 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "31" + descriptor = "(IIII)Z", + garbageValue = "1894749665" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 64 + Iterator var4 = this.sections.iterator(); // L: 68 WorldMapSection var5; do { if (!var4.hasNext()) { - return false; // L: 72 + return false; // L: 76 } - var5 = (WorldMapSection)var4.next(); // L: 65 - } while(!var5.containsCoord(var1, var2, var3)); // L: 67 + var5 = (WorldMapSection)var4.next(); // L: 69 + } while(!var5.containsCoord(var1, var2, var3)); // L: 71 - return true; // L: 68 + return true; // L: 72 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "118" + garbageValue = "125" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - int var3 = var1 / 64; // L: 76 - int var4 = var2 / 64; // L: 77 - if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78 - if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79 - Iterator var5 = this.sections.iterator(); // L: 80 + int var3 = var1 / 64; // L: 80 + int var4 = var2 / 64; // L: 81 + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82 + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83 + Iterator var5 = this.sections.iterator(); // L: 84 WorldMapSection var6; do { if (!var5.hasNext()) { - return false; // L: 88 + return false; // L: 92 } - var6 = (WorldMapSection)var5.next(); // L: 81 - } while(!var6.containsPosition(var1, var2)); // L: 83 + var6 = (WorldMapSection)var5.next(); // L: 85 + } while(!var6.containsPosition(var1, var2)); // L: 87 - return true; // L: 84 + return true; // L: 88 } else { return false; } @@ -177,338 +198,248 @@ public class WorldMapArea { } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "-1676257391" + garbageValue = "1010192538" ) + @Export("position") public int[] position(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); // L: 92 + Iterator var4 = this.sections.iterator(); // L: 96 WorldMapSection var5; do { - if (!var4.hasNext()) { // L: 99 - return null; // L: 100 + if (!var4.hasNext()) { + return null; // L: 104 } - var5 = (WorldMapSection)var4.next(); // L: 93 - } while(!var5.containsCoord(var1, var2, var3)); // L: 95 + var5 = (WorldMapSection)var4.next(); // L: 97 + } while(!var5.containsCoord(var1, var2, var3)); // L: 99 - return var5.getBorderTileLengths(var1, var2, var3); // L: 96 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "788821782" - ) - public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); // L: 104 - - WorldMapSection var4; - do { - if (!var3.hasNext()) { - return null; // L: 112 - } - - var4 = (WorldMapSection)var3.next(); // L: 105 - } while(!var4.containsPosition(var1, var2)); // L: 107 - - return var4.coord(var1, var2); // L: 108 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1087000802" - ) - void setBounds() { - Iterator var1 = this.sections.iterator(); // L: 116 - - while (var1.hasNext()) { // L: 121 - WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 - var2.expandBounds(this); // L: 119 - } - - } // L: 122 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "809929326" - ) - public int getId() { - return this.id; // L: 125 - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1492211356" - ) - public boolean getIsMain() { - return this.isMain; // L: 129 - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-401502532" - ) - public String getInternalName() { - return this.internalName; // L: 133 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "-32528" - ) - public String getExternalName() { - return this.externalName; // L: 137 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "194013380" - ) - int getBackGroundColor() { - return this.backGroundColor; // L: 141 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "24" - ) - public int getZoom() { - return this.zoom; // L: 145 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" - ) - public int getRegionLowX() { - return this.regionLowX; // L: 149 + return var5.getBorderTileLengths(var1, var2, var3); // L: 100 } @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-691462213" + descriptor = "(III)Lhw;", + garbageValue = "1409626540" ) - public int getRegionHighX() { - return this.regionHighX; // L: 153 + @Export("coord") + public Coord coord(int var1, int var2) { + Iterator var3 = this.sections.iterator(); // L: 108 + + WorldMapSection var4; + do { + if (!var3.hasNext()) { + return null; // L: 116 + } + + var4 = (WorldMapSection)var3.next(); // L: 109 + } while(!var4.containsPosition(var1, var2)); // L: 111 + + return var4.coord(var1, var2); // L: 112 } + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "106" + ) + @Export("setBounds") + void setBounds() { + Iterator var1 = this.sections.iterator(); // L: 120 + + while (var1.hasNext()) { + WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121 + var2.expandBounds(this); // L: 123 + } + + } // L: 126 + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-515564038" + descriptor = "(B)I", + garbageValue = "-101" ) - public int getRegionLowY() { - return this.regionLowY; // L: 157 - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "330383709" - ) - public int getRegionHighY() { - return this.regionHighY; // L: 161 - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1099952817" - ) - public int getOriginX() { - return this.origin.x; // L: 165 + @Export("getId") + public int getId() { + return this.id; // L: 129 } @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "8" + descriptor = "(I)Z", + garbageValue = "279642546" ) - public int getOriginPlane() { - return this.origin.plane; // L: 169 + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; // L: 133 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-4" + ) + @Export("getInternalName") + public String getInternalName() { + return this.internalName; // L: 137 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1313308687" + ) + @Export("getExternalName") + public String getExternalName() { + return this.externalName; // L: 141 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "443425895" + ) + @Export("getBackGroundColor") + int getBackGroundColor() { + return this.backGroundColor; // L: 145 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-61" + ) + @Export("getZoom") + public int getZoom() { + return this.zoom; // L: 149 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1743240328" + ) + @Export("getRegionLowX") + public int getRegionLowX() { + return this.regionLowX; // L: 153 } @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2050944019" + garbageValue = "1186709723" ) + @Export("getRegionHighX") + public int getRegionHighX() { + return this.regionHighX; // L: 157 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-192109314" + ) + @Export("getRegionLowY") + public int getRegionLowY() { + return this.regionLowY; // L: 161 + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-288224716" + ) + @Export("getRegionHighY") + public int getRegionHighY() { + return this.regionHighY; // L: 165 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-122" + ) + @Export("getOriginX") + public int getOriginX() { + return this.origin.x; // L: 169 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2063856409" + ) + @Export("getOriginPlane") + public int getOriginPlane() { + return this.origin.plane; // L: 173 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "575879323" + ) + @Export("getOriginY") public int getOriginY() { - return this.origin.y; // L: 173 + return this.origin.y; // L: 177 } - @ObfuscatedName("b") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)Lhg;", - garbageValue = "0" + descriptor = "(I)Lhw;", + garbageValue = "1845506335" ) + @Export("getOrigin") public Coord getOrigin() { - return new Coord(this.origin); // L: 177 + return new Coord(this.origin); // L: 181 } - @ObfuscatedName("t") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-3643334" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1232455466" ) - static void method415() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 53 - if (ArchiveDiskActionHandler.field3179 == 0) { // L: 54 - Huffman.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 55 - Huffman.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 56 - Huffman.ArchiveDiskActionHandler_thread.start(); // L: 57 - Huffman.ArchiveDiskActionHandler_thread.setPriority(5); // L: 58 - } + static final void method506(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 195 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your friend list first").toString(); + DevicePcmPlayerProvider.addGameMessage(30, "", var1); // L: 197 + } // L: 199 - ArchiveDiskActionHandler.field3179 = 600; // L: 60 - } - } // L: 62 - - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-2119318811" + descriptor = "(ILco;ZI)I", + garbageValue = "852690937" ) - static int method485(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1723 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; // L: 1724 - return 1; // L: 1725 + static int method511(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3185 + Client.logoutTimer = 250; // L: 3186 + return 1; // L: 3187 } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1727 - Interpreter.Interpreter_intStackSize -= 2; // L: 1728 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1729 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1730 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarbitDefinition.method4596(var3, var4); // L: 1731 - return 1; // L: 1732 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1734 - Interpreter.Interpreter_intStackSize -= 2; // L: 1735 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1736 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1737 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator10.ItemContainer_getCount(var3, var4); // L: 1738 - return 1; // L: 1739 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1741 - Interpreter.Interpreter_intStackSize -= 2; // L: 1742 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1743 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1744 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NetSocket.method3628(var3, var4); // L: 1745 - return 1; // L: 1746 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1748 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1749 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MusicPatchPcmStream.getInvDefinition(var3).size; // L: 1750 - return 1; // L: 1751 - } else if (var0 == ScriptOpcodes.STAT) { // L: 1753 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1754 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1755 - return 1; // L: 1756 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1758 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1759 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1760 - return 1; // L: 1761 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1763 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1764 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1765 - return 1; // L: 1766 - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 1768 - var3 = Huffman.Client_plane; // L: 1769 - var4 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 1770 - var5 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 1771 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1772 - return 1; // L: 1773 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 1775 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1776 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1777 - return 1; // L: 1778 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1780 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1781 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1782 - return 1; // L: 1783 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 1785 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1786 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1787 - return 1; // L: 1788 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1790 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1791 - return 1; // L: 1792 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1794 - Interpreter.Interpreter_intStackSize -= 2; // L: 1795 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1796 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1797 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarbitDefinition.method4596(var3, var4); // L: 1798 - return 1; // L: 1799 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1801 - Interpreter.Interpreter_intStackSize -= 2; // L: 1802 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1803 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1804 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator10.ItemContainer_getCount(var3, var4); // L: 1805 - return 1; // L: 1806 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1808 - Interpreter.Interpreter_intStackSize -= 2; // L: 1809 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1810 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1811 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NetSocket.method3628(var3, var4); // L: 1812 - return 1; // L: 1813 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1815 - if (Client.staffModLevel >= 2) { // L: 1816 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1817 - } - - return 1; // L: 1818 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1820 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1821 - return 1; // L: 1822 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1824 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; // L: 1825 - return 1; // L: 1826 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1828 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1829 - return 1; // L: 1830 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1832 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; // L: 1833 - return 1; // L: 1834 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1836 - if (Client.playerMod) { // L: 1837 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1838 - } - - return 1; // L: 1839 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1841 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1842 - return 1; // L: 1843 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1845 - Interpreter.Interpreter_intStackSize -= 4; // L: 1846 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1847 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1848 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1849 - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 1850 - var3 += var4 << 14; // L: 1851 - var3 += var5 << 28; // L: 1852 - var3 += var6; // L: 1853 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 1854 - return 1; // L: 1855 - } else { - return 2; // L: 1857 - } - } + return 2; // L: 3189 } } + + @ObfuscatedName("ev") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "896332793" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class89.logOut(); // L: 3007 + switch(var0) { // L: 3008 + case 1: + Login.loginIndex = 24; // L: 3017 + GrandExchangeOfferNameComparator.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3018 + break; + case 2: + MenuAction.method2171(); // L: 3011 + } + + } // L: 3023 } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 9ad90a6e29..33fde2716a 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -1,45 +1,48 @@ -import java.awt.Component; +import java.util.Date; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; @ObfuscatedName("aj") +@Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("bi") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lkn;" ) - static LoginType loginType; - @ObfuscatedName("ey") - @ObfuscatedGetter( - intValue = -243088695 - ) - static int field352; - @ObfuscatedName("h") + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("n") + @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("q") + @ObfuscatedName("p") + @Export("iconList") List iconList; WorldMapAreaData() { } // L: 14 - @ObfuscatedName("ce") + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "(Lkf;Lkf;IZB)V", - garbageValue = "1" + descriptor = "(Lkb;Lkb;IZI)V", + garbageValue = "-1456851235" ) + @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { this.read(var1, var3); // L: 17 int var5 = var2.readUnsignedShort(); // L: 18 - this.worldMapData0Set = new HashSet(var5); // L: 19 + this.worldMapData0Set = new HashSet(var5); int var6; - for (var6 = 0; var6 < var5; ++var6) { // L: 20 + for (var6 = 0; var6 < var5; ++var6) { WorldMapData_0 var7 = new WorldMapData_0(); // L: 21 try { @@ -67,19 +70,20 @@ public class WorldMapAreaData extends WorldMapArea { } this.initIconsList(var2, var4); // L: 42 - } + } // L: 43 - @ObfuscatedName("cr") + @ObfuscatedName("cc") @ObfuscatedSignature( - descriptor = "(Lkf;ZS)V", - garbageValue = "8691" + descriptor = "(Lkb;ZI)V", + garbageValue = "1993639768" ) + @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { - this.iconList = new LinkedList(); - int var3 = var1.readUnsignedShort(); + this.iconList = new LinkedList(); // L: 46 + int var3 = var1.readUnsignedShort(); // L: 47 for (int var4 = 0; var4 < var3; ++var4) { // L: 48 - int var5 = var1.method5634(); // L: 49 + int var5 = var1.method5851(); // L: 49 Coord var6 = new Coord(var1.readInt()); // L: 50 boolean var7 = var1.readUnsignedByte() == 1; // L: 51 if (var2 || !var7) { // L: 52 @@ -89,294 +93,86 @@ public class WorldMapAreaData extends WorldMapArea { } // L: 56 - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-681398425" + descriptor = "(Liw;I)V", + garbageValue = "1786307313" ) - static void method751(Component var0) { - var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43 - var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44 - var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45 - MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46 - } // L: 47 + public static void method791(AbstractArchive var0) { + StructDefinition.StructDefinition_archive = var0; // L: 19 + } // L: 20 - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "638484007" + descriptor = "(Liw;II)Z", + garbageValue = "1365673620" ) - static String colorStartTag(int var0) { - return ""; // L: 22 + static boolean method787(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 253 + if (var2 == null) { // L: 254 + return false; + } else { + class217.SpriteBuffer_decode(var2); // L: 255 + return true; // L: 256 + } } - @ObfuscatedName("fr") + @ObfuscatedName("gg") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1355090288" + descriptor = "(I)Z", + garbageValue = "-651553364" ) - static final void method752() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { // L: 3449 - var0 = WorldMapLabelSize.localPlayer.x; // L: 3450 - var1 = WorldMapLabelSize.localPlayer.y; // L: 3451 - if (GrandExchangeOfferWorldComparator.oculusOrbFocalPointX - var0 < -500 || GrandExchangeOfferWorldComparator.oculusOrbFocalPointX - var0 > 500 || MouseHandler.oculusOrbFocalPointY - var1 < -500 || MouseHandler.oculusOrbFocalPointY - var1 > 500) { // L: 3452 - GrandExchangeOfferWorldComparator.oculusOrbFocalPointX = var0; // L: 3453 - MouseHandler.oculusOrbFocalPointY = var1; // L: 3454 - } - - if (var0 != GrandExchangeOfferWorldComparator.oculusOrbFocalPointX) { // L: 3456 - GrandExchangeOfferWorldComparator.oculusOrbFocalPointX += (var0 - GrandExchangeOfferWorldComparator.oculusOrbFocalPointX) / 16; - } - - if (var1 != MouseHandler.oculusOrbFocalPointY) { // L: 3457 - MouseHandler.oculusOrbFocalPointY += (var1 - MouseHandler.oculusOrbFocalPointY) / 16; - } - - var2 = GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7; // L: 3458 - var3 = MouseHandler.oculusOrbFocalPointY >> 7; // L: 3459 - var4 = ArchiveLoader.getTileHeight(GrandExchangeOfferWorldComparator.oculusOrbFocalPointX, MouseHandler.oculusOrbFocalPointY, Huffman.Client_plane); // L: 3460 - var5 = 0; // L: 3461 - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3462 - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3463 - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3464 - int var8 = Huffman.Client_plane; // L: 3465 - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3466 - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3467 - if (var9 > var5) { // L: 3468 - var5 = var9; - } - } - } - } - - var6 = var5 * 192; // L: 3472 - if (var6 > 98048) { // L: 3473 - var6 = 98048; - } - - if (var6 < 32768) { // L: 3474 - var6 = 32768; - } - - if (var6 > Client.field762) { // L: 3475 - Client.field762 += (var6 - Client.field762) / 24; - } else if (var6 < Client.field762) { // L: 3476 - Client.field762 += (var6 - Client.field762) / 80; - } - - class7.field40 = ArchiveLoader.getTileHeight(WorldMapLabelSize.localPlayer.x, WorldMapLabelSize.localPlayer.y, Huffman.Client_plane) - Client.camFollowHeight; // L: 3477 - } else if (Client.oculusOrbState == 1) { // L: 3479 - if (Client.field759 && WorldMapLabelSize.localPlayer != null) { // L: 3481 - var0 = WorldMapLabelSize.localPlayer.pathX[0]; // L: 3482 - var1 = WorldMapLabelSize.localPlayer.pathY[0]; // L: 3483 - if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { // L: 3484 - GrandExchangeOfferWorldComparator.oculusOrbFocalPointX = WorldMapLabelSize.localPlayer.x; // L: 3485 - var2 = ArchiveLoader.getTileHeight(WorldMapLabelSize.localPlayer.x, WorldMapLabelSize.localPlayer.y, Huffman.Client_plane) - Client.camFollowHeight; // L: 3486 - if (var2 < class7.field40) { // L: 3487 - class7.field40 = var2; - } - - MouseHandler.oculusOrbFocalPointY = WorldMapLabelSize.localPlayer.y; // L: 3488 - Client.field759 = false; // L: 3489 - } - } - - short var10 = -1; // L: 3492 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3493 - var10 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3494 - var10 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3495 - if (var10 == 0) { // L: 3496 - var10 = 1792; - } else if (var10 == 1024) { // L: 3497 - var10 = 1280; - } else { - var10 = 1536; // L: 3498 - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3500 - if (var10 == 0) { // L: 3501 - var10 = 256; - } else if (var10 == 1024) { // L: 3502 - var10 = 768; - } else { - var10 = 512; // L: 3503 - } - } - - byte var11 = 0; // L: 3505 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3506 - var11 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3507 - var11 = 1; - } - - var2 = 0; // L: 3508 - if (var10 >= 0 || var11 != 0) { // L: 3509 - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * -1087548987 * -883817203 : Client.oculusOrbNormalSpeed * -106953033 * 1271248647; // L: 3510 - var2 *= 16; // L: 3511 - Client.field796 = var10; // L: 3512 - Client.field755 = var11; // L: 3513 - } - - if (Client.field753 < var2) { // L: 3515 - Client.field753 += var2 / 8; // L: 3516 - if (Client.field753 > var2) { // L: 3517 - Client.field753 = var2; - } - } else if (Client.field753 > var2) { // L: 3519 - Client.field753 = Client.field753 * 9 / 10; - } - - if (Client.field753 > 0) { // L: 3520 - var3 = Client.field753 / 16; // L: 3521 - if (Client.field796 >= 0) { // L: 3522 - var0 = Client.field796 - ServerPacket.cameraYaw & 2047; // L: 3523 - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3524 - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3525 - GrandExchangeOfferWorldComparator.oculusOrbFocalPointX += var3 * var4 / 65536; // L: 3526 - MouseHandler.oculusOrbFocalPointY += var5 * var3 / 65536; // L: 3527 - } - - if (Client.field755 != 0) { // L: 3529 - class7.field40 += var3 * Client.field755; // L: 3530 - if (class7.field40 > 0) { // L: 3531 - class7.field40 = 0; - } - } - } else { - Client.field796 = -1; // L: 3535 - Client.field755 = -1; // L: 3536 - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3538 - Client.packetWriter.addNode(Client.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher)); // L: 3540 - Client.oculusOrbState = 0; // L: 3541 - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && ScriptEvent.mouseCam) { // L: 3545 - var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3546 - Client.camAngleDX = var0 * 2; // L: 3547 - Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -630805473 * 1212010463; // L: 3548 - var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3549 - Client.camAngleDY = var1 * 2; // L: 3550 - Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -376552745 * 551932135; // L: 3551 - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3554 - Client.camAngleDY += (-24 - Client.camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3555 - Client.camAngleDY += (24 - Client.camAngleDY) / 2; - } else { - Client.camAngleDY /= 2; // L: 3556 - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3557 - Client.camAngleDX += (12 - Client.camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3558 - Client.camAngleDX += (-12 - Client.camAngleDX) / 2; - } else { - Client.camAngleDX /= 2; // L: 3559 - } - - Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3560 - Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3561 - } - - Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3563 - Client.camAngleX += Client.camAngleDX / 2; // L: 3564 - if (Client.camAngleX < 128) { // L: 3565 - Client.camAngleX = 128; - } - - if (Client.camAngleX > 383) { // L: 3566 - Client.camAngleX = 383; - } - - } // L: 3567 - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1654311283" - ) - static void addCancelMenuEntry() { - class279.method5091(); // L: 7009 - Client.menuActions[0] = "Cancel"; // L: 7010 - Client.menuTargets[0] = ""; // L: 7011 - Client.menuOpcodes[0] = 1006; // L: 7012 - Client.menuShiftClick[0] = false; // L: 7013 - Client.menuOptionsCount = 1; // L: 7014 - } // L: 7015 - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "([Lhq;II)V", - garbageValue = "1802029198" - ) - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10115 - Widget var3 = var0[var2]; // L: 10116 - if (var3 != null) { // L: 10117 - if (var3.type == 0) { // L: 10118 - if (var3.children != null) { // L: 10119 - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10120 - if (var4 != null) { // L: 10121 - ClientPacket.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 10123 - var5 = new ScriptEvent(); // L: 10124 - var5.widget = var3; // L: 10125 - var5.args = var3.onDialogAbort; // L: 10126 - Script.runScriptEvent(var5); // L: 10127 - } - - if (var1 == 1 && var3.onSubChange != null) { // L: 10129 - if (var3.childIndex >= 0) { // L: 10130 - Widget var6 = TileItem.getWidget(var3.id); // L: 10131 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10132 - continue; - } - } - - var5 = new ScriptEvent(); // L: 10136 - var5.widget = var3; // L: 10137 - var5.args = var3.onSubChange; // L: 10138 - Script.runScriptEvent(var5); // L: 10139 - } - } - } - - } // L: 10142 - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(Lhq;II)Ljava/lang/String;", - garbageValue = "-1179780727" - ) - static String method756(Widget var0, int var1) { - if (!StudioGame.method4230(WorldMapIcon_0.getWidgetFlags(var0), var1) && var0.onOp == null) { // L: 10736 - 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; // L: 10737 10738 10740 - } + static boolean method786() { + return (Client.drawPlayerNames & 8) != 0; // L: 4926 } + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1738497554" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (ScriptFrame.loadInterface(var0)) { // L: 10809 + class25.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10810 + } + } // L: 10811 + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-85" + ) + static void method790(String var0) { + WorldMapRegion.field281 = var0; // L: 11557 + + try { + String var1 = ByteArrayPool.client.getParameter(Integer.toString(18)); // L: 11559 + String var2 = ByteArrayPool.client.getParameter(Integer.toString(13)); // L: 11560 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11561 + String var5; + if (var0.length() == 0) { // L: 11562 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + String var4 = var3 + "; Expires="; // L: 11564 + long var6 = User.currentTimeMillis() + 94608000000L; // L: 11566 + Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11568 + int var8 = Calendar.Calendar_calendar.get(7); // L: 11569 + int var9 = Calendar.Calendar_calendar.get(5); // L: 11570 + int var10 = Calendar.Calendar_calendar.get(2); // L: 11571 + int var11 = Calendar.Calendar_calendar.get(1); // L: 11572 + int var12 = Calendar.Calendar_calendar.get(11); // L: 11573 + int var13 = Calendar.Calendar_calendar.get(12); // L: 11574 + int var14 = Calendar.Calendar_calendar.get(13); // L: 11575 + var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 11576 + var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11578 + } + + Client var16 = ByteArrayPool.client; // L: 11580 + var5 = "document.cookie=\"" + var3 + "\""; // L: 11581 + JSObject.getWindow(var16).eval(var5); // L: 11584 + } catch (Throwable var15) { // L: 11587 + } + + } // L: 11588 } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index fab7d95e56..b4624a3dc2 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,80 +1,146 @@ +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("ad") +@ObfuscatedName("aa") +@Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lad;" + @ObfuscatedName("ri") + @ObfuscatedGetter( + intValue = 1131188791 ) - public static final WorldMapCacheName field322; - @ObfuscatedName("k") + static int field326; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Laa;" ) - public static final WorldMapCacheName field318; - @ObfuscatedName("s") + public static final WorldMapCacheName field320; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Laa;" ) - public static final WorldMapCacheName field327; - @ObfuscatedName("t") + public static final WorldMapCacheName field319; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lad;" - ) - static final WorldMapCacheName field319; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Laa;" ) public static final WorldMapCacheName field321; - @ObfuscatedName("o") + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Laa;" + ) + static final WorldMapCacheName field322; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Laa;" + ) + public static final WorldMapCacheName field328; + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("q") + @Export("name") public final String name; static { - field322 = new WorldMapCacheName("details"); // L: 4 - field318 = new WorldMapCacheName("compositemap"); // L: 5 - field327 = new WorldMapCacheName("compositetexture"); // L: 6 - field319 = new WorldMapCacheName("area"); // L: 7 - field321 = new WorldMapCacheName("labels"); // L: 8 + field320 = new WorldMapCacheName("details"); // L: 4 + field319 = new WorldMapCacheName("compositemap"); // L: 5 + field321 = new WorldMapCacheName("compositetexture"); // L: 6 + field322 = new WorldMapCacheName("area"); // L: 7 + field328 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { this.name = var1; // L: 12 } // L: 13 - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIB)Lbk;", - garbageValue = "-87" - ) - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 - return var2.getMessage(var1); // L: 36 + @ObfuscatedName("z") + static boolean method725(long var0) { + return (int)(var0 >>> 16 & 1L) == 1; // L: 60 } - @ObfuscatedName("fe") + @ObfuscatedName("hv") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1002606295" + descriptor = "(ZLks;B)V", + garbageValue = "10" ) - static void playSong(int var0) { - if (var0 == -1 && !Client.field704) { // L: 3288 - class206.midiPcmStream.clear(); // L: 3290 - class206.musicPlayerStatus = 1; // L: 3291 - class204.musicTrackArchive = null; // L: 3292 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field704) { // L: 3295 - Archive var1 = CollisionMap.archive6; // L: 3296 - int var2 = Client.musicVolume; // L: 3297 - class206.musicPlayerStatus = 1; // L: 3299 - class204.musicTrackArchive = var1; // L: 3300 - BuddyRankComparator.musicTrackGroupId = var0; // L: 3301 - class206.musicTrackFileId = 0; // L: 3302 - Tiles.musicTrackVolume = var2; // L: 3303 - class206.musicTrackBoolean = false; // L: 3304 - FaceNormal.pcmSampleLength = 2; // L: 3305 - } + static final void method724(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7532 + int var2 = var1.readBits(15); // L: 7533 + if (var2 != 32767) { // L: 7534 + boolean var3 = false; // L: 7535 + if (Client.npcs[var2] == null) { // L: 7536 + Client.npcs[var2] = new NPC(); // L: 7537 + var3 = true; // L: 7538 + } - Client.currentTrackGroupId = var0; // L: 3308 - } // L: 3309 + NPC var4 = Client.npcs[var2]; // L: 7540 + Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7541 + var4.npcCycle = Client.cycle; // L: 7542 + int var5 = var1.readBits(1); // L: 7543 + int var6 = var1.readBits(1); // L: 7544 + if (var6 == 1) { // L: 7545 + Client.field727[++Client.field726 - 1] = var2; + } + + int var7 = Client.defaultRotations[var1.readBits(3)]; // L: 7546 + if (var3) { // L: 7547 + var4.orientation = var4.rotation = var7; + } + + int var8; + if (var0) { // L: 7549 + var8 = var1.readBits(8); // L: 7550 + if (var8 > 127) { // L: 7551 + var8 -= 256; + } + } else { + var8 = var1.readBits(5); // L: 7554 + if (var8 > 15) { // L: 7555 + var8 -= 32; + } + } + + int var9; + if (var0) { // L: 7558 + var9 = var1.readBits(8); // L: 7559 + if (var9 > 127) { // L: 7560 + var9 -= 256; + } + } else { + var9 = var1.readBits(5); // L: 7563 + if (var9 > 15) { // L: 7564 + var9 -= 32; + } + } + + var4.definition = Clock.getNpcDefinition(var1.readBits(14)); // L: 7566 + var4.field1011 = var4.definition.size; // L: 7567 + var4.field1028 = var4.definition.rotation; // L: 7568 + if (var4.field1028 == 0) { // L: 7569 + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; // L: 7570 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7571 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7572 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7573 + var4.idleSequence = var4.definition.idleSequence; // L: 7574 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7575 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7576 + var4.method2144(PlayerType.localPlayer.pathX[0] + var9, PlayerType.localPlayer.pathY[0] + var8, var5 == 1); // L: 7577 + continue; // L: 7578 + } + } + + var1.exportIndex(); // L: 7579 + return; // L: 7580 + } + } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 8ab74afe76..eb6ca49314 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -1,22 +1,31 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("l") +@ObfuscatedName("h") +@Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { + @ObfuscatedName("gm") + @ObfuscatedGetter( + intValue = 1706879037 + ) + @Export("baseY") + static int baseY; + WorldMapData_0() { } // L: 6 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "29" + descriptor = "(Lkb;B)V", + garbageValue = "-1" ) + @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field291.value) { // L: 10 + if (var2 != WorldMapID.field295.value) { // L: 10 throw new IllegalStateException(""); // L: 11 } else { super.minPlane = var1.readUnsignedByte(); // L: 13 @@ -24,115 +33,216 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionXLow = var1.readUnsignedShort(); // L: 15 super.regionYLow = var1.readUnsignedShort(); // L: 16 super.regionX = var1.readUnsignedShort(); // L: 17 - super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method5634(); // L: 19 - super.fileId = var1.method5634(); // L: 20 + super.regionY = var1.readUnsignedShort(); + super.groupId = var1.method5851(); + super.fileId = var1.method5851(); } - } // L: 21 + } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "728123848" + descriptor = "(Lkb;I)V", + garbageValue = "-1024222647" ) + @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.field198 = new byte[super.planes][64][64]; // L: 27 - super.field191 = new byte[super.planes][64][64]; - super.decorations = new WorldMapDecoration[super.planes][64][64][]; - int var2 = var1.readUnsignedByte(); - if (var2 != class39.field279.value) { - throw new IllegalStateException(""); + super.planes = Math.min(super.planes, 4); // L: 24 + super.floorUnderlayIds = new short[1][64][64]; // L: 25 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 26 + super.field196 = new byte[super.planes][64][64]; // L: 27 + super.field187 = new byte[super.planes][64][64]; // L: 28 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29 + int var2 = var1.readUnsignedByte(); // L: 30 + if (var2 != class39.field287.value) { // L: 31 + throw new IllegalStateException(""); // L: 32 } else { - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); + int var3 = var1.readUnsignedByte(); // L: 34 + int var4 = var1.readUnsignedByte(); // L: 35 if (var3 == super.regionX && var4 == super.regionY) { // L: 36 - for (int var5 = 0; var5 < 64; ++var5) { - for (int var6 = 0; var6 < 64; ++var6) { - this.readTile(var5, var6, var1); + for (int var5 = 0; var5 < 64; ++var5) { // L: 39 + for (int var6 = 0; var6 < 64; ++var6) { // L: 40 + this.readTile(var5, var6, var1); // L: 41 } } } else { - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 37 } } } // L: 44 + public int hashCode() { + return super.regionX | super.regionY << 8; + } + public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { + if (!(var1 instanceof WorldMapData_0)) { // L: 47 return false; // L: 48 } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 - return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51 + WorldMapData_0 var2 = (WorldMapData_0)var1; + return var2.regionX == super.regionX && var2.regionY == super.regionY; } } - public int hashCode() { - return super.regionX | super.regionY << 8; // L: 55 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lkb;Ljava/lang/String;B)I", + garbageValue = "-23" + ) + public static int method269(Buffer var0, String var1) { + int var2 = var0.offset; // L: 18 + byte[] var3 = class8.method113(var1); // L: 19 + var0.writeSmartByteShort(var3.length); // L: 20 + var0.offset += class219.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 21 + return var0.offset - var2; // L: 22 } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-379441451" + descriptor = "(II)I", + garbageValue = "-1892884103" ) - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 - if (var4 == null) { // L: 24 - var4 = new ChatChannel(); // L: 25 - Messages.Messages_channels.put(var0, var4); // L: 26 - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 - Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 - Messages.Messages_queue.add(var5); // L: 30 - Client.chatCycle = Client.cycleCntr; + public static int method266(int var0) { + --var0; // L: 49 + var0 |= var0 >>> 1; // L: 50 + var0 |= var0 >>> 2; // L: 51 + var0 |= var0 >>> 4; // L: 52 + var0 |= var0 >>> 8; // L: 53 + var0 |= var0 >>> 16; // L: 54 + return var0 + 1; // L: 55 } - @ObfuscatedName("s") + @ObfuscatedName("es") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZS)V", - garbageValue = "-25637" + descriptor = "(IB)V", + garbageValue = "-76" ) - static void method255(String var0, boolean var1, String var2, boolean var3) { - if (var1) { // L: 31 - if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 32 - try { - Desktop.getDesktop().browse(new URI(var0)); // L: 34 - return; // L: 35 - } catch (Exception var5) { // L: 37 + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2870 + GrandExchangeOfferNameComparator.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2871 + GrandExchangeOfferNameComparator.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2872 + GrandExchangeOfferNameComparator.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2873 + Login.loginIndex = 3; // L: 2874 + Login.field1217 = 1; // L: 2875 + } else if (var0 == 4) { // L: 2877 + WorldMapDecoration.method428(0); // L: 2878 + } else if (var0 == 5) { // L: 2880 + Login.field1217 = 2; // L: 2881 + GrandExchangeOfferNameComparator.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."); // L: 2882 + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2884 + if (var0 == 7) { // L: 2887 + GrandExchangeOfferNameComparator.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2888 + GrandExchangeOfferNameComparator.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2889 + GrandExchangeOfferNameComparator.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2890 + GrandExchangeOfferNameComparator.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2891 + GrandExchangeOfferNameComparator.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2892 + GrandExchangeOfferNameComparator.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2893 + GrandExchangeOfferNameComparator.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2894 + GrandExchangeOfferNameComparator.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2895 + GrandExchangeOfferNameComparator.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2896 + GrandExchangeOfferNameComparator.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { // L: 2897 + WorldMapDecoration.method428(1); // L: 2898 + } else if (var0 == 19) { // L: 2900 + GrandExchangeOfferNameComparator.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2901 + GrandExchangeOfferNameComparator.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2902 + GrandExchangeOfferNameComparator.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2903 + GrandExchangeOfferNameComparator.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2904 + GrandExchangeOfferNameComparator.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2905 + GrandExchangeOfferNameComparator.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2906 + GrandExchangeOfferNameComparator.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2907 + GrandExchangeOfferNameComparator.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2908 + GrandExchangeOfferNameComparator.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) { // L: 2909 + GrandExchangeOfferNameComparator.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) { // L: 2910 + GrandExchangeOfferNameComparator.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2911 + GrandExchangeOfferNameComparator.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2912 + Login.loginIndex = 8; // L: 2913 + } else { + if (var0 == 56) { // L: 2915 + GrandExchangeOfferNameComparator.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2916 + BuddyRankComparator.updateGameState(11); // L: 2917 + return; // L: 2918 + } + + if (var0 == 57) { // L: 2920 + GrandExchangeOfferNameComparator.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2921 + BuddyRankComparator.updateGameState(11); // L: 2922 + return; // L: 2923 + } + + if (var0 == 61) { // L: 2925 + Login.loginIndex = 7; // L: 2926 + } else { + GrandExchangeOfferNameComparator.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2928 } } - - if (class60.field451.startsWith("win") && !var3) { // L: 39 40 - FontName.method5444(var0, 0); // L: 41 - return; // L: 42 - } - - if (class60.field451.startsWith("mac")) { // L: 45 - WorldMapIcon_1.method380(var0, 1, var2); // L: 46 - return; // L: 47 - } - - FontName.method5444(var0, 2); // L: 49 } else { - FontName.method5444(var0, 3); // L: 52 + GrandExchangeOfferNameComparator.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2885 } - } // L: 54 + BuddyRankComparator.updateGameState(10); // L: 2929 + } // L: 2930 - @ObfuscatedName("o") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2125303788" + descriptor = "(IIIIIB)V", + garbageValue = "94" ) - static void method263(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 - if (var1 != null) { - var1.remove(); // L: 74 + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + WorldMapSection0.scrollBarSprites[0].drawAt(var0, var1); // L: 9972 + WorldMapSection0.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 9973 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field925); // L: 9974 + int var5 = var3 * (var3 - 32) / var4; // L: 9975 + if (var5 < 8) { // L: 9976 + var5 = 8; } - } // L: 73 75 + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 9977 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field765); // L: 9978 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field747); // L: 9979 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field747); // L: 9980 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field747); // L: 9981 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field747); // L: 9982 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field746); // L: 9983 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field746); // L: 9984 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field746); // L: 9985 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field746); // L: 9986 + } // L: 9987 + + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(Lht;I)I", + garbageValue = "1533112407" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11526 + return var1 != null ? var1.integer : var0.flags; // L: 11527 11528 + } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index c47949129a..963f83e7a6 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -1,50 +1,58 @@ -import java.io.IOException; -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("aw") +@ObfuscatedName("ae") +@Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("en") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "Liw;" + descriptor = "Lid;" ) - static Archive archive19; - @ObfuscatedName("c") + @Export("archive9") + static Archive archive9; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1032395207 + intValue = -212739847 ) + @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1804098781 - ) - int chunkYLow; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1816930541 + intValue = -1897982075 ) - int chunkX; - @ObfuscatedName("v") + @Export("chunkYLow") + int chunkYLow; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 875347201 + intValue = -1681555037 ) + @Export("chunkX") + int chunkX; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -1263884987 + ) + @Export("chunkY") int chunkY; WorldMapData_1() { } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "-5" + descriptor = "(Lkb;B)V", + garbageValue = "-1" ) + @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field288.value) { // L: 15 + if (var2 != WorldMapID.field292.value) { // L: 15 throw new IllegalStateException(""); // L: 16 } else { super.minPlane = var1.readUnsignedByte(); // L: 18 @@ -57,25 +65,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); // L: 25 this.chunkX = var1.readUnsignedByte(); // L: 26 this.chunkY = var1.readUnsignedByte(); // L: 27 - super.groupId = var1.method5634(); // L: 28 - super.fileId = var1.method5634(); // L: 29 + super.groupId = var1.method5851(); // L: 28 + super.fileId = var1.method5851(); // L: 29 } } // L: 30 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "728123848" + descriptor = "(Lkb;I)V", + garbageValue = "-1024222647" ) + @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); // L: 33 super.floorUnderlayIds = new short[1][64][64]; // L: 34 super.floorOverlayIds = new short[super.planes][64][64]; // L: 35 - super.field198 = new byte[super.planes][64][64]; // L: 36 - super.field191 = new byte[super.planes][64][64]; // L: 37 + super.field196 = new byte[super.planes][64][64]; // L: 36 + super.field187 = new byte[super.planes][64][64]; // L: 37 super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38 int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 != class39.field280.value) { // L: 40 + if (var2 != class39.field285.value) { // L: 40 throw new IllegalStateException(""); // L: 41 } else { int var3 = var1.readUnsignedByte(); // L: 43 @@ -95,40 +104,44 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } // L: 55 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-173161380" + descriptor = "(B)I", + garbageValue = "-11" ) + @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; // L: 73 + return this.chunkXLow; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1289176366" + garbageValue = "-810889585" ) + @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; // L: 77 } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1672760755" + descriptor = "(B)I", + garbageValue = "65" ) + @Export("getChunkX") int getChunkX() { - return this.chunkX; + return this.chunkX; // L: 81 } - @ObfuscatedName("aa") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-56911987" + garbageValue = "936777914" ) + @Export("getChunkY") int getChunkY() { - return this.chunkY; + return this.chunkY; // L: 85 } public boolean equals(Object var1) { @@ -136,7 +149,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { return false; // L: 59 } else { WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 - if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 62 + if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 62 return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 65 } else { return false; // L: 63 @@ -148,119 +161,351 @@ public class WorldMapData_1 extends AbstractWorldMapData { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(Lkb;II)V", + garbageValue = "-984950165" ) - static void savePreferences() { - AccessFile var0 = null; // L: 81 + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 129 + var2.size = var0.readUnsignedByte(); // L: 130 + var2.id = var0.readInt(); // L: 131 + var2.operations = new int[var2.size]; // L: 132 + var2.creationErrors = new int[var2.size]; // L: 133 + var2.fields = new Field[var2.size]; // L: 134 + var2.intReplaceValues = new int[var2.size]; // L: 135 + var2.methods = new Method[var2.size]; // L: 136 + var2.arguments = new byte[var2.size][][]; // L: 137 - try { - var0 = class2.getPreferencesFile("", Tiles.field532.name, true); // L: 83 - Buffer var1 = Tile.clientPreferences.toBuffer(); // L: 84 - var0.write(var1.array, 0, var1.offset); // L: 85 - } catch (Exception var3) { // L: 87 - } - - try { - if (var0 != null) { // L: 89 - var0.closeSync(true); // L: 90 - } - } catch (Exception var2) { // L: 93 - } - - } // L: 94 - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "570960818" - ) - protected static int getGcDuration() { - int var0 = 0; // L: 549 - if (WorldMapIcon_0.garbageCollector == null || !WorldMapIcon_0.garbageCollector.isValid()) { // L: 550 + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 138 try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 552 + int var4 = var0.readUnsignedByte(); // L: 140 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 141 + if (var4 == 3 || var4 == 4) { // L: 151 + var5 = var0.readStringCp1252NullTerminated(); // L: 152 + var6 = var0.readStringCp1252NullTerminated(); // L: 153 + var7 = var0.readUnsignedByte(); // L: 154 + String[] var8 = new String[var7]; // L: 155 - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 553 - if (var2.isValid()) { // L: 555 - WorldMapIcon_0.garbageCollector = var2; // L: 556 - GameShell.garbageCollectorLastCheckTimeMs = -1L; // L: 557 - GameShell.garbageCollectorLastCollectionTime = -1L; // L: 558 + for (int var9 = 0; var9 < var7; ++var9) { // L: 156 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 157 + byte[][] var10 = new byte[var7][]; // L: 158 + int var12; + if (var4 == 3) { // L: 159 + for (int var11 = 0; var11 < var7; ++var11) { // L: 160 + var12 = var0.readInt(); // L: 161 + var10[var11] = new byte[var12]; // L: 162 + var0.readBytes(var10[var11], 0, var12); // L: 163 + } + } + + var2.operations[var3] = var4; // L: 166 + Class[] var21 = new Class[var7]; // L: 167 + + for (var12 = 0; var12 < var7; ++var12) { // L: 168 + var21[var12] = Archive.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = Archive.loadClassFromDescriptor(var20); // L: 169 + if (Archive.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 170 + throw new SecurityException(); + } + + Method[] var13 = Archive.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 171 + Method[] var14 = var13; // L: 173 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 174 + Method var16 = var14[var15]; // L: 175 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 177 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 178 + if (var17.length == var21.length) { // L: 179 + boolean var18 = true; // L: 180 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 181 + if (var21[var19] != var17[var19]) { // L: 182 + var18 = false; // L: 183 + break; // L: 184 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 187 + var2.methods[var3] = var16; // L: 188 + } + } + } + } + + var2.arguments[var3] = var10; // L: 195 } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 142 + var6 = var0.readStringCp1252NullTerminated(); // L: 143 + var7 = 0; // L: 144 + if (var4 == 1) { // L: 145 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 146 + var2.intReplaceValues[var3] = var7; // L: 147 + if (Archive.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 148 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(Archive.loadClassFromDescriptor(var5), var6); // L: 149 } - } catch (Throwable var11) { // L: 563 + } catch (ClassNotFoundException var24) { // L: 198 + var2.creationErrors[var3] = -1; // L: 199 + } catch (SecurityException var25) { // L: 201 + var2.creationErrors[var3] = -2; // L: 202 + } catch (NullPointerException var26) { // L: 204 + var2.creationErrors[var3] = -3; // L: 205 + } catch (Exception var27) { // L: 207 + var2.creationErrors[var3] = -4; // L: 208 + } catch (Throwable var28) { // L: 210 + var2.creationErrors[var3] = -5; // L: 211 } } - if (WorldMapIcon_0.garbageCollector != null) { // L: 565 - long var9 = PacketWriter.currentTimeMillis(); // L: 566 - long var3 = WorldMapIcon_0.garbageCollector.getCollectionTime(); // L: 567 - if (-1L != GameShell.garbageCollectorLastCollectionTime) { // L: 568 - long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; // L: 569 - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; // L: 570 - if (0L != var7) { // L: 571 - var0 = (int)(var5 * 100L / var7); - } - } + class105.reflectionChecks.addFirst(var2); // L: 214 + } // L: 215 - GameShell.garbageCollectorLastCollectionTime = var3; // L: 573 - GameShell.garbageCollectorLastCheckTimeMs = var9; // L: 574 - } - - return var0; // L: 576 - } - - @ObfuscatedName("ex") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1000251119" + descriptor = "(Lks;IB)V", + garbageValue = "0" ) - static int method785() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1437 - int var0 = 0; // L: 1438 - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1439 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1440 - } - - return var0 * 10000 / Client.field949; // L: 1442 - } else { - return 10000; + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 362 + if (var2) { // L: 363 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; } - } - @ObfuscatedName("kt") + int var3 = var0.readBits(2); // L: 364 + Player var4 = Client.players[var1]; // L: 365 + if (var3 == 0) { // L: 366 + if (var2) { // L: 367 + var4.field664 = false; // L: 368 + } else if (Client.localPlayerIndex == var1) { // L: 371 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (FloorDecoration.baseX + var4.pathX[0] >> 13 << 14) + (WorldMapData_0.baseY + var4.pathY[0] >> 13); // L: 372 + if (var4.field1003 != -1) { // L: 373 + Players.Players_orientations[var1] = var4.field1003; + } else { + Players.Players_orientations[var1] = var4.orientation; // L: 374 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 375 + Client.players[var1] = null; // L: 376 + if (var0.readBits(1) != 0) { // L: 377 + class9.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 380 + var5 = var0.readBits(3); // L: 381 + var6 = var4.pathX[0]; // L: 382 + var7 = var4.pathY[0]; // L: 383 + if (var5 == 0) { // L: 384 + --var6; // L: 385 + --var7; // L: 386 + } else if (var5 == 1) { // L: 388 + --var7; + } else if (var5 == 2) { // L: 389 + ++var6; // L: 390 + --var7; // L: 391 + } else if (var5 == 3) { // L: 393 + --var6; + } else if (var5 == 4) { // L: 394 + ++var6; + } else if (var5 == 5) { // L: 395 + --var6; // L: 396 + ++var7; // L: 397 + } else if (var5 == 6) { // L: 399 + ++var7; + } else if (var5 == 7) { // L: 400 + ++var6; // L: 401 + ++var7; // L: 402 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 404 + var4.resetPath(var6, var7); // L: 405 + var4.field664 = false; // L: 406 + } else if (var2) { // L: 408 + var4.field664 = true; // L: 409 + var4.tileX = var6; // L: 410 + var4.tileY = var7; // L: 411 + } else { + var4.field664 = false; // L: 414 + var4.method1335(var6, var7, Players.field1295[var1]); // L: 415 + } + + } else if (var3 == 2) { // L: 419 + var5 = var0.readBits(4); // L: 420 + var6 = var4.pathX[0]; // L: 421 + var7 = var4.pathY[0]; // L: 422 + if (var5 == 0) { // L: 423 + var6 -= 2; // L: 424 + var7 -= 2; // L: 425 + } else if (var5 == 1) { // L: 427 + --var6; // L: 428 + var7 -= 2; // L: 429 + } else if (var5 == 2) { // L: 431 + var7 -= 2; + } else if (var5 == 3) { // L: 432 + ++var6; // L: 433 + var7 -= 2; // L: 434 + } else if (var5 == 4) { // L: 436 + var6 += 2; // L: 437 + var7 -= 2; // L: 438 + } else if (var5 == 5) { // L: 440 + var6 -= 2; // L: 441 + --var7; // L: 442 + } else if (var5 == 6) { // L: 444 + var6 += 2; // L: 445 + --var7; // L: 446 + } else if (var5 == 7) { // L: 448 + var6 -= 2; + } else if (var5 == 8) { // L: 449 + var6 += 2; + } else if (var5 == 9) { // L: 450 + var6 -= 2; // L: 451 + ++var7; // L: 452 + } else if (var5 == 10) { // L: 454 + var6 += 2; // L: 455 + ++var7; // L: 456 + } else if (var5 == 11) { // L: 458 + var6 -= 2; // L: 459 + var7 += 2; // L: 460 + } else if (var5 == 12) { // L: 462 + --var6; // L: 463 + var7 += 2; // L: 464 + } else if (var5 == 13) { // L: 466 + var7 += 2; + } else if (var5 == 14) { // L: 467 + ++var6; // L: 468 + var7 += 2; // L: 469 + } else if (var5 == 15) { // L: 471 + var6 += 2; // L: 472 + var7 += 2; // L: 473 + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 475 + if (var2) { // L: 479 + var4.field664 = true; // L: 480 + var4.tileX = var6; // L: 481 + var4.tileY = var7; // L: 482 + } else { + var4.field664 = false; // L: 485 + var4.method1335(var6, var7, Players.field1295[var1]); // L: 486 + } + } else { + var4.resetPath(var6, var7); // L: 476 + var4.field664 = false; // L: 477 + } + + } else { + var5 = var0.readBits(1); // L: 490 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 491 + var6 = var0.readBits(12); // L: 492 + var7 = var6 >> 10; // L: 493 + var8 = var6 >> 5 & 31; // L: 494 + if (var8 > 15) { // L: 495 + var8 -= 32; + } + + var9 = var6 & 31; // L: 496 + if (var9 > 15) { // L: 497 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 498 + var11 = var9 + var4.pathY[0]; // L: 499 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 500 + var4.resetPath(var10, var11); // L: 501 + var4.field664 = false; // L: 502 + } else if (var2) { // L: 504 + var4.field664 = true; // L: 505 + var4.tileX = var10; // L: 506 + var4.tileY = var11; // L: 507 + } else { + var4.field664 = false; // L: 510 + var4.method1335(var10, var11, Players.field1295[var1]); // L: 511 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 513 + if (Client.localPlayerIndex == var1) { // L: 514 + GrandExchangeOfferUnitPriceComparator.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 517 + var7 = var6 >> 28; // L: 518 + var8 = var6 >> 14 & 16383; // L: 519 + var9 = var6 & 16383; // L: 520 + var10 = (var8 + FloorDecoration.baseX + var4.pathX[0] & 16383) - FloorDecoration.baseX; // L: 521 + var11 = (var9 + WorldMapData_0.baseY + var4.pathY[0] & 16383) - WorldMapData_0.baseY; // L: 522 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 523 + var4.resetPath(var10, var11); // L: 524 + var4.field664 = false; // L: 525 + } else if (var2) { // L: 527 + var4.field664 = true; // L: 528 + var4.tileX = var10; // L: 529 + var4.tileY = var11; // L: 530 + } else { + var4.field664 = false; // L: 533 + var4.method1335(var10, var11, Players.field1295[var1]); // L: 534 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 536 + if (Client.localPlayerIndex == var1) { // L: 537 + GrandExchangeOfferUnitPriceComparator.Client_plane = var4.plane; + } + + } + } + } + } // L: 369 378 417 488 515 538 + + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "28" + descriptor = "(II)V", + garbageValue = "-218590717" ) - static void method783(Buffer var0) { - if (Client.randomDatData != null) { // L: 10832 - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 10833 - } else { - byte[] var2 = new byte[24]; // L: 10838 - - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 10840 - JagexCache.JagexCache_randomDat.readFully(var2); // L: 10841 - - int var3; - for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { // L: 10842 10843 10844 - } - - if (var3 >= 24) { // L: 10846 - throw new IOException(); - } - } catch (Exception var6) { - for (int var4 = 0; var4 < 24; ++var4) { // L: 10849 - var2[var4] = -1; - } - } - - var0.writeBytes(var2, 0, var2.length); // L: 10854 + static void method817(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 } - } // L: 10834 10855 + } // L: 73 75 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILhw;ZI)V", + garbageValue = "2083872008" + ) + static void method796(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = Canvas.getWorldMap().getMapArea(var0); // L: 3851 + int var4 = PlayerType.localPlayer.plane; // L: 3852 + int var5 = (PlayerType.localPlayer.x >> 7) + FloorDecoration.baseX; // L: 3853 + int var6 = (PlayerType.localPlayer.y >> 7) + WorldMapData_0.baseY; // L: 3854 + Coord var7 = new Coord(var4, var5, var6); // L: 3855 + Canvas.getWorldMap().method6470(var3, var7, var1, var2); // L: 3856 + } // L: 3857 } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 4dafde5403..277271463e 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -1,25 +1,42 @@ -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; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aa") +@ObfuscatedName("az") +@Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1951458321 + @ObfuscatedName("se") + @ObfuscatedSignature( + descriptor = "Lr;" ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Ldz;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 573803167 + ) + @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1622720231 + intValue = 502095041 ) + @Export("decoration") final int decoration; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1680868715 + intValue = -81694959 ) + @Export("rotation") final int rotation; WorldMapDecoration(int var1, int var2, int var3) { @@ -28,52 +45,35 @@ public class WorldMapDecoration { this.rotation = var3; // L: 11 } // L: 12 - @ObfuscatedName("z") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;I)V", - garbageValue = "1315266294" + descriptor = "(IB)V", + garbageValue = "7" ) - static void method406(File var0) { - FileSystem.FileSystem_cacheDir = var0; // L: 16 - if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; // L: 18 - } - } // L: 19 + static void method428(int var0) { + Login.loginIndex = 12; // L: 1560 + Login.field1216 = var0; // L: 1561 + } // L: 1562 - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1984297327" + descriptor = "(ILco;ZI)I", + garbageValue = "-1847675306" ) - static int method405(int var0, Script var1, boolean var2) { - Widget var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1285 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1286 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var3)); // L: 1287 - return 1; // L: 1288 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1290 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1297 - if (var3.dataText == null) { // L: 1298 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1299 - } - - return 1; // L: 1300 - } else { - return 2; // L: 1302 - } + static int method429(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1705 + MilliClock.Interpreter_intStackSize -= 3; // L: 1706 + KitDefinition.queueSoundEffect(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize], Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]); // L: 1707 + return 1; // L: 1708 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1710 + Messages.playSong(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 1711 + return 1; // L: 1712 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1714 + MilliClock.Interpreter_intStackSize -= 2; // L: 1715 + Projectile.playSoundJingle(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize], Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 1716 + return 1; // L: 1717 } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1291 - --var4; // L: 1292 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1293 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1294 - } else { - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1295 + return 2; // L: 1719 } } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index ac2eadfa30..defd550b58 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,129 +1,133 @@ +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("hl") +@ObfuscatedName("ha") +@Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2760(0, 0), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2759(1, 0), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2763(2, 0), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2757(3, 0), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2761(9, 2), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2767(4, 1), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2769(5, 1), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2764(6, 1), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2765(7, 1), - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2758(8, 1), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2771(12, 2), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2768(13, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2762(14, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2770(15, 2), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2766(16, 2), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhl;" - ) - field2772(17, 2), @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lha;" ) - field2773(18, 2), - @ObfuscatedName("y") + field2750(0, 0), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lha;" ) - field2774(19, 2), - @ObfuscatedName("v") + field2747(1, 0), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lha;" ) - field2780(20, 2), - @ObfuscatedName("j") + field2748(2, 0), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lha;" ) - field2776(21, 2), - @ObfuscatedName("r") + field2754(3, 0), + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lha;" ) - field2777(10, 2), + field2751(9, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2746(4, 1), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2752(5, 1), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2753(6, 1), @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lha;" ) - field2778(11, 2), + field2749(7, 1), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2769(8, 1), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2756(12, 2), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2757(13, 2), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2758(14, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2759(15, 2), @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lha;" ) - field2779(22, 3); + field2760(16, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2761(17, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2762(18, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2755(19, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2764(20, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2765(21, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2766(10, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2767(11, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lha;" + ) + field2768(22, 3); - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 212530535 + intValue = 1136720449 ) + @Export("id") public final int id; @ObfuscatedSignature( @@ -134,12 +138,22 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; // L: 34 } // L: 35 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 38 } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lgd;", + garbageValue = "-518638866" + ) + static LoginPacket[] method4257() { + return new LoginPacket[]{LoginPacket.field2342, LoginPacket.field2341, LoginPacket.field2338, LoginPacket.field2346, LoginPacket.field2339, LoginPacket.field2340}; // L: 22 + } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 31ca4ba92b..ec9051b30b 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -1,287 +1,311 @@ +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("iv") +@ObfuscatedName("ij") +@Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) - public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("k") + @Export("WorldMapElement_archive") + static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Liv;" + descriptor = "[Lij;" ) - public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1742537505 - ) - public static int WorldMapElement_count; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2104194333 - ) - public final int objectId; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1581878653 - ) - public int sprite1; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -886122493 - ) - int sprite2; - @ObfuscatedName("w") - public String name; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 2144841941 - ) - public int field3243; + @Export("WorldMapElement_cached") + static WorldMapElement[] WorldMapElement_cached; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1165437927 + @ObfuscatedSignature( + descriptor = "Lev;" ) - public int textSize; - @ObfuscatedName("d") - public String[] menuActions; - @ObfuscatedName("h") - public String menuTargetName; - @ObfuscatedName("a") - int[] field3247; + @Export("WorldMapElement_cachedSprites") + static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1215445883 + ) + @Export("objectId") + public final int objectId; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -880693079 + intValue = 1607593407 ) - int field3248; + @Export("sprite1") + public int sprite1; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 97047321 + ) + @Export("sprite2") + int sprite2; @ObfuscatedName("c") + @Export("name") + public String name; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 328256207 + intValue = -1968208311 ) - int field3249; - @ObfuscatedName("f") + public int field3245; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1153457135 + intValue = -1892301399 ) - int field3250; + @Export("textSize") + public int textSize; + @ObfuscatedName("o") + public boolean field3258; + @ObfuscatedName("n") + public boolean field3248; + @ObfuscatedName("x") + @Export("menuActions") + public String[] menuActions; + @ObfuscatedName("p") + @Export("menuTargetName") + public String menuTargetName; + @ObfuscatedName("r") + int[] field3243; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1976425027 + intValue = 802871207 ) - int field3251; + int field3252; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -294512157 + ) + int field3253; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -935648347 + ) + int field3247; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 2073996601 + ) + int field3255; @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lju;" + descriptor = "Ljy;" ) + @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("j") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lit;" + descriptor = "Lir;" ) + @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("r") - int[] field3253; - @ObfuscatedName("u") - byte[] field3242; - @ObfuscatedName("p") + @ObfuscatedName("a") + int[] field3251; + @ObfuscatedName("g") + byte[] field3240; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 763418107 + intValue = 2142350901 ) + @Export("category") public int category; static { WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 } - public WorldMapElement(int var1) { + WorldMapElement(int var1) { this.sprite1 = -1; // L: 18 this.sprite2 = -1; // L: 19 this.textSize = 0; // L: 22 - this.menuActions = new String[5]; // L: 24 - this.field3248 = Integer.MAX_VALUE; // L: 27 - this.field3249 = Integer.MAX_VALUE; // L: 28 - this.field3250 = Integer.MIN_VALUE; // L: 29 - this.field3251 = Integer.MIN_VALUE; // L: 30 - this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 31 - this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 32 - this.category = -1; // L: 35 - this.objectId = var1; // L: 38 - } // L: 39 + this.field3258 = true; // L: 24 + this.field3248 = false; // L: 25 + this.menuActions = new String[5]; // L: 26 + this.field3252 = Integer.MAX_VALUE; // L: 29 + this.field3253 = Integer.MAX_VALUE; // L: 30 + this.field3247 = Integer.MIN_VALUE; // L: 31 + this.field3255 = Integer.MIN_VALUE; // L: 32 + this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33 + this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34 + this.category = -1; // L: 37 + this.objectId = var1; // L: 40 + } // L: 41 - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkf;B)V", - garbageValue = "-62" + descriptor = "(Lkb;S)V", + garbageValue = "-15323" ) - public void decode(Buffer var1) { + @Export("decode") + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 50 - if (var2 == 0) { // L: 51 - return; // L: 54 + int var2 = var1.readUnsignedByte(); // L: 70 + if (var2 == 0) { // L: 71 + return; // L: 74 } - this.decodeNext(var1, var2); // L: 52 + this.decodeNext(var1, var2); // L: 72 } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;IB)V", - garbageValue = "87" + descriptor = "(Lkb;II)V", + garbageValue = "-2023596008" ) + @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 57 - this.sprite1 = var1.method5634(); - } else if (var2 == 2) { // L: 58 - this.sprite2 = var1.method5634(); - } else if (var2 == 3) { // L: 59 + if (var2 == 1) { // L: 77 + this.sprite1 = var1.method5851(); + } else if (var2 == 2) { // L: 78 + this.sprite2 = var1.method5851(); + } else if (var2 == 3) { // L: 79 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 60 - this.field3243 = var1.readMedium(); - } else if (var2 == 5) { // L: 61 - var1.readMedium(); // L: 62 - } else if (var2 == 6) { // L: 64 + } else if (var2 == 4) { // L: 80 + this.field3245 = var1.readMedium(); + } else if (var2 == 5) { // L: 81 + var1.readMedium(); // L: 82 + } else if (var2 == 6) { // L: 84 this.textSize = var1.readUnsignedByte(); } else { int var6; - if (var2 == 7) { // L: 65 - var6 = var1.readUnsignedByte(); // L: 66 - if ((var6 & 1) == 0) { // L: 67 + if (var2 == 7) { // L: 85 + var6 = var1.readUnsignedByte(); // L: 86 + if ((var6 & 1) == 0) { // L: 87 + this.field3258 = false; } - if ((var6 & 2) == 2) { // L: 68 + if ((var6 & 2) == 2) { // L: 88 + this.field3248 = true; } - } else if (var2 == 8) { // L: 70 - var1.readUnsignedByte(); // L: 71 - } else if (var2 >= 10 && var2 <= 14) { // L: 73 + } else if (var2 == 8) { // L: 90 + var1.readUnsignedByte(); // L: 91 + } else if (var2 >= 10 && var2 <= 14) { // L: 93 this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { // L: 74 - var6 = var1.readUnsignedByte(); // L: 75 - this.field3247 = new int[var6 * 2]; // L: 76 + } else if (var2 == 15) { // L: 94 + var6 = var1.readUnsignedByte(); // L: 95 + this.field3243 = new int[var6 * 2]; // L: 96 int var4; - for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 77 - this.field3247[var4] = var1.readShort(); + for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 97 + this.field3243[var4] = var1.readShort(); } - var1.readInt(); // L: 78 - var4 = var1.readUnsignedByte(); // L: 79 - this.field3253 = new int[var4]; // L: 80 + var1.readInt(); // L: 98 + var4 = var1.readUnsignedByte(); // L: 99 + this.field3251 = new int[var4]; // L: 100 int var5; - for (var5 = 0; var5 < this.field3253.length; ++var5) { // L: 81 - this.field3253[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3251.length; ++var5) { // L: 101 + this.field3251[var5] = var1.readInt(); } - this.field3242 = new byte[var6]; // L: 82 + this.field3240 = new byte[var6]; // L: 102 - for (var5 = 0; var5 < var6; ++var5) { // L: 83 - this.field3242[var5] = var1.readByte(); + for (var5 = 0; var5 < var6; ++var5) { // L: 103 + this.field3240[var5] = var1.readByte(); } - } else if (var2 != 16) { // L: 85 - if (var2 == 17) { // L: 86 + } else if (var2 != 16) { // L: 105 + if (var2 == 17) { // L: 106 this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { // L: 87 - var1.method5634(); // L: 88 - } else if (var2 == 19) { // L: 90 + } else if (var2 == 18) { // L: 107 + var1.method5851(); // L: 108 + } else if (var2 == 19) { // L: 110 this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { // L: 91 - var1.readInt(); // L: 92 - } else if (var2 == 22) { // L: 94 - var1.readInt(); // L: 95 - } else if (var2 == 23) { // L: 97 - var1.readUnsignedByte(); // L: 98 - var1.readUnsignedByte(); // L: 99 - var1.readUnsignedByte(); // L: 100 - } else if (var2 == 24) { // L: 102 - var1.readShort(); // L: 103 - var1.readShort(); // L: 104 - } else if (var2 == 25) { // L: 106 - var1.method5634(); // L: 107 - } else if (var2 == 28) { // L: 109 - var1.readUnsignedByte(); // L: 110 - } else if (var2 == 29) { // L: 112 - this.horizontalAlignment = (HorizontalAlignment)TextureProvider.findEnumerated(BoundaryObject.method3386(), var1.readUnsignedByte()); // L: 113 - } else if (var2 == 30) { // L: 115 - VerticalAlignment[] var3 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3221, VerticalAlignment.field3225}; // L: 118 - this.verticalAlignment = (VerticalAlignment)TextureProvider.findEnumerated(var3, var1.readUnsignedByte()); // L: 120 + } else if (var2 == 21) { // L: 111 + var1.readInt(); // L: 112 + } else if (var2 == 22) { // L: 114 + var1.readInt(); // L: 115 + } else if (var2 == 23) { // L: 117 + var1.readUnsignedByte(); // L: 118 + var1.readUnsignedByte(); // L: 119 + var1.readUnsignedByte(); // L: 120 + } else if (var2 == 24) { // L: 122 + var1.readShort(); // L: 123 + var1.readShort(); // L: 124 + } else if (var2 == 25) { // L: 126 + var1.method5851(); // L: 127 + } else if (var2 == 28) { // L: 129 + var1.readUnsignedByte(); // L: 130 + } else if (var2 == 29) { // L: 132 + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field3479, HorizontalAlignment.field3481, HorizontalAlignment.HorizontalAlignment_centered}; // L: 135 + this.horizontalAlignment = (HorizontalAlignment)class195.findEnumerated(var3, var1.readUnsignedByte()); // L: 137 + } else if (var2 == 30) { // L: 139 + this.verticalAlignment = (VerticalAlignment)class195.findEnumerated(ScriptEvent.method1279(), var1.readUnsignedByte()); // L: 140 } } } - } // L: 123 + } // L: 143 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1332765917" + garbageValue = "1612993867" ) - public void method4469() { - if (this.field3247 != null) { // L: 126 - for (int var1 = 0; var1 < this.field3247.length; var1 += 2) { // L: 127 - if (this.field3247[var1] < this.field3248) { // L: 128 - this.field3248 = this.field3247[var1]; - } else if (this.field3247[var1] > this.field3250) { // L: 129 - this.field3250 = this.field3247[var1]; + void method4518() { + if (this.field3243 != null) { // L: 146 + for (int var1 = 0; var1 < this.field3243.length; var1 += 2) { // L: 147 + if (this.field3243[var1] < this.field3252) { // L: 148 + this.field3252 = this.field3243[var1]; + } else if (this.field3243[var1] > this.field3247) { // L: 149 + this.field3247 = this.field3243[var1]; } - if (this.field3247[var1 + 1] < this.field3249) { // L: 130 - this.field3249 = this.field3247[var1 + 1]; - } else if (this.field3247[var1 + 1] > this.field3251) { - this.field3251 = this.field3247[var1 + 1]; // L: 131 + if (this.field3243[var1 + 1] < this.field3253) { // L: 150 + this.field3253 = this.field3243[var1 + 1]; + } else if (this.field3243[var1 + 1] > this.field3255) { + this.field3255 = this.field3243[var1 + 1]; // L: 151 } } } - } // L: 134 + } // L: 154 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ZI)Llp;", - garbageValue = "435474118" + descriptor = "(ZI)Llc;", + garbageValue = "-2016135845" ) + @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { - int var2 = this.sprite1; // L: 137 - return this.getSprite(var2); // L: 138 + int var2 = this.sprite1; // L: 157 + return this.getSprite(var2); // L: 158 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Llp;", - garbageValue = "-335461547" + descriptor = "(II)Llc;", + garbageValue = "1884936089" ) + @Export("getSprite") Sprite getSprite(int var1) { - if (var1 < 0) { // L: 142 + if (var1 < 0) { // L: 162 return null; } else { - Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); // L: 143 - if (var2 != null) { // L: 144 + Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); // L: 163 + if (var2 != null) { // L: 164 return var2; } else { - var2 = AbstractUserComparator.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 145 - if (var2 != null) { // L: 146 - WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 147 + var2 = FloorDecoration.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 165 + if (var2 != null) { // L: 166 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 167 } - return var2; // L: 149 + return var2; // L: 169 } } } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "13" + descriptor = "(I)I", + garbageValue = "-932820751" ) + @Export("getObjectId") public int getObjectId() { - return this.objectId; // L: 153 + return this.objectId; // L: 173 } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 2a4cba6b8a..48de99319c 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,27 +1,41 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("ap") +@Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("z") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1732221889 + intValue = 1740090343 ) + static int field377; + @ObfuscatedName("gg") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -507222601 + ) + @Export("mapElement") public int mapElement; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lhg;" + descriptor = "Lhw;" ) + @Export("coord1") public Coord coord1; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lhg;" + descriptor = "Lhw;" ) + @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILhg;Lhg;)V" + descriptor = "(ILhw;Lhw;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; // L: 11 @@ -29,95 +43,341 @@ public class WorldMapEvent { this.coord2 = var3; // L: 13 } // L: 14 - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1029806693" + descriptor = "(IIIS)I", + garbageValue = "3638" ) - static int method830(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 389 - return ApproximateRouteStrategy.method1274(var0, var1, var2); - } else if (var0 < 1100) { // L: 390 - return GameBuild.method4218(var0, var1, var2); - } else if (var0 < 1200) { // L: 391 - return WorldMapLabel.method497(var0, var1, var2); - } else if (var0 < 1300) { // L: 392 - return class1.method22(var0, var1, var2); - } else if (var0 < 1400) { // L: 393 - return UrlRequester.method3419(var0, var1, var2); - } else if (var0 < 1500) { // L: 394 - return SecureRandomCallable.method1200(var0, var1, var2); - } else if (var0 < 1600) { // L: 395 - return AttackOption.method2152(var0, var1, var2); - } else if (var0 < 1700) { // L: 396 - return WorldMapLabelSize.method279(var0, var1, var2); - } else if (var0 < 1800) { // L: 397 - return WorldMapIcon_1.method378(var0, var1, var2); - } else if (var0 < 1900) { // L: 398 - return PendingSpawn.method1794(var0, var1, var2); - } else if (var0 < 2000) { // L: 399 - return HitSplatDefinition.method4698(var0, var1, var2); - } else if (var0 < 2100) { // L: 400 - return GameBuild.method4218(var0, var1, var2); - } else if (var0 < 2200) { // L: 401 - return WorldMapLabel.method497(var0, var1, var2); - } else if (var0 < 2300) { // L: 402 - return class1.method22(var0, var1, var2); - } else if (var0 < 2400) { // L: 403 - return UrlRequester.method3419(var0, var1, var2); - } else if (var0 < 2500) { // L: 404 - return SecureRandomCallable.method1200(var0, var1, var2); - } else if (var0 < 2600) { // L: 405 - return KeyHandler.method888(var0, var1, var2); - } else if (var0 < 2700) { // L: 406 - return KeyHandler.method890(var0, var1, var2); - } else if (var0 < 2800) { // L: 407 - return GrandExchangeOfferNameComparator.method231(var0, var1, var2); - } else if (var0 < 2900) { // L: 408 - return WorldMapDecoration.method405(var0, var1, var2); - } else if (var0 < 3000) { // L: 409 - return HitSplatDefinition.method4698(var0, var1, var2); - } else if (var0 < 3200) { // L: 410 - return GrandExchangeOfferWorldComparator.method141(var0, var1, var2); - } else if (var0 < 3300) { // L: 411 - return WorldMapID.method617(var0, var1, var2); - } else if (var0 < 3400) { // L: 412 - return WorldMapArea.method485(var0, var1, var2); - } else if (var0 < 3500) { // L: 413 - return class169.method3542(var0, var1, var2); - } else if (var0 < 3700) { // L: 414 - return Actor.method1798(var0, var1, var2); - } else if (var0 < 4000) { // L: 415 - return HealthBar.method2112(var0, var1, var2); - } else if (var0 < 4100) { // L: 416 - return class303.method5451(var0, var1, var2); - } else if (var0 < 4200) { // L: 417 - return GrandExchangeEvents.method144(var0, var1, var2); - } else if (var0 < 4300) { // L: 418 - return ArchiveDiskAction.method4231(var0, var1, var2); - } else if (var0 < 5100) { - return class171.method3544(var0, var1, var2); // L: 419 - } else if (var0 < 5400) { // L: 420 - return UserComparator7.method3513(var0, var1, var2); - } else if (var0 < 5600) { // L: 421 - return SoundCache.method2607(var0, var1, var2); - } else if (var0 < 5700) { // L: 422 - return AbstractWorldMapData.method351(var0, var1, var2); - } else if (var0 < 6300) { // L: 423 - return class336.method6380(var0, var1, var2); - } else if (var0 < 6600) { // L: 424 - return ItemDefinition.method4793(var0, var1, var2); - } else { - return var0 < 6700 ? Player.method1324(var0, var1, var2) : 2; // L: 425 426 + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 490 + var1 /= 2; } + + if (var2 > 192) { // L: 491 + var1 /= 2; + } + + if (var2 > 217) { // L: 492 + var1 /= 2; + } + + if (var2 > 243) { // L: 493 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 494 + return var3; // L: 495 } - @ObfuscatedName("g") + @ObfuscatedName("hl") @ObfuscatedSignature( - descriptor = "(B)Lct;", - garbageValue = "-13" + descriptor = "(Lgg;I)V", + garbageValue = "-242639541" ) - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? AbstractByteArrayCopier.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 - } + static final void method865(class194 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6876 + int var3; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + if (class194.field2355 == var0) { // L: 6877 + byte var2 = var1.method5837(); // L: 6878 + var3 = var1.method5659(); // L: 6879 + byte var4 = var1.method5837(); // L: 6880 + var5 = var1.method5650(); // L: 6881 + var6 = (var5 >> 4 & 7) + GameShell.field466; // L: 6882 + var7 = (var5 & 7) + GrandExchangeEvents.field64; // L: 6883 + var8 = var1.method5659(); // L: 6884 + var9 = var1.readUnsignedShort(); // L: 6885 + var10 = var1.readUnsignedShort(); // L: 6886 + var11 = var1.method5619(); // L: 6887 + var12 = var11 >> 2; // L: 6888 + var13 = var11 & 3; // L: 6889 + var14 = Client.field954[var12]; // L: 6890 + byte var15 = var1.method5837(); // L: 6891 + byte var16 = var1.method5837(); // L: 6892 + Player var17; + if (var9 == Client.localPlayerIndex) { // L: 6894 + var17 = PlayerType.localPlayer; + } else { + var17 = Client.players[var9]; // L: 6895 + } + + if (var17 != null) { // L: 6896 + ObjectDefinition var18 = ScriptEvent.getObjectDefinition(var10); // L: 6897 + int var19; + int var20; + if (var13 != 1 && var13 != 3) { // L: 6900 + var19 = var18.sizeX; // L: 6905 + var20 = var18.sizeY; // L: 6906 + } else { + var19 = var18.sizeY; // L: 6901 + var20 = var18.sizeX; // L: 6902 + } + + int var21 = var6 + (var19 >> 1); // L: 6908 + int var22 = var6 + (var19 + 1 >> 1); // L: 6909 + int var23 = var7 + (var20 >> 1); // L: 6910 + int var24 = var7 + (var20 + 1 >> 1); // L: 6911 + int[][] var25 = Tiles.Tiles_heights[GrandExchangeOfferUnitPriceComparator.Client_plane]; // L: 6912 + int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; // L: 6913 + int var27 = (var6 << 7) + (var19 << 6); // L: 6914 + int var28 = (var7 << 7) + (var20 << 6); // L: 6915 + Model var29 = var18.getModel(var12, var13, var25, var27, var26, var28); // L: 6916 + if (var29 != null) { // L: 6917 + GrandExchangeOffer.updatePendingSpawn(GrandExchangeOfferUnitPriceComparator.Client_plane, var6, var7, var14, -1, 0, 0, var8 + 1, var3 + 1); // L: 6918 + var17.animationCycleStart = var8 + Client.cycle; // L: 6919 + var17.animationCycleEnd = var3 + Client.cycle; // L: 6920 + var17.model0 = var29; // L: 6921 + var17.field654 = var19 * 64 + var6 * 128; // L: 6922 + var17.field656 = var20 * 64 + var7 * 128; // L: 6923 + var17.tileHeight2 = var26; // L: 6924 + byte var30; + if (var2 > var15) { // L: 6925 + var30 = var2; // L: 6926 + var2 = var15; // L: 6927 + var15 = var30; // L: 6928 + } + + if (var4 > var16) { // L: 6930 + var30 = var4; // L: 6931 + var4 = var16; // L: 6932 + var16 = var30; // L: 6933 + } + + var17.field646 = var6 + var2; // L: 6935 + var17.field660 = var6 + var15; // L: 6936 + var17.field669 = var7 + var4; // L: 6937 + var17.field661 = var16 + var7; // L: 6938 + } + } + } + + TileItem var33; + int var37; + int var38; + if (class194.field2353 == var0) { // L: 6942 + var37 = var1.readUnsignedByte(); // L: 6943 + var3 = (var37 >> 4 & 7) + GameShell.field466; // L: 6944 + var38 = (var37 & 7) + GrandExchangeEvents.field64; // L: 6945 + var5 = var1.method5659(); // L: 6946 + var6 = var1.method5659(); // L: 6947 + if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { // L: 6948 + var33 = new TileItem(); // L: 6949 + var33.id = var5; // L: 6950 + var33.quantity = var6; // L: 6951 + if (Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var3][var38] == null) { // L: 6952 + Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var3][var38] = new NodeDeque(); + } + + Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var3][var38].addFirst(var33); // L: 6953 + class41.updateItemPile(var3, var38); // L: 6954 + } + + } else if (class194.field2348 == var0) { // L: 6958 + var37 = var1.method5619(); // L: 6959 + var3 = (var37 >> 4 & 7) + GameShell.field466; // L: 6960 + var38 = (var37 & 7) + GrandExchangeEvents.field64; // L: 6961 + var5 = var1.method5619(); // L: 6962 + var6 = var5 >> 2; // L: 6963 + var7 = var5 & 3; // L: 6964 + var8 = Client.field954[var6]; // L: 6965 + var9 = var1.method5659(); // L: 6966 + if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { // L: 6967 + GrandExchangeOffer.updatePendingSpawn(GrandExchangeOfferUnitPriceComparator.Client_plane, var3, var38, var8, var9, var6, var7, 0, -1); // L: 6968 + } + + } else if (class194.field2349 == var0) { // L: 6972 + var37 = var1.method5797(); // L: 6973 + var3 = var1.method5675(); // L: 6974 + var38 = var1.readUnsignedByte(); // L: 6975 + var5 = (var38 >> 4 & 7) + GameShell.field466; // L: 6976 + var6 = (var38 & 7) + GrandExchangeEvents.field64; // L: 6977 + var7 = var1.method5650(); // L: 6978 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 6979 + var5 = var5 * 128 + 64; // L: 6980 + var6 = var6 * 128 + 64; // L: 6981 + GraphicsObject var44 = new GraphicsObject(var3, GrandExchangeOfferUnitPriceComparator.Client_plane, var5, var6, GrandExchangeOfferWorldComparator.getTileHeight(var5, var6, GrandExchangeOfferUnitPriceComparator.Client_plane) - var7, var37, Client.cycle); // L: 6982 + Client.graphicsObjects.addFirst(var44); // L: 6983 + } + + } else if (class194.field2352 == var0) { // L: 6987 + var37 = var1.method5668(); // L: 6988 + var3 = var1.readUnsignedShort(); // L: 6989 + var38 = var1.method5668(); // L: 6990 + var5 = (var38 >> 4 & 7) + GameShell.field466; // L: 6991 + var6 = (var38 & 7) + GrandExchangeEvents.field64; // L: 6992 + byte var39 = var1.method5669(); // L: 6993 + byte var40 = var1.method5688(); // L: 6994 + var9 = var1.method5668() * 4; // L: 6995 + var10 = var1.method5650(); // L: 6996 + var11 = var1.readUnsignedShort(); // L: 6997 + var12 = var1.readUnsignedShort(); // L: 6998 + var13 = var1.method5679(); // L: 6999 + var14 = var1.method5619() * 4; // L: 7000 + var8 = var40 + var5; // L: 7001 + var7 = var39 + var6; // L: 7002 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var8 >= 0 && var7 >= 0 && var8 < 104 && var7 < 104 && var12 != 65535) { // L: 7003 + var5 = var5 * 128 + 64; // L: 7004 + var6 = var6 * 128 + 64; // L: 7005 + var8 = var8 * 128 + 64; // L: 7006 + var7 = var7 * 128 + 64; // L: 7007 + Projectile var36 = new Projectile(var12, GrandExchangeOfferUnitPriceComparator.Client_plane, var5, var6, GrandExchangeOfferWorldComparator.getTileHeight(var5, var6, GrandExchangeOfferUnitPriceComparator.Client_plane) - var14, var11 + Client.cycle, var3 + Client.cycle, var37, var10, var13, var9); // L: 7008 + var36.setDestination(var8, var7, GrandExchangeOfferWorldComparator.getTileHeight(var8, var7, GrandExchangeOfferUnitPriceComparator.Client_plane) - var9, var11 + Client.cycle); // L: 7009 + Client.projectiles.addFirst(var36); // L: 7010 + } + + } else if (class194.field2357 == var0) { // L: 7014 + var37 = var1.method5659(); // L: 7015 + var3 = var1.method5659(); // L: 7016 + var38 = var1.method5668(); // L: 7017 + var5 = (var38 >> 4 & 7) + GameShell.field466; // L: 7018 + var6 = (var38 & 7) + GrandExchangeEvents.field64; // L: 7019 + var7 = var1.method5797(); // L: 7020 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7021 + NodeDeque var34 = Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var5][var6]; // L: 7022 + if (var34 != null) { // L: 7023 + for (TileItem var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { // L: 7024 7025 7030 + if ((var37 & 32767) == var35.id && var7 == var35.quantity) { // L: 7026 + var35.quantity = var3; // L: 7027 + break; + } + } + + class41.updateItemPile(var5, var6); // L: 7032 + } + } + + } else { + if (class194.field2351 == var0) { // L: 7037 + var37 = var1.method5619(); // L: 7038 + var3 = var1.readUnsignedByte(); // L: 7039 + var38 = var3 >> 4 & 15; // L: 7040 + var5 = var3 & 7; // L: 7041 + var6 = var1.method5668(); // L: 7042 + var7 = (var6 >> 4 & 7) + GameShell.field466; // L: 7043 + var8 = (var6 & 7) + GrandExchangeEvents.field64; // L: 7044 + var9 = var1.method5659(); // L: 7045 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7046 + var10 = var38 + 1; // L: 7047 + if (PlayerType.localPlayer.pathX[0] >= var7 - var10 && PlayerType.localPlayer.pathX[0] <= var7 + var10 && PlayerType.localPlayer.pathY[0] >= var8 - var10 && PlayerType.localPlayer.pathY[0] <= var8 + var10 && Client.areaSoundEffectVolume != 0 && var5 > 0 && Client.soundEffectCount < 50) { // L: 7048 7049 + Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 7050 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var5; // L: 7051 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var37; // L: 7052 + Client.soundEffects[Client.soundEffectCount] = null; // L: 7053 + Client.soundLocations[Client.soundEffectCount] = var38 + (var8 << 8) + (var7 << 16); // L: 7054 + ++Client.soundEffectCount; // L: 7055 + } + } + } + + if (class194.field2356 == var0) { // L: 7060 + var37 = var1.method5650(); // L: 7061 + var3 = (var37 >> 4 & 7) + GameShell.field466; // L: 7062 + var38 = (var37 & 7) + GrandExchangeEvents.field64; // L: 7063 + var5 = var1.method5659(); // L: 7064 + if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { // L: 7065 + NodeDeque var32 = Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var3][var38]; // L: 7066 + if (var32 != null) { // L: 7067 + for (var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) { // L: 7068 7069 7074 + if ((var5 & 32767) == var33.id) { // L: 7070 + var33.remove(); // L: 7071 + break; + } + } + + if (var32.last() == null) { // L: 7076 + Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var3][var38] = null; + } + + class41.updateItemPile(var3, var38); // L: 7077 + } + } + + } else if (class194.field2354 != var0) { // L: 7082 + if (class194.field2359 == var0) { // L: 7128 + var37 = var1.method5650(); // L: 7129 + var3 = (var37 >> 4 & 7) + GameShell.field466; // L: 7130 + var38 = (var37 & 7) + GrandExchangeEvents.field64; // L: 7131 + var5 = var1.method5650(); // L: 7132 + var6 = var5 >> 2; // L: 7133 + var7 = var5 & 3; // L: 7134 + var8 = Client.field954[var6]; // L: 7135 + if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { // L: 7136 + GrandExchangeOffer.updatePendingSpawn(GrandExchangeOfferUnitPriceComparator.Client_plane, var3, var38, var8, -1, var6, var7, 0, -1); // L: 7137 + } + + } + } else { + var37 = var1.method5668(); // L: 7083 + var3 = var37 >> 2; // L: 7084 + var38 = var37 & 3; // L: 7085 + var5 = Client.field954[var3]; // L: 7086 + var6 = var1.method5675(); // L: 7087 + var7 = var1.method5619(); // L: 7088 + var8 = (var7 >> 4 & 7) + GameShell.field466; // L: 7089 + var9 = (var7 & 7) + GrandExchangeEvents.field64; // L: 7090 + if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7091 + if (var5 == 0) { // L: 7092 + BoundaryObject var31 = ModeWhere.scene.method3277(GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9); // L: 7093 + if (var31 != null) { // L: 7094 + var11 = ObjectSound.Entity_unpackID(var31.tag); // L: 7095 + if (var3 == 2) { // L: 7096 + var31.entity1 = new DynamicObject(var11, 2, var38 + 4, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var31.entity1); // L: 7097 + var31.entity2 = new DynamicObject(var11, 2, var38 + 1 & 3, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var31.entity2); // L: 7098 + } else { + var31.entity1 = new DynamicObject(var11, var3, var38, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var31.entity1); // L: 7100 + } + } + } + + if (var5 == 1) { // L: 7103 + WallDecoration var41 = ModeWhere.scene.method3276(GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9); // L: 7104 + if (var41 != null) { // L: 7105 + var11 = ObjectSound.Entity_unpackID(var41.tag); // L: 7106 + if (var3 != 4 && var3 != 5) { // L: 7107 + if (var3 == 6) { // L: 7108 + var41.entity1 = new DynamicObject(var11, 4, var38 + 4, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var41.entity1); + } else if (var3 == 7) { // L: 7109 + var41.entity1 = new DynamicObject(var11, 4, (var38 + 2 & 3) + 4, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var41.entity1); + } else if (var3 == 8) { // L: 7110 + var41.entity1 = new DynamicObject(var11, 4, var38 + 4, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var41.entity1); // L: 7111 + var41.entity2 = new DynamicObject(var11, 4, (var38 + 2 & 3) + 4, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var41.entity2); // L: 7112 + } + } else { + var41.entity1 = new DynamicObject(var11, 4, var38, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var41.entity1); + } + } + } + + if (var5 == 2) { // L: 7116 + GameObject var42 = ModeWhere.scene.method3241(GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9); // L: 7117 + if (var3 == 11) { // L: 7118 + var3 = 10; + } + + if (var42 != null) { // L: 7119 + var42.entity = new DynamicObject(ObjectSound.Entity_unpackID(var42.tag), var3, var38, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var42.entity); + } + } + + if (var5 == 3) { // L: 7121 + FloorDecoration var43 = ModeWhere.scene.getFloorDecoration(GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9); // L: 7122 + if (var43 != null) { // L: 7123 + var43.entity = new DynamicObject(ObjectSound.Entity_unpackID(var43.tag), 22, var38, GrandExchangeOfferUnitPriceComparator.Client_plane, var8, var9, var6, false, var43.entity); + } + } + } + + } + } + } // L: 6956 6970 6985 7012 7035 7080 7126 7139 7141 } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index 243d375ca1..4d181210f1 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -1,354 +1,358 @@ -import java.security.SecureRandom; +import java.io.File; +import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("av") +@ObfuscatedName("aq") +@Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Laq;" ) - static final WorldMapID field291; - @ObfuscatedName("k") + static final WorldMapID field295; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Laq;" ) - static final WorldMapID field288; - @ObfuscatedName("t") - static String[] Interpreter_stringLocals; - @ObfuscatedName("i") + static final WorldMapID field292; + @ObfuscatedName("c") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 658473583 - ) - public static int clientType; - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive3; - @ObfuscatedName("ev") - static SecureRandom secureRandom; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 563184905 + intValue = -1395703893 ) + @Export("value") final int value; static { - field291 = new WorldMapID(0); // L: 4 - field288 = new WorldMapID(1); // L: 5 + field295 = new WorldMapID(0); // L: 4 + field292 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { this.value = var1; // L: 9 } // L: 10 - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "1634458310" + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lmr;", + garbageValue = "-97" ) - static int method617(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1705 - Interpreter.Interpreter_intStackSize -= 3; // L: 1706 - class7.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); // L: 1707 - return 1; // L: 1708 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1710 - WorldMapCacheName.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1711 - return 1; // L: 1712 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1714 - Interpreter.Interpreter_intStackSize -= 2; // L: 1715 - class298.playSoundJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1716 - return 1; // L: 1717 - } else { - return 2; // L: 1719 + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 252 + if (var3.exists()) { // L: 253 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 255 + return var10; // L: 256 + } catch (IOException var9) { // L: 258 + } + } + + String var4 = ""; // L: 260 + if (AbstractUserComparator.cacheGamebuild == 33) { // L: 261 + var4 = "_rc"; + } else if (AbstractUserComparator.cacheGamebuild == 34) { // L: 262 + var4 = "_wip"; + } + + File var5 = new File(class52.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 263 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 264 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 266 + return var6; // L: 267 + } catch (IOException var8) { // L: 269 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 272 + return var6; // L: 273 + } catch (IOException var7) { // L: 275 + throw new RuntimeException(); // L: 276 } } - @ObfuscatedName("gd") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1747274457" + descriptor = "(IIB)I", + garbageValue = "0" ) - static final void method616(int var0, int var1, int var2, int var3) { - Client.overheadTextCount = 0; // L: 4841 - boolean var4 = false; // L: 4842 - int var5 = -1; // L: 4843 - int var6 = -1; // L: 4844 - int var7 = Players.Players_count; // L: 4845 - int[] var8 = Players.Players_indices; // L: 4846 + static final int method665(int var0, int var1) { + int var2 = SecureRandomFuture.method2252(var0 - 1, var1 - 1) + SecureRandomFuture.method2252(1 + var0, var1 - 1) + SecureRandomFuture.method2252(var0 - 1, 1 + var1) + SecureRandomFuture.method2252(var0 + 1, 1 + var1); // L: 455 + int var3 = SecureRandomFuture.method2252(var0 - 1, var1) + SecureRandomFuture.method2252(1 + var0, var1) + SecureRandomFuture.method2252(var0, var1 - 1) + SecureRandomFuture.method2252(var0, 1 + var1); // L: 456 + int var4 = SecureRandomFuture.method2252(var0, var1); // L: 457 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 458 + } - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4847 - Object var20; - if (var9 < var7) { // L: 4849 - var20 = Client.players[var8[var9]]; // L: 4850 - if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4851 - var4 = true; // L: 4852 - var5 = var9; // L: 4853 - continue; - } - - if (var20 == WorldMapLabelSize.localPlayer) { // L: 4856 - var6 = var9; // L: 4857 - continue; // L: 4858 - } - } else { - var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4861 - } - - GrandExchangeOfferNameComparator.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4862 - } - - if (Client.renderSelf && var6 != -1) { // L: 4864 - GrandExchangeOfferNameComparator.drawActor2d(WorldMapLabelSize.localPlayer, var6, var0, var1, var2, var3); // L: 4865 - } - - if (var4) { // L: 4867 - GrandExchangeOfferNameComparator.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4868 - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4870 - int var10 = Client.overheadTextXs[var9]; // L: 4871 - int var11 = Client.overheadTextYs[var9]; // L: 4872 - int var12 = Client.overheadTextXOffsets[var9]; // L: 4873 - int var13 = Client.overheadTextAscents[var9]; // L: 4874 - boolean var14 = true; // L: 4875 - - while (var14) { - var14 = false; // L: 4877 - - for (int var19 = 0; var19 < var9; ++var19) { // L: 4878 - if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4879 4880 - var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4881 - var14 = true; // L: 4882 - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4887 - Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4888 - String var15 = Client.overheadText[var9]; // L: 4889 - if (Client.chatEffects == 0) { // L: 4890 - int var16 = 16776960; // L: 4891 - if (Client.overheadTextColors[var9] < 6) { // L: 4892 - var16 = Client.field892[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { // L: 4893 - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { // L: 4894 - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { // L: 4895 - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { // L: 4896 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4897 - if (var17 < 50) { // L: 4898 - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { // L: 4899 - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 4900 - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { // L: 4902 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4903 - if (var17 < 50) { // L: 4904 - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { // L: 4905 - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { // L: 4906 - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { // L: 4908 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4909 - if (var17 < 50) { // L: 4910 - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { // L: 4911 - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { // L: 4912 - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var9] == 0) { // L: 4914 - class4.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { // L: 4915 - class4.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { // L: 4916 - class4.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { // L: 4917 - class4.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { // L: 4918 - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class4.fontBold12.stringWidth(var15) + 100) / 150; // L: 4919 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4920 - class4.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4921 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4922 - } - - if (Client.overheadTextEffects[var9] == 5) { // L: 4924 - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4925 - int var18 = 0; // L: 4926 - if (var17 < 25) { // L: 4927 - var18 = var17 - 25; - } else if (var17 > 125) { // L: 4928 - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class4.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4929 - class4.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4930 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4931 - } - } else { - class4.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4935 - } - } - - } // L: 4938 - - @ObfuscatedName("gt") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ZLky;B)V", - garbageValue = "45" + descriptor = "(ILco;ZI)I", + garbageValue = "-610468122" ) - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 4988 - int var2; - int var3; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { // L: 4989 - var2 = var1.method5655(); // L: 4990 - var3 = var1.method5656(); // L: 4991 - int var4 = var1.readUnsignedShort(); // L: 4992 - BoundaryObject.xteaKeys = new int[var4][4]; // L: 4993 - - for (var5 = 0; var5 < var4; ++var5) { // L: 4994 - for (var6 = 0; var6 < 4; ++var6) { // L: 4995 - BoundaryObject.xteaKeys[var5][var6] = var1.readInt(); // L: 4996 + static int method667(int var0, Script var1, boolean var2) { + Widget var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 1285 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1286 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = JagexCache.Widget_unpackTargetMask(WorldMapData_0.getWidgetFlags(var3)); // L: 1287 + return 1; // L: 1288 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1290 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1297 + if (var3.dataText == null) { // L: 1298 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1299 } + + return 1; // L: 1300 + } else { + return 2; // L: 1302 } - - class90.regions = new int[var4]; // L: 4999 - GrandExchangeEvents.regionMapArchiveIds = new int[var4]; // L: 5000 - Skeleton.regionLandArchiveIds = new int[var4]; // L: 5001 - AbstractUserComparator.regionLandArchives = new byte[var4][]; // L: 5002 - AbstractWorldMapData.regionMapArchives = new byte[var4][]; // L: 5003 - boolean var16 = false; // L: 5004 - if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5005 - var16 = true; - } - - if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5006 - var16 = true; - } - - var4 = 0; // L: 5007 - - for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5008 - for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5009 - var8 = var7 + (var6 << 8); // L: 5010 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5011 - class90.regions[var4] = var8; // L: 5012 - GrandExchangeEvents.regionMapArchiveIds[var4] = WorldMapLabel.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5013 - Skeleton.regionLandArchiveIds[var4] = WorldMapLabel.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5014 - ++var4; // L: 5015 - } - } - } - - Varps.method4067(var2, var3, true); // L: 5018 } else { - var2 = var1.readUnsignedShort(); // L: 5021 - var3 = var1.method5656(); // L: 5022 - boolean var15 = var1.method5646() == 1; // L: 5023 - var5 = var1.readUnsignedShort(); // L: 5024 - var1.importIndex(); // L: 5025 + int var4 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1291 + --var4; // L: 1292 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1293 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1294 + } else { + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; + } - int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 5026 - for (var7 = 0; var7 < 13; ++var7) { // L: 5027 - for (var8 = 0; var8 < 13; ++var8) { // L: 5028 - var9 = var1.readBits(1); // L: 5029 - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5030 - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5031 - } + return 1; // L: 1295 + } + } + + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "(Lcs;I)V", + garbageValue = "1072079291" + ) + static final void method666(Actor var0) { + if (var0.field1024 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class105.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4104 + int var1 = var0.field1024 - var0.field1009; // L: 4105 + int var2 = Client.cycle - var0.field1009; // L: 4106 + int var3 = var0.field1011 * 64 + var0.field1017 * 128; // L: 4107 + int var4 = var0.field1011 * 64 + var0.field1019 * 128; // L: 4108 + int var5 = var0.field1011 * 64 + var0.field1018 * 128; // L: 4109 + int var6 = var0.field1011 * 64 + var0.field1020 * 128; // L: 4110 + var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1; // L: 4111 + var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; // L: 4112 + } + + var0.field978 = 0; // L: 4114 + var0.orientation = var0.field1023; // L: 4115 + var0.rotation = var0.orientation; // L: 4116 + } // L: 4117 + + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "(Lht;II)I", + garbageValue = "1789445641" + ) + static final int method663(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10014 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10016 + int var3 = 0; // L: 10017 + int var4 = 0; // L: 10018 + byte var5 = 0; // L: 10019 + + while (true) { + int var6 = var2[var4++]; // L: 10021 + int var7 = 0; // L: 10022 + byte var8 = 0; // L: 10023 + if (var6 == 0) { // L: 10024 + return var3; } - } - } - var1.exportIndex(); // L: 5035 - BoundaryObject.xteaKeys = new int[var5][4]; // L: 5036 + if (var6 == 1) { // L: 10025 + var7 = Client.currentLevels[var2[var4++]]; + } - for (var6 = 0; var6 < var5; ++var6) { // L: 5037 - for (var7 = 0; var7 < 4; ++var7) { // L: 5038 - BoundaryObject.xteaKeys[var6][var7] = var1.readInt(); // L: 5039 - } - } + if (var6 == 2) { // L: 10026 + var7 = Client.levels[var2[var4++]]; + } - class90.regions = new int[var5]; // L: 5042 - GrandExchangeEvents.regionMapArchiveIds = new int[var5]; // L: 5043 - Skeleton.regionLandArchiveIds = new int[var5]; // L: 5044 - AbstractUserComparator.regionLandArchives = new byte[var5][]; // L: 5045 - AbstractWorldMapData.regionMapArchives = new byte[var5][]; // L: 5046 - var5 = 0; // L: 5047 + if (var6 == 3) { // L: 10027 + var7 = Client.experience[var2[var4++]]; + } - for (var6 = 0; var6 < 4; ++var6) { // L: 5048 - for (var7 = 0; var7 < 13; ++var7) { // L: 5049 - for (var8 = 0; var8 < 13; ++var8) { // L: 5050 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5051 - if (var9 != -1) { // L: 5052 - int var10 = var9 >> 14 & 1023; // L: 5053 - int var11 = var9 >> 3 & 2047; // L: 5054 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5055 - - int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 5056 - if (class90.regions[var13] == var12) { - var12 = -1; // L: 5057 - break; // L: 5058 + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10028 + var9 = var2[var4++] << 16; // L: 10029 + var9 += var2[var4++]; // L: 10030 + var10 = UserComparator4.getWidget(var9); // L: 10031 + var11 = var2[var4++]; // L: 10032 + if (var11 != -1 && (!AbstractWorldMapData.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10033 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10034 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10035 + var7 += var10.itemQuantities[var12]; } } + } + } - if (var12 != -1) { // L: 5060 - class90.regions[var5] = var12; // L: 5061 - var13 = var12 >> 8 & 255; // L: 5062 - int var14 = var12 & 255; // L: 5063 - GrandExchangeEvents.regionMapArchiveIds[var5] = WorldMapLabel.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5064 - Skeleton.regionLandArchiveIds[var5] = WorldMapLabel.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5065 - ++var5; // L: 5066 + if (var6 == 5) { // L: 10039 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10040 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10041 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10042 + var7 = PlayerType.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10043 + for (var9 = 0; var9 < 25; ++var9) { // L: 10044 + if (Skills.Skills_enabled[var9]) { // L: 10045 + var7 += Client.levels[var9]; } } } + + if (var6 == 10) { // L: 10048 + var9 = var2[var4++] << 16; // L: 10049 + var9 += var2[var4++]; // L: 10050 + var10 = UserComparator4.getWidget(var9); // L: 10051 + var11 = var2[var4++]; // L: 10052 + if (var11 != -1 && (!AbstractWorldMapData.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10053 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10054 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10055 + var7 = 999999999; // L: 10056 + break; // L: 10057 + } + } + } + } + + if (var6 == 11) { // L: 10062 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10063 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10064 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10065 + int var13 = var2[var4++]; // L: 10066 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10067 + } + + if (var6 == 14) { // L: 10069 + var9 = var2[var4++]; // L: 10070 + var7 = ApproximateRouteStrategy.getVarbit(var9); // L: 10071 + } + + if (var6 == 15) { // L: 10073 + var8 = 1; + } + + if (var6 == 16) { // L: 10074 + var8 = 2; + } + + if (var6 == 17) { // L: 10075 + var8 = 3; + } + + if (var6 == 18) { // L: 10076 + var7 = (PlayerType.localPlayer.x >> 7) + FloorDecoration.baseX; + } + + if (var6 == 19) { // L: 10077 + var7 = (PlayerType.localPlayer.y >> 7) + WorldMapData_0.baseY; + } + + if (var6 == 20) { // L: 10078 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10079 + if (var5 == 0) { // L: 10080 + var3 += var7; + } + + if (var5 == 1) { // L: 10081 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10082 + var3 /= var7; + } + + if (var5 == 3) { // L: 10083 + var3 *= var7; + } + + var5 = 0; // L: 10084 + } else { + var5 = var8; // L: 10086 + } } + } catch (Exception var14) { // L: 10089 + return -1; // L: 10090 + } + } else { + return -2; + } + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(Lht;I)V", + garbageValue = "898207937" + ) + static final void method664(Widget var0) { + int var1 = var0.contentType; // L: 11212 + if (var1 == 324) { // L: 11213 + if (Client.field945 == -1) { // L: 11214 + Client.field945 = var0.spriteId2; // L: 11215 + Client.field895 = var0.spriteId; // L: 11216 } - Varps.method4067(var3, var2, !var15); // L: 5072 - } + if (Client.playerAppearance.isFemale) { // L: 11218 + var0.spriteId2 = Client.field945; + } else { + var0.spriteId2 = Client.field895; // L: 11219 + } - } // L: 5074 + } else if (var1 == 325) { // L: 11222 + if (Client.field945 == -1) { // L: 11223 + Client.field945 = var0.spriteId2; // L: 11224 + Client.field895 = var0.spriteId; // L: 11225 + } + + if (Client.playerAppearance.isFemale) { // L: 11227 + var0.spriteId2 = Client.field895; + } else { + var0.spriteId2 = Client.field945; // L: 11228 + } + + } else if (var1 == 327) { // L: 11231 + var0.modelAngleX = 150; // L: 11232 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11233 + var0.modelType = 5; // L: 11234 + var0.modelId = 0; // L: 11235 + } else if (var1 == 328) { // L: 11238 + var0.modelAngleX = 150; // L: 11239 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11240 + var0.modelType = 5; // L: 11241 + var0.modelId = 1; // L: 11242 + } + } // L: 11220 11229 11236 11243 11245 } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 58b226224d..b52e7e25bc 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -1,53 +1,47 @@ -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("ag") +@ObfuscatedName("ac") +@Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("ay") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("gl") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1560558325 - ) - static int field154; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -68382233 + intValue = 1286160069 ) + @Export("element") final int element; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Laq;" + descriptor = "Lai;" ) + @Export("label") final WorldMapLabel label; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1820517903 + intValue = 1200101821 ) + @Export("subWidth") final int subWidth; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 877531577 + intValue = 1527714453 ) + @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lhg;Lhg;ILaq;)V" + descriptor = "(Lhw;Lhw;ILai;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); // L: 14 this.element = var3; // L: 15 this.label = var4; // L: 16 - WorldMapElement var5 = WorldMapSection0.WorldMapElement_get(this.getElement()); // L: 17 + WorldMapElement var5 = class194.WorldMapElement_get(this.getElement()); // L: 17 Sprite var6 = var5.getSpriteBool(false); // L: 18 - if (var6 != null) { // L: 19 + if (var6 != null) { this.subWidth = var6.subWidth; // L: 20 this.subHeight = var6.subHeight; // L: 21 } else { @@ -57,49 +51,427 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } // L: 27 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1613828162" + descriptor = "(B)I", + garbageValue = "24" ) + @Export("getElement") public int getElement() { return this.element; // L: 30 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Laq;", - garbageValue = "499378708" + descriptor = "(I)Lai;", + garbageValue = "-669051823" ) + @Export("getLabel") WorldMapLabel getLabel() { - return this.label; // L: 34 + return this.label; } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "182515130" + garbageValue = "1627026836" ) + @Export("getSubWidth") int getSubWidth() { - return this.subWidth; // L: 38 + return this.subWidth; } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2001682063" + garbageValue = "190840278" ) + @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 42 } - @ObfuscatedName("ko") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhq;B)I", - garbageValue = "-82" + descriptor = "(IB)Z", + garbageValue = "104" ) - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 10711 - return var1 != null ? var1.integer : var0.flags; // L: 10712 10713 + @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; // L: 19 } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)Lii;", + garbageValue = "55" + ) + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33 + if (var1 != null) { // L: 34 + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 35 + var1 = new KitDefinition(); // L: 36 + if (var2 != null) { // L: 37 + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2085091146" + ) + public static void method297() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 77 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 78 + } // L: 79 + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-1229271771" + ) + @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) { // L: 7215 + if (Client.isLowDetail && var0 != GrandExchangeOfferUnitPriceComparator.Client_plane) { // L: 7216 + return; + } + + long var7 = 0L; // L: 7217 + boolean var9 = true; // L: 7218 + boolean var10 = false; // L: 7219 + boolean var11 = false; // L: 7220 + if (var1 == 0) { // L: 7221 + var7 = ModeWhere.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 7222 + var7 = ModeWhere.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 7223 + var7 = ModeWhere.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 7224 + var7 = ModeWhere.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { // L: 7225 + var12 = ModeWhere.scene.getObjectFlags(var0, var2, var3, var7); // L: 7226 + int var38 = ObjectSound.Entity_unpackID(var7); // L: 7227 + int var39 = var12 & 31; // L: 7228 + int var40 = var12 >> 6 & 3; // L: 7229 + ObjectDefinition var13; + if (var1 == 0) { // L: 7230 + ModeWhere.scene.removeBoundaryObject(var0, var2, var3); // L: 7231 + var13 = ScriptEvent.getObjectDefinition(var38); // L: 7232 + if (var13.interactType != 0) { // L: 7233 + Client.collisionMaps[var0].method3688(var2, var3, var39, var40, var13.boolean1); + } + } + + if (var1 == 1) { // L: 7235 + ModeWhere.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 7236 + ModeWhere.scene.removeGameObject(var0, var2, var3); // L: 7237 + var13 = ScriptEvent.getObjectDefinition(var38); // L: 7238 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7239 + return; + } + + if (var13.interactType != 0) { // L: 7240 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); + } + } + + if (var1 == 3) { // L: 7242 + ModeWhere.scene.removeFloorDecoration(var0, var2, var3); // L: 7243 + var13 = ScriptEvent.getObjectDefinition(var38); // L: 7244 + if (var13.interactType == 1) { // L: 7245 + Client.collisionMaps[var0].method3691(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 7248 + var12 = var0; // L: 7249 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7250 + var12 = var0 + 1; + } + + Scene var41 = ModeWhere.scene; // L: 7251 + CollisionMap var14 = Client.collisionMaps[var0]; // L: 7252 + ObjectDefinition var15 = ScriptEvent.getObjectDefinition(var4); // L: 7254 + int var16; + int var17; + if (var5 != 1 && var5 != 3) { // L: 7257 + var16 = var15.sizeX; // L: 7262 + var17 = var15.sizeY; // L: 7263 + } else { + var16 = var15.sizeY; // L: 7258 + var17 = var15.sizeX; // L: 7259 + } + + int var18; + int var19; + if (var16 + var2 <= 104) { // L: 7269 + var18 = (var16 >> 1) + var2; // L: 7270 + var19 = var2 + (var16 + 1 >> 1); // L: 7271 + } else { + var18 = var2; // L: 7274 + var19 = var2 + 1; // L: 7275 + } + + int var20; + int var21; + if (var3 + var17 <= 104) { // L: 7277 + var20 = var3 + (var17 >> 1); // L: 7278 + var21 = var3 + (var17 + 1 >> 1); // L: 7279 + } else { + var20 = var3; // L: 7282 + var21 = var3 + 1; // L: 7283 + } + + int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7285 + int var23 = var22[var19][var20] + var22[var18][var20] + var22[var18][var21] + var22[var19][var21] >> 2; // L: 7286 + int var24 = (var2 << 7) + (var16 << 6); // L: 7287 + int var25 = (var3 << 7) + (var17 << 6); // L: 7288 + long var26 = GrandExchangeOfferOwnWorldComparator.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7289 + int var28 = (var5 << 6) + var6; // L: 7290 + if (var15.int3 == 1) { // L: 7291 + var28 += 256; + } + + Object var36; + if (var6 == 22) { // L: 7292 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7294 + var36 = var15.getModel(22, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7295 + } + + var41.newFloorDecoration(var0, var2, var3, var23, (Entity)var36, var26, var28); // L: 7296 + if (var15.interactType == 1) { // L: 7297 + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { // L: 7300 + if (var6 >= 12) { // L: 7308 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7310 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7311 + } + + var41.method3227(var0, var2, var3, var23, 1, 1, (Entity)var36, 0, var26, var28); // L: 7312 + if (var15.interactType != 0) { // L: 7313 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { // L: 7316 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7318 + var36 = var15.getModel(0, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7319 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Entity)var36, (Entity)null, Tiles.field533[var5], 0, var26, var28); // L: 7320 + if (var15.interactType != 0) { // L: 7321 + var14.method3683(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { // L: 7324 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7326 + var36 = var15.getModel(1, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7327 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Entity)var36, (Entity)null, Tiles.field534[var5], 0, var26, var28); // L: 7328 + if (var15.interactType != 0) { // L: 7329 + var14.method3683(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var29; + if (var6 == 2) { // L: 7332 + var29 = var5 + 1 & 3; // L: 7333 + Object var31; + Object var37; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7336 + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7337 + var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7338 + } else { + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7341 + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7342 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Entity)var37, (Entity)var31, Tiles.field533[var5], Tiles.field533[var29], var26, var28); // L: 7344 + if (var15.interactType != 0) { // L: 7345 + var14.method3683(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { // L: 7348 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7350 + var36 = var15.getModel(3, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7351 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Entity)var36, (Entity)null, Tiles.field534[var5], 0, var26, var28); // L: 7352 + if (var15.interactType != 0) { // L: 7353 + var14.method3683(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { // L: 7356 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7358 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7359 + } + + var41.method3227(var0, var2, var3, var23, 1, 1, (Entity)var36, 0, var26, var28); // L: 7360 + if (var15.interactType != 0) { // L: 7361 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { // L: 7364 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7366 + var36 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7367 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Entity)var36, (Entity)null, Tiles.field533[var5], 0, 0, 0, var26, var28); // L: 7368 + } else { + long var30; + Object var32; + if (var6 == 5) { // L: 7371 + var29 = 16; // L: 7372 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7373 + if (0L != var30) { // L: 7374 + var29 = ScriptEvent.getObjectDefinition(ObjectSound.Entity_unpackID(var30)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7376 + var32 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7377 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.field533[var5], 0, var29 * Tiles.field528[var5], var29 * Tiles.field536[var5], var26, var28); // L: 7378 + } else if (var6 == 6) { // L: 7381 + var29 = 8; // L: 7382 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7383 + if (var30 != 0L) { // L: 7384 + var29 = ScriptEvent.getObjectDefinition(ObjectSound.Entity_unpackID(var30)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7386 + 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); // L: 7387 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var29 * Tiles.field535[var5], var29 * Tiles.field529[var5], var26, var28); // L: 7388 + } else if (var6 == 7) { // L: 7391 + int var35 = var5 + 2 & 3; // L: 7393 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7394 + var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7395 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Entity)var36, (Entity)null, 256, var35, 0, 0, var26, var28); // L: 7396 + } else if (var6 == 8) { // L: 7399 + var29 = 8; // L: 7400 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7401 + if (var30 != 0L) { // L: 7402 + var29 = ScriptEvent.getObjectDefinition(ObjectSound.Entity_unpackID(var30)).int2 / 2; + } + + int var34 = var5 + 2 & 3; // L: 7405 + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7406 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7407 + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7408 + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7411 + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7412 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var29 * Tiles.field535[var5], var29 * Tiles.field529[var5], var26, var28); // L: 7414 + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { // L: 7302 + var36 = var15.getModel(10, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); // L: 7303 + } + + if (var36 != null) { // L: 7304 + var41.method3227(var0, var2, var3, var23, var16, var17, (Entity)var36, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { // L: 7305 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } + } + } + + } // L: 7419 + + @ObfuscatedName("it") + @ObfuscatedSignature( + descriptor = "(Lht;IIZB)V", + garbageValue = "-45" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 9905 + int var5 = var0.height; // L: 9906 + if (var0.widthAlignment == 0) { // L: 9907 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 9908 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 9909 + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { // L: 9910 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 9911 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; // L: 9912 + } + + if (var0.widthAlignment == 4) { // L: 9913 + var0.width = var0.height * var0.field2610 / var0.field2611; + } + + if (var0.heightAlignment == 4) { // L: 9914 + var0.height = var0.width * var0.field2611 / var0.field2610; + } + + if (var0.contentType == 1337) { // L: 9915 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9916 + ScriptEvent var6 = new ScriptEvent(); // L: 9917 + var6.widget = var0; // L: 9918 + var6.args = var0.onResize; // L: 9919 + Client.scriptEvents.addFirst(var6); // L: 9920 + } + + } // L: 9922 } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 1ec96beb4b..87cf932eb9 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -1,51 +1,51 @@ -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 net.runelite.rs.ScriptOpcodes; -import netscape.javascript.JSObject; -@ObfuscatedName("ap") +@ObfuscatedName("ay") +@Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("ew") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1433563031 + intValue = -1272071383 ) - static int field212; + @Export("objectDefId") + final int objectDefId; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lax;" + ) + @Export("region") + final WorldMapRegion region; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1816725297 + ) + @Export("element") + int element; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lai;" + ) + @Export("label") + WorldMapLabel label; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -18311555 - ) - final int objectDefId; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lal;" - ) - final WorldMapRegion region; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -2141926567 - ) - int element; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Laq;" - ) - WorldMapLabel label; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 578089951 + intValue = -29406003 ) + @Export("subWidth") int subWidth; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -258563275 + intValue = -1922717703 ) + @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lhg;Lhg;ILal;)V" + descriptor = "(Lhw;Lhw;ILax;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); // L: 17 @@ -54,51 +54,56 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); // L: 20 } // L: 21 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1613828162" + descriptor = "(B)I", + garbageValue = "24" ) + @Export("getElement") public int getElement() { return this.element; // L: 39 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Laq;", - garbageValue = "499378708" + descriptor = "(I)Lai;", + garbageValue = "-669051823" ) + @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 43 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "182515130" + garbageValue = "1627026836" ) + @Export("getSubWidth") int getSubWidth() { - return this.subWidth; + return this.subWidth; // L: 47 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2001682063" + garbageValue = "190840278" ) + @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 51 } - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1388314285" + garbageValue = "1939133514" ) + @Export("init") void init() { - this.element = MidiPcmStream.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(WorldMapSection0.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = WorldMapSection0.WorldMapElement_get(this.getElement()); // L: 26 + this.element = ScriptEvent.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(class194.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = class194.WorldMapElement_get(this.getElement()); // L: 26 Sprite var2 = var1.getSpriteBool(false); // L: 27 if (var2 != null) { // L: 28 this.subWidth = var2.subWidth; // L: 29 @@ -110,144 +115,160 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } // L: 36 - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1482054985" - ) - static void method377() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 46 - } // L: 47 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-40638792" - ) - public static int getSceneXForObjectUnderMouse(int var0) { - return TileItem.Entity_unpackSceneX(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "126" - ) - static boolean method380(String var0, int var1, String var2) { - if (var1 == 0) { // L: 61 - try { - if (!class60.field451.startsWith("win")) { // L: 63 - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 64 - throw new Exception(); - } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 65 - - for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 66 - if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 67 - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 69 - return true; // L: 70 - } - } catch (Throwable var5) { // L: 72 - return false; // L: 73 - } - } else if (var1 == 1) { // L: 76 - try { - Object var10 = class56.method899(class60.applet, var2, new Object[]{(new URL(class60.applet.getCodeBase(), var0)).toString()}); // L: 78 - return var10 != null; // L: 79 - } catch (Throwable var6) { // L: 81 - return false; // L: 82 - } - } else if (var1 == 2) { // L: 85 - try { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_blank"); // L: 87 - return true; // L: 88 - } catch (Exception var7) { // L: 90 - return false; // L: 91 - } - } else if (var1 == 3) { // L: 94 - try { - Applet var3 = class60.applet; // L: 96 - JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 99 - } catch (Throwable var9) { // L: 102 - } - - try { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top"); // L: 104 - return true; // L: 105 - } catch (Exception var8) { // L: 107 - return false; // L: 108 - } - } else { - throw new IllegalArgumentException(); // L: 111 - } - } - @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1976803623" + descriptor = "(Lcf;Lcf;IZIZI)I", + garbageValue = "586968313" ) - static int method378(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1104 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1105 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1106 - return 1; // L: 1107 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1109 - if (var3.itemId != -1) { // L: 1110 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1111 - } - - return 1; // L: 1112 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1114 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1115 - return 1; // L: 1116 + static int method395(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = WorldMapSprite.compareWorlds(var0, var1, var2, var3); // L: 199 + if (var6 != 0) { // L: 200 + return var3 ? -var6 : var6; // L: 201 + } else if (var4 == -1) { // L: 204 + return 0; } else { - return 2; // L: 1118 + int var7 = WorldMapSprite.compareWorlds(var0, var1, var4, var5); // L: 205 + return var5 ? -var7 : var7; // L: 206 } } - @ObfuscatedName("go") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lbs;I)V", - garbageValue = "777785142" + descriptor = "(I)V", + garbageValue = "-218709876" ) - static final void method375(PendingSpawn var0) { - long var1 = 0L; // L: 6635 - int var3 = -1; // L: 6636 - int var4 = 0; // L: 6637 - int var5 = 0; // L: 6638 - if (var0.type == 0) { // L: 6639 - var1 = ScriptEvent.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + public static void method398() { + PlayerAppearance.PlayerAppearance_cachedModels.clear(); // L: 252 + } // L: 253 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lht;IIII)V", + garbageValue = "-630082836" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2670 == null) { // L: 926 + throw new RuntimeException(); // L: 927 + } else { + var0.field2670[var1] = var2; // L: 929 + var0.field2671[var1] = var3; // L: 930 + } + } // L: 931 + + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1198701264" + ) + static final void method392() { + int var0 = WorldMapSection2.field225 * 128 + 64; // L: 3711 + int var1 = WorldMapLabelSize.field152 * 128 + 64; // L: 3712 + int var2 = GrandExchangeOfferWorldComparator.getTileHeight(var0, var1, GrandExchangeOfferUnitPriceComparator.Client_plane) - SpriteMask.field2542; // L: 3713 + if (ItemContainer.cameraX < var0) { // L: 3714 + ItemContainer.cameraX = (var0 - ItemContainer.cameraX) * ReflectionCheck.field1364 / 1000 + ItemContainer.cameraX + Player.field674; // L: 3715 + if (ItemContainer.cameraX > var0) { // L: 3716 + ItemContainer.cameraX = var0; + } } - if (var0.type == 1) { // L: 6640 - var1 = ScriptEvent.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + if (ItemContainer.cameraX > var0) { // L: 3718 + ItemContainer.cameraX -= ReflectionCheck.field1364 * (ItemContainer.cameraX - var0) / 1000 + Player.field674; // L: 3719 + if (ItemContainer.cameraX < var0) { // L: 3720 + ItemContainer.cameraX = var0; + } } - if (var0.type == 2) { // L: 6641 - var1 = ScriptEvent.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + if (ChatChannel.cameraY < var2) { // L: 3722 + ChatChannel.cameraY = (var2 - ChatChannel.cameraY) * ReflectionCheck.field1364 / 1000 + ChatChannel.cameraY + Player.field674; // L: 3723 + if (ChatChannel.cameraY > var2) { // L: 3724 + ChatChannel.cameraY = var2; + } } - if (var0.type == 3) { // L: 6642 - var1 = ScriptEvent.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + if (ChatChannel.cameraY > var2) { // L: 3726 + ChatChannel.cameraY -= ReflectionCheck.field1364 * (ChatChannel.cameraY - var2) / 1000 + Player.field674; // L: 3727 + if (ChatChannel.cameraY < var2) { // L: 3728 + ChatChannel.cameraY = var2; + } } - if (0L != var1) { // L: 6643 - int var6 = ScriptEvent.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 6644 - var3 = UserComparator9.Entity_unpackID(var1); // L: 6645 - var4 = var6 & 31; // L: 6646 - var5 = var6 >> 6 & 3; // L: 6647 + if (WorldMapManager.cameraZ < var1) { // L: 3730 + WorldMapManager.cameraZ = (var1 - WorldMapManager.cameraZ) * ReflectionCheck.field1364 / 1000 + WorldMapManager.cameraZ + Player.field674; // L: 3731 + if (WorldMapManager.cameraZ > var1) { // L: 3732 + WorldMapManager.cameraZ = var1; + } } - var0.objectId = var3; // L: 6649 - var0.field961 = var4; // L: 6650 - var0.field960 = var5; // L: 6651 - } // L: 6652 + if (WorldMapManager.cameraZ > var1) { // L: 3734 + WorldMapManager.cameraZ -= ReflectionCheck.field1364 * (WorldMapManager.cameraZ - var1) / 1000 + Player.field674; // L: 3735 + if (WorldMapManager.cameraZ < var1) { // L: 3736 + WorldMapManager.cameraZ = var1; + } + } + + var0 = MilliClock.field2048 * 128 + 64; // L: 3738 + var1 = PcmPlayer.field1449 * 128 + 64; // L: 3739 + var2 = GrandExchangeOfferWorldComparator.getTileHeight(var0, var1, GrandExchangeOfferUnitPriceComparator.Client_plane) - AbstractRasterProvider.field3890; // L: 3740 + int var3 = var0 - ItemContainer.cameraX; // L: 3741 + int var4 = var2 - ChatChannel.cameraY; // L: 3742 + int var5 = var1 - WorldMapManager.cameraZ; // L: 3743 + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); // L: 3744 + int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; // L: 3745 + int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; // L: 3746 + if (var7 < 128) { // L: 3747 + var7 = 128; + } + + if (var7 > 383) { // L: 3748 + var7 = 383; + } + + if (World.cameraPitch < var7) { // L: 3749 + World.cameraPitch = (var7 - World.cameraPitch) * class60.field452 / 1000 + World.cameraPitch + WorldMapCacheName.field326; // L: 3750 + if (World.cameraPitch > var7) { // L: 3751 + World.cameraPitch = var7; + } + } + + if (World.cameraPitch > var7) { // L: 3753 + World.cameraPitch -= class60.field452 * (World.cameraPitch - var7) / 1000 + WorldMapCacheName.field326; // L: 3754 + if (World.cameraPitch < var7) { // L: 3755 + World.cameraPitch = var7; + } + } + + int var9 = var8 - ViewportMouse.cameraYaw; // L: 3757 + if (var9 > 1024) { // L: 3758 + var9 -= 2048; + } + + if (var9 < -1024) { // L: 3759 + var9 += 2048; + } + + if (var9 > 0) { // L: 3760 + ViewportMouse.cameraYaw = var9 * class60.field452 / 1000 + ViewportMouse.cameraYaw + WorldMapCacheName.field326; // L: 3761 + ViewportMouse.cameraYaw &= 2047; // L: 3762 + } + + if (var9 < 0) { // L: 3764 + ViewportMouse.cameraYaw -= -var9 * class60.field452 / 1000 + WorldMapCacheName.field326; // L: 3765 + ViewportMouse.cameraYaw &= 2047; // L: 3766 + } + + int var10 = var8 - ViewportMouse.cameraYaw; // L: 3768 + if (var10 > 1024) { // L: 3769 + var10 -= 2048; + } + + if (var10 < -1024) { // L: 3770 + var10 += 2048; + } + + if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { // L: 3771 + ViewportMouse.cameraYaw = var8; + } + + } // L: 3772 } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 7be81d14ab..46418251fb 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -1,36 +1,32 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aq") +@ObfuscatedName("ai") +@Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("do") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive5; - @ObfuscatedName("gx") - @ObfuscatedGetter( - intValue = 2023281377 - ) - static int baseY; - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("text") String text; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1365255333 + intValue = -1900229559 ) + @Export("width") int width; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2029280505 + intValue = 424685221 ) + @Export("height") int height; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lab;" ) + @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( @@ -43,212 +39,23 @@ public class WorldMapLabel { this.size = var4; // L: 13 } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1281997654" + descriptor = "(I)V", + garbageValue = "-1774401095" ) - static int method497(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 548 - Widget var3; - if (var0 >= 2000) { // L: 549 - var0 -= 1000; // L: 550 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 551 - var3 = TileItem.getWidget(var4); // L: 552 - } else { - var3 = var2 ? Canvas.field438 : class3.field12; // L: 554 - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 555 - Interpreter.Interpreter_intStackSize -= 2; // L: 556 - var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 557 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 558 - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { // L: 559 - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 560 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 561 - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { // L: 562 - var3.scrollY = 0; - } - - class52.invalidateWidget(var3); // L: 563 - return 1; // L: 564 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 566 - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 567 - class52.invalidateWidget(var3); // L: 568 - return 1; // L: 569 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 571 - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 572 - class52.invalidateWidget(var3); // L: 573 - return 1; // L: 574 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 576 - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 577 - class52.invalidateWidget(var3); // L: 578 - return 1; // L: 579 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 581 - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 582 - class52.invalidateWidget(var3); // L: 583 - return 1; // L: 584 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 586 - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 587 - class52.invalidateWidget(var3); // L: 588 - return 1; // L: 589 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 591 - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 592 - class52.invalidateWidget(var3); // L: 593 - return 1; // L: 594 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 596 - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 597 - class52.invalidateWidget(var3); // L: 598 - return 1; // L: 599 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 601 - var3.modelType = 1; // L: 602 - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 603 - class52.invalidateWidget(var3); // L: 604 - return 1; // L: 605 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 607 - Interpreter.Interpreter_intStackSize -= 6; // L: 608 - var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 609 - var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 610 - var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 611 - var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 612 - var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 613 - var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; // L: 614 - class52.invalidateWidget(var3); // L: 615 - return 1; // L: 616 - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 618 - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 619 - if (var8 != var3.sequenceId) { // L: 620 - var3.sequenceId = var8; // L: 621 - var3.modelFrame = 0; // L: 622 - var3.modelFrameCycle = 0; // L: 623 - class52.invalidateWidget(var3); // L: 624 - } - - return 1; // L: 626 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 628 - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 629 - class52.invalidateWidget(var3); // L: 630 - return 1; // L: 631 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 633 - String var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 634 - if (!var7.equals(var3.text)) { // L: 635 - var3.text = var7; // L: 636 - class52.invalidateWidget(var3); // L: 637 - } - - return 1; // L: 639 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 641 - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 642 - class52.invalidateWidget(var3); // L: 643 - return 1; // L: 644 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 646 - Interpreter.Interpreter_intStackSize -= 3; // L: 647 - var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 648 - var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 649 - var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 650 - class52.invalidateWidget(var3); // L: 651 - return 1; // L: 652 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 654 - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 655 - class52.invalidateWidget(var3); // L: 656 - return 1; // L: 657 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 659 - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 660 - class52.invalidateWidget(var3); // L: 661 - return 1; // L: 662 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 664 - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 665 - class52.invalidateWidget(var3); // L: 666 - return 1; // L: 667 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 669 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 670 - class52.invalidateWidget(var3); // L: 671 - return 1; // L: 672 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 674 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 675 - class52.invalidateWidget(var3); // L: 676 - return 1; // L: 677 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 679 - Interpreter.Interpreter_intStackSize -= 2; // L: 680 - var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 681 - var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 682 - class52.invalidateWidget(var3); // L: 683 - if (var4 != -1 && var3.type == 0) { // L: 684 - class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; // L: 685 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 687 - AbstractSocket.resumePauseWidget(var3.id, var3.childIndex); // L: 688 - Client.meslayerContinueWidget = var3; // L: 689 - class52.invalidateWidget(var3); // L: 690 - return 1; // L: 691 - } else if (var0 == 1122) { // L: 693 - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 694 - class52.invalidateWidget(var3); // L: 695 - return 1; // L: 696 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 698 - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 699 - class52.invalidateWidget(var3); // L: 700 - return 1; // L: 701 - } else if (var0 == 1124) { // L: 703 - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 704 - class52.invalidateWidget(var3); // L: 705 - return 1; // L: 706 - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 708 - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 709 - FillMode var6 = (FillMode)TextureProvider.findEnumerated(class25.FillMode_values(), var8); // L: 710 - if (var6 != null) { // L: 711 - var3.fillMode = var6; // L: 712 - class52.invalidateWidget(var3); // L: 713 - } - - return 1; // L: 715 - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 717 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 718 - var3.field2639 = var5; // L: 719 - return 1; // L: 720 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 722 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 723 - var3.modelTransparency = var5; // L: 724 - return 1; // L: 725 - } else { - return 2; // L: 727 - } - } - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "88" - ) - protected static final void method498() { - AbstractWorldMapIcon.clock.mark(); // L: 404 + protected static final void method519() { + UserComparator3.clock.mark(); // L: 405 int var0; - for (var0 = 0; var0 < 32; ++var0) { // L: 405 + for (var0 = 0; var0 < 32; ++var0) { // L: 406 GameShell.graphicsTickTimes[var0] = 0L; } - for (var0 = 0; var0 < 32; ++var0) { // L: 406 + for (var0 = 0; var0 < 32; ++var0) { // L: 407 GameShell.clientTickTimes[var0] = 0L; } - class58.gameCyclesToDo = 0; // L: 407 - } // L: 408 + GameShell.gameCyclesToDo = 0; // L: 408 + } // L: 409 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 021ffa44a6..d75b649e59 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -1,364 +1,94 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ab") +@Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("z") + @ObfuscatedName("sc") + @ObfuscatedSignature( + descriptor = "Lcc;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("re") + @ObfuscatedGetter( + intValue = -1977795359 + ) + static int field152; + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "Lab;" ) + @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "Lab;" ) + @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Lab;" ) + @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("bl") - static String otp; - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "Lbf;" - ) - static Player localPlayer; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1823121257 + intValue = 542681527 ) - final int field141; - @ObfuscatedName("i") + final int field147; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1477308657 + intValue = -679221485 ) - final int field142; - @ObfuscatedName("o") + final int field150; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2124591757 + intValue = 1499246127 ) - final int field143; + final int field148; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7 + WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); // L: 7 WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); // L: 8 - WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); // L: 9 + WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); // L: 9 } WorldMapLabelSize(int var1, int var2, int var3) { - this.field141 = var1; // L: 19 - this.field142 = var2; // L: 20 - this.field143 = var3; // L: 21 + this.field147 = var1; // L: 19 + this.field150 = var2; + this.field148 = var3; // L: 21 } // L: 22 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "459902190" + garbageValue = "-747547430" ) - boolean method274(float var1) { - return var1 >= (float)this.field143; // L: 25 + boolean method277(float var1) { + return var1 >= (float)this.field148; // L: 25 } - @ObfuscatedName("z") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lin;", + garbageValue = "1762578081" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_ironman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.PlayerType_jagexModerator, PlayerType.field3125, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ultimateIronman}; // L: 20 + } + + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)[Lab;", - garbageValue = "-681769299" + garbageValue = "-594087890" ) - static WorldMapLabelSize[] method272() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 15 + static WorldMapLabelSize[] method273() { + return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; // L: 15 } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lab;", - garbageValue = "-1798165696" - ) - static WorldMapLabelSize method270(int var0) { - WorldMapLabelSize[] var1 = method272(); // L: 30 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 - WorldMapLabelSize var3 = var1[var2]; // L: 32 - if (var0 == var3.field142) { // L: 34 - return var3; // L: 35 - } - } - - return null; // L: 40 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lkf;IB)V", - garbageValue = "-8" - ) - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); // L: 127 - var2.size = var0.readUnsignedByte(); // L: 128 - var2.id = var0.readInt(); // L: 129 - var2.operations = new int[var2.size]; // L: 130 - var2.creationErrors = new int[var2.size]; // L: 131 - var2.fields = new Field[var2.size]; // L: 132 - var2.intReplaceValues = new int[var2.size]; // L: 133 - var2.methods = new Method[var2.size]; // L: 134 - var2.arguments = new byte[var2.size][][]; // L: 135 - - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 136 - try { - int var4 = var0.readUnsignedByte(); // L: 138 - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 139 - if (var4 == 3 || var4 == 4) { // L: 149 - var5 = var0.readStringCp1252NullTerminated(); // L: 150 - var6 = var0.readStringCp1252NullTerminated(); // L: 151 - var7 = var0.readUnsignedByte(); // L: 152 - String[] var8 = new String[var7]; // L: 153 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 154 - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); // L: 155 - byte[][] var10 = new byte[var7][]; // L: 156 - int var12; - if (var4 == 3) { // L: 157 - for (int var11 = 0; var11 < var7; ++var11) { // L: 158 - var12 = var0.readInt(); // L: 159 - var10[var11] = new byte[var12]; // L: 160 - var0.readBytes(var10[var11], 0, var12); // L: 161 - } - } - - var2.operations[var3] = var4; // L: 164 - Class[] var21 = new Class[var7]; // L: 165 - - for (var12 = 0; var12 < var7; ++var12) { // L: 166 - var21[var12] = class197.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = class197.loadClassFromDescriptor(var20); // L: 167 - if (class197.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 168 - throw new SecurityException(); - } - - Method[] var13 = class197.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 169 - Method[] var14 = var13; // L: 171 - - for (int var15 = 0; var15 < var14.length; ++var15) { // L: 172 - Method var16 = var14[var15]; // L: 173 - if (Reflection.getMethodName(var16).equals(var6)) { // L: 175 - Class[] var17 = Reflection.getParameterTypes(var16); // L: 176 - if (var21.length == var17.length) { // L: 177 - boolean var18 = true; // L: 178 - - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 179 - if (var17[var19] != var21[var19]) { // L: 180 - var18 = false; // L: 181 - break; // L: 182 - } - } - - if (var18 && var22 == var16.getReturnType()) { // L: 185 - var2.methods[var3] = var16; // L: 186 - } - } - } - } - - var2.arguments[var3] = var10; // L: 193 - } - } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 140 - var6 = var0.readStringCp1252NullTerminated(); // L: 141 - var7 = 0; // L: 142 - if (var4 == 1) { // L: 143 - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; // L: 144 - var2.intReplaceValues[var3] = var7; // L: 145 - if (class197.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 146 - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class197.loadClassFromDescriptor(var5), var6); // L: 147 - } - } catch (ClassNotFoundException var24) { // L: 196 - var2.creationErrors[var3] = -1; // L: 197 - } catch (SecurityException var25) { // L: 199 - var2.creationErrors[var3] = -2; // L: 200 - } catch (NullPointerException var26) { // L: 202 - var2.creationErrors[var3] = -3; // L: 203 - } catch (Exception var27) { // L: 205 - var2.creationErrors[var3] = -4; // L: 206 - } catch (Throwable var28) { // L: 208 - var2.creationErrors[var3] = -5; // L: 209 - } - } - - class105.reflectionChecks.addFirst(var2); // L: 212 - } // L: 213 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "-71" - ) - static int method279(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1039 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1040 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1041 - return 1; // L: 1042 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1044 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1045 - return 1; // L: 1046 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1048 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.text; // L: 1049 - return 1; // L: 1050 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1052 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1053 - return 1; // L: 1054 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1056 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1057 - return 1; // L: 1058 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1060 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1061 - return 1; // L: 1062 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1064 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1065 - return 1; // L: 1066 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1068 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1069 - return 1; // L: 1070 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1072 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1073 - return 1; // L: 1074 - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1076 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1077 - return 1; // L: 1078 - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1080 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1081 - return 1; // L: 1082 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1084 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1085 - return 1; // L: 1086 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1088 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1089 - return 1; // L: 1090 - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1092 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1093 - return 1; // L: 1094 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1096 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1097 - return 1; // L: 1098 - } else { - return 2; // L: 1100 - } - } - - @ObfuscatedName("ev") - @ObfuscatedSignature( - descriptor = "(IZZZI)Liw;", - garbageValue = "-1692884564" - ) - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 1847 - if (JagexCache.JagexCache_dat2File != null) { // L: 1848 - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, Skeleton.masterDisk, var0, var1, var2, var3); // L: 1849 - } - - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-775156313" - ) - 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) { // L: 6655 - if (Client.isLowDetail && var0 != Huffman.Client_plane) { // L: 6656 - return; - } - - long var7 = 0L; // L: 6657 - boolean var9 = true; // L: 6658 - boolean var10 = false; // L: 6659 - boolean var11 = false; // L: 6660 - if (var1 == 0) { // L: 6661 - var7 = ScriptEvent.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { // L: 6662 - var7 = ScriptEvent.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { // L: 6663 - var7 = ScriptEvent.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { // L: 6664 - var7 = ScriptEvent.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { // L: 6665 - var12 = ScriptEvent.scene.getObjectFlags(var0, var2, var3, var7); // L: 6666 - int var14 = UserComparator9.Entity_unpackID(var7); // L: 6667 - int var15 = var12 & 31; // L: 6668 - int var16 = var12 >> 6 & 3; // L: 6669 - ObjectDefinition var13; - if (var1 == 0) { // L: 6670 - ScriptEvent.scene.removeBoundaryObject(var0, var2, var3); // L: 6671 - var13 = MidiPcmStream.getObjectDefinition(var14); // L: 6672 - if (var13.interactType != 0) { // L: 6673 - Client.collisionMaps[var0].method3635(var2, var3, var15, var16, var13.boolean1); - } - } - - if (var1 == 1) { // L: 6675 - ScriptEvent.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { // L: 6676 - ScriptEvent.scene.removeGameObject(var0, var2, var3); // L: 6677 - var13 = MidiPcmStream.getObjectDefinition(var14); // L: 6678 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 6679 - return; - } - - if (var13.interactType != 0) { // L: 6680 - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); - } - } - - if (var1 == 3) { // L: 6682 - ScriptEvent.scene.removeFloorDecoration(var0, var2, var3); // L: 6683 - var13 = MidiPcmStream.getObjectDefinition(var14); // L: 6684 - if (var13.interactType == 1) { // L: 6685 - Client.collisionMaps[var0].method3638(var2, var3); - } - } - } - - if (var4 >= 0) { // L: 6688 - var12 = var0; // L: 6689 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 6690 - var12 = var0 + 1; - } - - ObjectDefinition.method4699(var0, var12, var2, var3, var4, var5, var6, ScriptEvent.scene, Client.collisionMaps[var0]); // L: 6691 - } - } - - } // L: 6694 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 3e50177128..bb08db73c0 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -1,97 +1,118 @@ +import java.applet.Applet; +import java.net.URL; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; 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 netscape.javascript.JSObject; -@ObfuscatedName("ai") +@ObfuscatedName("at") +@Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("qs") + @ObfuscatedName("ca") + public static char field335; + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "Ldr;" + descriptor = "Lid;" ) - static PcmPlayer pcmPlayer0; - @ObfuscatedName("ft") + @Export("archive1") + static Archive archive1; + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = 1798679755 + intValue = 104039997 ) - static int baseX; - @ObfuscatedName("lz") - @ObfuscatedGetter( - intValue = 495693627 - ) - static int menuHeight; - @ObfuscatedName("z") + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("f") + @Export("loaded") boolean loaded; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "Laj;" ) + @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - Sprite compositeTextureSprite; - @ObfuscatedName("i") - HashMap icons; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "[[Lal;" - ) - WorldMapRegion[][] regions; - @ObfuscatedName("x") - HashMap scaleHandlers; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "[Lls;" - ) - IndexedSprite[] mapSceneSprites; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - final AbstractArchive geographyArchive; @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Llc;" ) - final AbstractArchive groundArchive; - @ObfuscatedName("n") - final HashMap fonts; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -822250353 - ) - int tileX; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 47788579 - ) - int tileY; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1367840659 - ) - int tileWidth; + @Export("compositeTextureSprite") + Sprite compositeTextureSprite; + @ObfuscatedName("z") + @Export("icons") + HashMap icons; @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -989936121 + @ObfuscatedSignature( + descriptor = "[[Lax;" ) - int tileHeight; + @Export("regions") + WorldMapRegion[][] regions; + @ObfuscatedName("k") + @Export("scaleHandlers") + HashMap scaleHandlers; @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1477799013 + @ObfuscatedSignature( + descriptor = "[Lle;" ) + @Export("mapSceneSprites") + IndexedSprite[] mapSceneSprites; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("geographyArchive") + final AbstractArchive geographyArchive; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("groundArchive") + final AbstractArchive groundArchive; + @ObfuscatedName("e") + @Export("fonts") + final HashMap fonts; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -847908099 + ) + @Export("tileX") + int tileX; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1911109555 + ) + @Export("tileY") + int tileY; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1404433049 + ) + @Export("tileWidth") + int tileWidth; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 617444511 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -2140717099 + ) + @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lls;Ljava/util/HashMap;Lic;Lic;)V" + descriptor = "([Lle;Ljava/util/HashMap;Liw;Liw;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; // L: 16 @@ -104,96 +125,99 @@ public final class WorldMapManager { this.groundArchive = var4; // L: 37 } // L: 38 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lic;Ljava/lang/String;ZI)V", - garbageValue = "1563820048" + descriptor = "(Liw;Ljava/lang/String;ZI)V", + garbageValue = "-295737943" ) + @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { if (!this.loadStarted) { // L: 41 - this.loaded = false; // L: 44 + this.loaded = false; this.loadStarted = true; // L: 45 System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field322.name); // L: 47 - int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field322.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field318.name, var2)); // L: 50 - System.nanoTime(); // L: 51 - System.nanoTime(); // L: 52 + int var4 = var1.getGroupId(WorldMapCacheName.field320.name); // L: 47 + int var5 = var1.getFileId(var4, var2); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field320.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field319.name, var2)); // L: 50 + System.nanoTime(); + System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); // L: 53 try { - this.mapAreaData.init(var6, var7, var5, var3); // L: 55 - } catch (IllegalStateException var19) { // L: 57 - return; // L: 58 + this.mapAreaData.init(var6, var7, var5, var3); + } catch (IllegalStateException var19) { + return; } - this.mapAreaData.getOriginX(); // L: 60 + this.mapAreaData.getOriginX(); this.mapAreaData.getOriginPlane(); // L: 61 - this.mapAreaData.getOriginY(); // L: 62 - this.tileX = this.mapAreaData.getRegionLowX() * 64; // L: 63 + this.mapAreaData.getOriginY(); + this.tileX = this.mapAreaData.getRegionLowX() * 64; this.tileY = this.mapAreaData.getRegionLowY() * 64; // L: 64 - this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; // L: 65 - this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; // L: 66 + this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; + this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; // L: 67 int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68 - System.nanoTime(); // L: 69 + System.nanoTime(); System.nanoTime(); // L: 70 - WorldMapIcon_1.method377(); // L: 71 - this.regions = new WorldMapRegion[var16][var9]; // L: 72 - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 + GrandExchangeOfferNameComparator.method227(); // L: 71 + this.regions = new WorldMapRegion[var16][var9]; + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); while (var10.hasNext()) { WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74 - int var12 = var11.regionX; // L: 76 + int var12 = var11.regionX; int var13 = var11.regionY; // L: 77 int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78 - int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 79 + int var15 = var13 - this.mapAreaData.getRegionLowY(); this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 80 - this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 81 + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); } for (int var17 = 0; var17 < var16; ++var17) { // L: 84 - for (int var18 = 0; var18 < var9; ++var18) { // L: 85 + for (int var18 = 0; var18 < var9; ++var18) { if (this.regions[var17][var18] == null) { // L: 86 - this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87 - this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88 + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); } } } System.nanoTime(); // L: 92 System.nanoTime(); // L: 93 - if (var1.isValidFileName(WorldMapCacheName.field327.name, var2)) { // L: 94 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field327.name, var2); // L: 95 - this.compositeTextureSprite = MouseHandler.convertJpgToSprite(var20); // L: 96 + if (var1.isValidFileName(WorldMapCacheName.field321.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field321.name, var2); // L: 95 + this.compositeTextureSprite = class39.convertJpgToSprite(var20); } System.nanoTime(); // L: 98 - var1.clearGroups(); // L: 99 + var1.clearGroups(); var1.clearFiles(); // L: 100 this.loaded = true; // L: 101 } - } // L: 42 102 + } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1887133174" + garbageValue = "-2022462293" ) + @Export("clearIcons") public final void clearIcons() { - this.icons = null; // L: 105 + this.icons = null; } // L: 106 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIIIIIB)V", - garbageValue = "-33" + descriptor = "(IIIIIIIII)V", + garbageValue = "-2080515212" ) + @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 109 int var10 = Rasterizer2D.Rasterizer2D_width; // L: 110 - int var11 = Rasterizer2D.Rasterizer2D_height; // L: 111 + int var11 = Rasterizer2D.Rasterizer2D_height; int[] var12 = new int[4]; // L: 112 Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 113 WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 114 @@ -206,8 +230,8 @@ public final class WorldMapManager { this.scaleHandlers.put(var15, var16); // L: 121 } - int var23 = var13.width + var13.x - 1; // L: 123 - int var17 = var13.y + var13.height - 1; // L: 124 + int var23 = var13.x + var13.width - 1; // L: 123 + int var17 = var13.height + var13.y - 1; // L: 124 int var18; int var19; @@ -219,45 +243,46 @@ public final class WorldMapManager { Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130 Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131 - var18 = (int)(var14 * 64.0F); // L: 132 + var18 = (int)(64.0F * var14); // L: 132 var19 = this.tileX + var1; // L: 133 int var20 = var2 + this.tileY; // L: 134 - for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 135 - for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 136 - this.regions[var21][var22].method505(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137 + for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { // L: 135 + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 136 + this.regions[var21][var22].method521(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137 } } } // L: 140 - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", - garbageValue = "84" + garbageValue = "-104" ) + @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); // L: 143 float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144 - int var16 = (int)(var15 * 64.0F); // L: 145 + int var16 = (int)(64.0F * var15); // L: 145 int var17 = this.tileX + var1; // L: 146 int var18 = var2 + this.tileY; // L: 147 int var19; int var20; - for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 148 + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 148 for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 149 if (var13) { // L: 150 this.regions[var19][var20].initWorldMapIcon1s(); // L: 151 } - this.regions[var19][var20].method569(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153 + this.regions[var19][var20].method585(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153 } } if (var10 != null && var11 > 0) { // L: 156 for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 157 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 158 + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 158 this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 } } @@ -265,11 +290,12 @@ public final class WorldMapManager { } // L: 163 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIIILjava/util/HashSet;III)V", - garbageValue = "-1439979069" + garbageValue = "-1490055830" ) + @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { if (this.compositeTextureSprite != null) { // L: 166 this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169 @@ -291,9 +317,9 @@ public final class WorldMapManager { var10 = (List)this.icons.get(var9); // L: 179 } while(var10 == null); // L: 180 - Iterator var11 = var10.iterator(); // L: 183 + Iterator var11 = var10.iterator(); - while (var11.hasNext()) { + while (var11.hasNext()) { // L: 183 AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 184 int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 186 int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 187 @@ -304,25 +330,25 @@ public final class WorldMapManager { } } // L: 167 171 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "19" + garbageValue = "-66" ) - public List method721(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method738(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { LinkedList var11 = new LinkedList(); // L: 196 if (!this.loaded) { // L: 197 return var11; // L: 198 } else { WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200 float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201 - int var14 = (int)(var13 * 64.0F); // L: 202 + int var14 = (int)(64.0F * var13); // L: 202 int var15 = this.tileX + var1; // L: 203 int var16 = var2 + this.tileY; // L: 204 - for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 205 + for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { // L: 205 for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 206 - List var19 = this.regions[var17][var18].method531(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207 + List var19 = this.regions[var17][var18].method609(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207 if (!var19.isEmpty()) { // L: 208 var11.addAll(var19); // L: 209 } @@ -333,11 +359,12 @@ public final class WorldMapManager { } } - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIII)Lam;", - garbageValue = "1560413650" + descriptor = "(IIIII)Lar;", + garbageValue = "1387747355" ) + @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 217 int var6 = this.tileX + var1; // L: 218 @@ -375,30 +402,33 @@ public final class WorldMapManager { return var5; // L: 246 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-1114977640" ) + @Export("isLoaded") public boolean isLoaded() { return this.loaded; // L: 250 } - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "-391367086" + garbageValue = "-562559742" ) + @Export("buildIcons") public HashMap buildIcons() { this.buildIcons0(); // L: 254 return this.icons; // L: 255 } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2109869337" + garbageValue = "209943751" ) + @Export("buildIcons0") void buildIcons0() { if (this.icons == null) { // L: 259 this.icons = new HashMap(); // L: 260 @@ -430,11 +460,12 @@ public final class WorldMapManager { } // L: 284 - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(III)F", - garbageValue = "-1667086517" + garbageValue = "-813508891" ) + @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { float var3 = (float)var1 / (float)var2; // L: 287 if (var3 > 8.0F) { // L: 288 @@ -447,25 +478,82 @@ public final class WorldMapManager { } } + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIII)Lco;", + garbageValue = "-310655150" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = (var1 << 8) + var0; // L: 39 + Script var5 = ArchiveLoader.method1240(var3, var0); // L: 42 + if (var5 != null) { // L: 43 + return var5; // L: 44 + } else { + int var6 = var0 + (var2 + 40000 << 8); // L: 48 + var5 = ArchiveLoader.method1240(var6, var0); // L: 51 + return var5 != null ? var5 : null; // L: 52 55 + } + } + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "15" + descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "42" ) - public static void method726(boolean var0) { - if (var0 != ItemDefinition.ItemDefinition_inMembersWorld) { // L: 557 - GameObject.method3412(); // L: 558 - ItemDefinition.ItemDefinition_inMembersWorld = var0; // L: 559 + static boolean method735(String var0, int var1, String var2) { + if (var1 == 0) { // L: 54 + try { + if (!class60.field453.startsWith("win")) { // L: 56 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 57 + throw new Exception(); + } else { + String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 58 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 59 + if (var14.indexOf(var0.charAt(var4)) == -1) { // L: 60 + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 62 + return true; // L: 63 + } + } catch (Throwable var8) { // L: 65 + return false; // L: 66 + } + } else if (var1 == 1) { // L: 69 + try { + Applet var7 = class60.applet; // L: 72 + Object[] var5 = new Object[]{(new URL(class60.applet.getCodeBase(), var0)).toString()}; // L: 73 + Object var13 = JSObject.getWindow(var7).call(var2, var5); // L: 76 + return var13 != null; // L: 79 + } catch (Throwable var9) { // L: 81 + return false; // L: 82 + } + } else if (var1 == 2) { // L: 85 + try { + class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_blank"); // L: 87 + return true; // L: 88 + } catch (Exception var10) { // L: 90 + return false; // L: 91 + } + } else if (var1 == 3) { // L: 94 + try { + Applet var3 = class60.applet; // L: 96 + JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 99 + } catch (Throwable var12) { // L: 102 + } + + try { + class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top"); // L: 104 + return true; // L: 105 + } catch (Exception var11) { // L: 107 + return false; // L: 108 + } + } else { + throw new IllegalArgumentException(); // L: 111 } - - } // L: 561 - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "8" - ) - static int method725(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1120 - 7.0D) * 256.0D); // L: 3197 } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 6a12c15e99..62f76b16f9 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,95 +1,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("am") +@ObfuscatedName("ar") +@Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("d") - static int[] Tiles_lightness; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 743023489 + intValue = -822197791 ) + @Export("width") int width; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 995076797 + intValue = 2015029351 ) + @Export("height") int height; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1102925233 + intValue = -352971205 ) + @Export("x") int x; - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1014669257 + intValue = 1080355853 ) + @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Lat;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lai;)V" + descriptor = "(Lat;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; // L: 303 } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;S)V", - garbageValue = "128" - ) - static void addGameMessage(int var0, String var1, String var2) { - WorldMapData_0.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)Lcy;", - garbageValue = "-1672146154" - ) - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = ApproximateRouteStrategy.archive12.takeFile(var0, 0); // L: 27 - if (var2 == null) { // L: 28 - return null; // L: 29 - } else { - var1 = UserComparator7.newScript(var2); // L: 31 - Script.Script_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 - } - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2081056745" - ) - static String method359() { - return Tile.clientPreferences.hideUsername ? FontName.method5445(Login.Login_username) : Login.Login_username; // L: 213 - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1970592993" - ) - static void method361() { - Players.Players_count = 0; // L: 616 - - for (int var0 = 0; var0 < 2048; ++var0) { // L: 617 - Players.field1277[var0] = null; // L: 618 - Players.field1284[var0] = 1; // L: 619 - } - - } // L: 621 } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 5b67f15cdd..d1cee90df9 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -4,51 +4,64 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; +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("al") +@ObfuscatedName("ax") +@Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfp;" + descriptor = "Lfi;" ) + @Export("WorldMapRegion_cachedSprites") public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("u") - static String field277; - @ObfuscatedName("o") + @ObfuscatedName("ba") + static String field281; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1185290071 + intValue = -1496476917 ) + @Export("regionX") int regionX; - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1059284245 + intValue = 159033397 ) + @Export("regionY") int regionY; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ll;" + descriptor = "Lh;" ) + @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1881987389 + intValue = 1241362547 ) + @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1196076883 + intValue = -2000095907 ) + @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("icon0List") List icon0List; - @ObfuscatedName("h") + @ObfuscatedName("n") + @Export("iconMap") HashMap iconMap; - @ObfuscatedName("a") + @ObfuscatedName("x") + @Export("fonts") final HashMap fonts; static { @@ -56,107 +69,85 @@ public class WorldMapRegion { } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - this.regionX = var1; // L: 50 - this.regionY = var2; // L: 51 - this.worldMapData1List = new LinkedList(); // L: 52 - this.icon0List = new LinkedList(); // L: 53 - this.iconMap = new HashMap(); // L: 54 - this.backgroundColor = var3 | -16777216; // L: 55 - this.fonts = var4; // L: 56 - } // L: 57 + this.regionX = var1; // L: 54 + this.regionY = var2; // L: 55 + this.worldMapData1List = new LinkedList(); // L: 56 + this.icon0List = new LinkedList(); // L: 57 + this.iconMap = new HashMap(); // L: 58 + this.backgroundColor = var3 | -16777216; // L: 59 + this.fonts = var4; // L: 60 + } // L: 61 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1575156019" + descriptor = "(IIIB)V", + garbageValue = "4" ) - void method505(int var1, int var2, int var3) { - int var5 = this.regionX; // L: 61 - int var6 = this.regionY; // L: 62 - int var7 = this.pixelsPerTile; // L: 63 - Sprite var4 = (Sprite)WorldMapRegion_cachedSprites.get(MenuAction.method2139(var5, var6, var7)); // L: 65 - if (var4 != null) { // L: 68 - if (var3 == this.pixelsPerTile * 64) { // L: 69 - var4.drawAt(var1, var2); // L: 70 + void method521(int var1, int var2, int var3) { + Sprite var4 = Buddy.method5321(this.regionX, this.regionY, this.pixelsPerTile); // L: 64 + if (var4 != null) { // L: 65 + if (var3 == this.pixelsPerTile * 64) { // L: 66 + var4.drawAt(var1, var2); // L: 67 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 73 + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 70 } } - } // L: 75 + } // L: 72 - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ll;Ljava/util/List;I)V", - garbageValue = "-1730892204" + descriptor = "(Lh;Ljava/util/List;I)V", + garbageValue = "-1766116567" ) + @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); // L: 78 - this.worldMapData_0 = var1; // L: 79 - this.addAllToIconList(var2); // L: 80 - } // L: 81 + this.iconMap.clear(); // L: 75 + this.worldMapData_0 = var1; // L: 76 + this.addAllToIconList(var2); // L: 77 + } // L: 78 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", - garbageValue = "1" + descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", + garbageValue = "-555470431" ) + @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 84 - Iterator var3 = var1.iterator(); // L: 85 + this.iconMap.clear(); // L: 81 + Iterator var3 = var1.iterator(); // L: 82 - while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 86 - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 88 - this.worldMapData1List.add(var4); // L: 89 + while (var3.hasNext()) { // L: 89 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 83 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 85 + this.worldMapData1List.add(var4); // L: 86 } } - this.addAllToIconList(var2); // L: 93 - } // L: 94 + this.addAllToIconList(var2); // L: 90 + } // L: 91 - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIILan;I)V", - garbageValue = "121581751" + descriptor = "(IIIILav;B)V", + garbageValue = "92" ) + @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 97 - label74: - for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 98 - for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 99 - WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 100 - if (var9 != null && var9.length != 0) { // L: 101 - WorldMapDecoration[] var10 = var9; // L: 105 + for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 94 + label51: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 95 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 96 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 97 + if (var9 != null && var9.length != 0) { // L: 98 + WorldMapDecoration[] var10 = var9; // L: 102 - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 106 - ObjectDefinition var13; - boolean var14; - label65: { - WorldMapDecoration var12 = var10[var11]; // L: 107 - var13 = MidiPcmStream.getObjectDefinition(var12.objectDefinitionId); // L: 109 - if (var13.transforms != null) { // L: 112 - int[] var15 = var13.transforms; // L: 114 - - for (int var16 = 0; var16 < var15.length; ++var16) { // L: 115 - int var17 = var15[var16]; // L: 116 - ObjectDefinition var18 = MidiPcmStream.getObjectDefinition(var17); // L: 118 - if (var18.mapIconId != -1) { - var14 = true; // L: 120 - break label65; - } - } - } else if (var13.mapIconId != -1) { // L: 127 - var14 = true; // L: 128 - break label65; // L: 129 - } - - var14 = false; // L: 131 - } - - if (var14) { // L: 133 - this.getIcon(var13, var8, var6, var7, var5); // L: 136 - continue label74; // L: 137 + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 103 + WorldMapDecoration var12 = var10[var11]; // L: 104 + ObjectDefinition var13 = ScriptEvent.getObjectDefinition(var12.objectDefinitionId); // L: 106 + if (PcmPlayer.method2598(var13)) { // L: 107 + this.getIcon(var13, var8, var6, var7, var5); // L: 110 + continue label51; // L: 111 } } } @@ -164,492 +155,493 @@ public class WorldMapRegion { } } - } // L: 144 + } // L: 118 - @ObfuscatedName("w") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljg;IIILan;I)V", - garbageValue = "329414981" + descriptor = "(Lje;IIILav;B)V", + garbageValue = "-109" ) + @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 147 - Coord var7 = null; // L: 148 - if (this.worldMapData_0 != null) { // L: 149 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 150 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 121 + Coord var7 = null; // L: 122 + if (this.worldMapData_0 != null) { // L: 123 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 124 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 153 - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 154 + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 127 + var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 128 } + WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 157 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 158 + if (var1.transforms != null) { // L: 131 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 132 } else { - WorldMapElement var9 = WorldMapSection0.WorldMapElement_get(var1.mapIconId); // L: 161 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 162 + var9 = class194.WorldMapElement_get(var1.mapIconId); // L: 135 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 136 } - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 164 - } // L: 165 + var9 = class194.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 138 + if (var9.field3258) { // L: 139 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 140 + } - @ObfuscatedName("g") + } // L: 142 + + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1946946990" + garbageValue = "-1279150124" ) + @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 168 + Iterator var1 = this.iconMap.values().iterator(); // L: 145 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 169 - if (var2 instanceof WorldMapIcon_1) { // L: 171 - ((WorldMapIcon_1)var2).init(); // L: 172 + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 146 + if (var2 instanceof WorldMapIcon_1) { // L: 148 + ((WorldMapIcon_1)var2).init(); // L: 149 } } - } // L: 176 + } // L: 153 - @ObfuscatedName("m") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/util/List;I)V", - garbageValue = "-2052830022" + descriptor = "(Ljava/util/List;B)V", + garbageValue = "3" ) + @Export("addAllToIconList") void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); + Iterator var2 = var1.iterator(); // L: 156 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.method529(var3.element)); - this.icon0List.add(var4); + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 157 + if (class194.WorldMapElement_get(var3.element).field3258 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 159 162 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method550(var3.element)); // L: 163 + this.icon0List.add(var4); // L: 164 } } - } // L: 188 + } // L: 168 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1315993718" + ) + void method528() { + if (this.worldMapData_0 != null) { // L: 171 + this.worldMapData_0.reset(); // L: 172 + } else { + Iterator var1 = this.worldMapData1List.iterator(); // L: 175 + + while (var1.hasNext()) { + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 176 + var2.reset(); // L: 178 + } + } + + } // L: 182 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "478350201" - ) - void method507() { - if (this.worldMapData_0 != null) { - this.worldMapData_0.reset(); - } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 195 - - while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); - var2.reset(); // L: 198 - } - } - - } // L: 202 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lic;B)Z", - garbageValue = "-62" + descriptor = "(Liw;I)Z", + garbageValue = "-1635082422" ) + @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 205 - if (this.worldMapData_0 != null) { // L: 206 - this.worldMapData_0.loadGeography(var1); // L: 207 - if (this.worldMapData_0.isFullyLoaded()) { // L: 208 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 209 - return true; // L: 210 + this.iconMap.clear(); // L: 185 + if (this.worldMapData_0 != null) { // L: 186 + this.worldMapData_0.loadGeography(var1); // L: 187 + if (this.worldMapData_0.isFullyLoaded()) { // L: 188 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 189 + return true; // L: 190 } else { - return false; // L: 212 + return false; // L: 192 } } else { - boolean var2 = true; // L: 215 + boolean var2 = true; // L: 195 Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 216 220 - var4 = (WorldMapData_1)var3.next(); // L: 217 - var4.loadGeography(var1); // L: 219 + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 196 200 + var4 = (WorldMapData_1)var3.next(); // L: 197 + var4.loadGeography(var1); // L: 199 } - if (var2) { // L: 223 - var3 = this.worldMapData1List.iterator(); // L: 224 + if (var2) { // L: 203 + var3 = this.worldMapData1List.iterator(); // L: 204 while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 225 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 227 + var4 = (WorldMapData_1)var3.next(); // L: 205 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 207 } } - return var2; // L: 231 + return var2; // L: 211 } } - @ObfuscatedName("h") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(ILaf;[Lls;Lic;Lic;B)V", - garbageValue = "-79" + descriptor = "(ILal;[Lle;Liw;Liw;I)V", + garbageValue = "-406335289" ) + @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; // L: 236 - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 237 - int var7 = this.regionX; // L: 241 - int var8 = this.regionY; // L: 242 - Sprite var6 = (Sprite)WorldMapRegion_cachedSprites.get(MenuAction.method2139(var7, var8, var1)); // L: 244 - if (var6 == null) { // L: 246 - boolean var9 = true; // L: 249 - var9 &= this.loadGeography(var4); // L: 250 - int var11; - if (this.worldMapData_0 != null) { // L: 253 - var11 = this.worldMapData_0.groupId; // L: 254 + this.pixelsPerTile = var1; // L: 216 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 217 + if (Buddy.method5321(this.regionX, this.regionY, var1) == null) { // L: 220 + boolean var6 = true; // L: 223 + var6 &= this.loadGeography(var4); // L: 224 + int var8; + if (this.worldMapData_0 != null) { // L: 227 + var8 = this.worldMapData_0.groupId; // L: 228 } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 257 + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 231 } - var9 &= var5.tryLoadGroup(var11); // L: 259 - if (var9) { // L: 260 - byte[] var10 = var5.takeFileFlat(var11); // L: 261 - WorldMapSprite var12 = class39.method613(var10); // L: 262 - Sprite var13 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 263 - var13.setRaster(); // L: 264 - if (this.worldMapData_0 != null) { // L: 265 - this.method553(var2, var3, var12); // L: 266 + var6 &= var5.tryLoadGroup(var8); // L: 233 + if (var6) { // L: 234 + byte[] var7 = var5.takeFileFlat(var8); // L: 235 + WorldMapSprite var9 = ChatChannel.method2375(var7); // L: 236 + Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 237 + var10.setRaster(); // L: 238 + if (this.worldMapData_0 != null) { // L: 239 + this.method533(var2, var3, var9); // L: 240 } else { - this.method502(var2, var3, var12); // L: 269 + this.method534(var2, var3, var9); // L: 243 } - AbstractWorldMapData.method353(var13, this.regionX, this.regionY, this.pixelsPerTile); // L: 271 - this.method507(); // L: 272 + ModeWhere.method3814(var10, this.regionX, this.regionY, this.pixelsPerTile); // L: 245 + this.method528(); // L: 246 } } } - } // L: 238 247 273 + } // L: 218 221 247 - @ObfuscatedName("a") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "1940218585" + garbageValue = "-134217045" ) - void method569(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 276 - var4 = new HashSet(); // L: 277 + void method585(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 250 + var4 = new HashSet(); // L: 251 } - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 279 - this.drawMapLinks(var1, var2, var4, var3); // L: 280 - } // L: 281 + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 253 + this.drawMapLinks(var1, var2, var4, var3); // L: 254 + } // L: 255 - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "2015143479" + descriptor = "(Ljava/util/HashSet;IIB)V", + garbageValue = "-33" ) + @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 284 + Iterator var4 = this.iconMap.values().iterator(); // L: 258 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 285 - if (var5.hasValidElement()) { // L: 287 - int var6 = var5.getElement(); // L: 288 - if (var1.contains(var6)) { // L: 289 - WorldMapElement var7 = WorldMapSection0.WorldMapElement_get(var6); // L: 290 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 291 + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 259 + if (var5.hasValidElement()) { // L: 261 + int var6 = var5.getElement(); // L: 262 + if (var1.contains(var6)) { // L: 263 + WorldMapElement var7 = class194.WorldMapElement_get(var6); // L: 264 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 265 } } } - this.method521(var1, var2, var3); // L: 295 - } // L: 296 + this.method540(var1, var2, var3); // L: 269 + } // L: 270 - @ObfuscatedName("c") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Laf;[Lls;Lat;I)V", - garbageValue = "-1361448318" + descriptor = "(Lal;[Lle;Lau;B)V", + garbageValue = "-28" ) - void method553(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method533(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 299 - for (var5 = 0; var5 < 64; ++var5) { // L: 300 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 301 - this.method499(var4, var5, this.worldMapData_0, var1); // L: 302 + for (var4 = 0; var4 < 64; ++var4) { // L: 273 + for (var5 = 0; var5 < 64; ++var5) { // L: 274 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 275 + this.method623(var4, var5, this.worldMapData_0, var1); // L: 276 } } - for (var4 = 0; var4 < 64; ++var4) { // L: 305 - for (var5 = 0; var5 < 64; ++var5) { // L: 306 - this.method545(var4, var5, this.worldMapData_0, var1, var2); // L: 307 + for (var4 = 0; var4 < 64; ++var4) { // L: 279 + for (var5 = 0; var5 < 64; ++var5) { // L: 280 + this.method535(var4, var5, this.worldMapData_0, var1, var2); // L: 281 } } - } // L: 310 + } // L: 284 - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Laf;[Lls;Lat;B)V", - garbageValue = "-121" + descriptor = "(Lal;[Lle;Lau;I)V", + garbageValue = "1440356366" ) - void method502(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 313 + void method534(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 287 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 314 + var5 = (WorldMapData_1)var4.next(); // L: 288 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 316 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 317 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 318 - this.method499(var6, var7, var5, var1); // L: 319 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 290 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 291 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 292 + this.method623(var6, var7, var5, var1); // L: 293 } } } - var4 = this.worldMapData1List.iterator(); // L: 324 + var4 = this.worldMapData1List.iterator(); // L: 298 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 325 + var5 = (WorldMapData_1)var4.next(); // L: 299 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 327 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 328 - this.method545(var6, var7, var5, var1, var2); // L: 329 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 301 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 302 + this.method535(var6, var7, var5, var1, var2); // L: 303 } } } - } // L: 334 + } // L: 308 - @ObfuscatedName("r") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IILan;Laf;[Lls;I)V", - garbageValue = "553934135" + descriptor = "(IILav;Lal;[Lle;I)V", + garbageValue = "-2045754418" ) - void method545(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method519(var1, var2, var3); // L: 337 - this.method533(var1, var2, var3, var5); // L: 338 - } // L: 339 + void method535(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method630(var1, var2, var3); // L: 311 + this.method539(var1, var2, var3, var5); // L: 312 + } // L: 313 - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IILan;Laf;Lat;I)V", - garbageValue = "-1873495133" + descriptor = "(IILav;Lal;Lau;S)V", + garbageValue = "-3017" ) + @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 342 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 343 - if (var6 == -1 && var7 == -1) { // L: 344 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 345 + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 316 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 317 + if (var6 == -1 && var7 == -1) { // L: 318 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 319 } - int var8 = 16711935; // L: 347 + int var8 = 16711935; // L: 321 int var9; - if (var7 != -1) { // L: 348 - int var10 = this.backgroundColor; // L: 350 - FloorOverlayDefinition var11 = SoundSystem.method2594(var7); // L: 352 - if (var11 == null) { // L: 353 - var9 = var10; // L: 354 - } else if (var11.secondaryRgb >= 0) { // L: 357 - var9 = var11.secondaryRgb | -16777216; // L: 358 - } else if (var11.texture >= 0) { // L: 360 - int var12 = GrandExchangeOfferTotalQuantityComparator.method172(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 361 - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 362 - } else if (var11.primaryRgb == 16711935) { // L: 364 - var9 = var10; // L: 365 + if (var7 != -1) { // L: 322 + int var10 = this.backgroundColor; // L: 324 + FloorOverlayDefinition var11 = PendingSpawn.method1839(var7); // L: 326 + if (var11 == null) { // L: 327 + var9 = var10; // L: 328 + } else if (var11.secondaryRgb >= 0) { // L: 331 + var9 = var11.secondaryRgb | -16777216; // L: 332 + } else if (var11.texture >= 0) { // L: 334 + int var12 = BuddyRankComparator.method3558(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 335 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 336 + } else if (var11.primaryRgb == 16711935) { // L: 338 + var9 = var10; // L: 339 } else { - int var13 = var11.hue; // L: 369 - int var14 = var11.saturation; // L: 370 - int var15 = var11.lightness; // L: 371 - if (var15 > 179) { // L: 373 + int var13 = var11.hue; // L: 343 + int var14 = var11.saturation; // L: 344 + int var15 = var11.lightness; // L: 345 + if (var15 > 179) { // L: 347 var14 /= 2; } - if (var15 > 192) { // L: 374 + if (var15 > 192) { // L: 348 var14 /= 2; } - if (var15 > 217) { // L: 375 + if (var15 > 217) { // L: 349 var14 /= 2; } - if (var15 > 243) { // L: 376 + if (var15 > 243) { // L: 350 var14 /= 2; } - int var16 = (var14 / 32 << 7) + var15 / 2 + (var13 / 4 << 10); // L: 377 - int var17 = GrandExchangeOfferTotalQuantityComparator.method172(var16, 96); // L: 381 - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 382 + int var16 = (var14 / 32 << 7) + var15 / 2 + (var13 / 4 << 10); // L: 351 + int var17 = BuddyRankComparator.method3558(var16, 96); // L: 355 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 356 } - var8 = var9; // L: 385 + var8 = var9; // L: 359 } - if (var7 > -1 && var3.field198[0][var1][var2] == 0) { // L: 387 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 388 + if (var7 > -1 && var3.field196[0][var1][var2] == 0) { // L: 361 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 362 } else { - var9 = this.method517(var1, var2, var3, var5); // L: 391 - if (var7 == -1) { // L: 392 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 393 + var9 = this.method538(var1, var2, var3, var5); // L: 365 + if (var7 == -1) { // L: 366 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 367 } else { - var4.method802(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field198[0][var1][var2], var3.field191[0][var1][var2]); // L: 396 + var4.method826(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field196[0][var1][var2], var3.field187[0][var1][var2]); // L: 370 } } - } // L: 389 394 397 + } // L: 363 368 371 - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IILan;Laf;I)V", - garbageValue = "-100065860" + descriptor = "(IILav;Lal;I)V", + garbageValue = "208983501" ) - void method499(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 400 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 401 - if (var6 > -1) { // L: 402 - int var8 = this.backgroundColor; // L: 404 - FloorOverlayDefinition var9 = SoundSystem.method2594(var6); // L: 406 + void method623(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 374 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 375 + if (var6 > -1) { // L: 376 + int var8 = this.backgroundColor; // L: 378 + FloorOverlayDefinition var9 = PendingSpawn.method1839(var6); // L: 380 int var7; - if (var9 == null) { // L: 407 - var7 = var8; // L: 408 - } else if (var9.secondaryRgb >= 0) { // L: 411 - var7 = var9.secondaryRgb | -16777216; // L: 412 - } else if (var9.texture >= 0) { // L: 414 - int var10 = GrandExchangeOfferTotalQuantityComparator.method172(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 415 - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 416 - } else if (var9.primaryRgb == 16711935) { // L: 418 - var7 = var8; // L: 419 + if (var9 == null) { // L: 381 + var7 = var8; // L: 382 + } else if (var9.secondaryRgb >= 0) { // L: 385 + var7 = var9.secondaryRgb | -16777216; // L: 386 + } else if (var9.texture >= 0) { // L: 388 + int var10 = BuddyRankComparator.method3558(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 389 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 390 + } else if (var9.primaryRgb == 16711935) { // L: 392 + var7 = var8; // L: 393 } else { - int var11 = var9.hue; // L: 423 - int var12 = var9.saturation; // L: 424 - int var13 = var9.lightness; // L: 425 - if (var13 > 179) { // L: 427 + int var11 = var9.hue; // L: 397 + int var12 = var9.saturation; // L: 398 + int var13 = var9.lightness; // L: 399 + if (var13 > 179) { // L: 401 var12 /= 2; } - if (var13 > 192) { // L: 428 + if (var13 > 192) { // L: 402 var12 /= 2; } - if (var13 > 217) { // L: 429 + if (var13 > 217) { // L: 403 var12 /= 2; } - if (var13 > 243) { // L: 430 + if (var13 > 243) { // L: 404 var12 /= 2; } - int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); // L: 431 - int var15 = GrandExchangeOfferTotalQuantityComparator.method172(var14, 96); // L: 435 - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 436 + int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); // L: 405 + int var15 = BuddyRankComparator.method3558(var14, 96); // L: 409 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 410 } - if (var3.field198[var5][var1][var2] == 0) { // L: 440 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 441 + if (var3.field196[var5][var1][var2] == 0) { // L: 414 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 415 } else { - var4.method802(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field198[var5][var1][var2], var3.field191[var5][var1][var2]); // L: 444 + var4.method826(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field196[var5][var1][var2], var3.field187[var5][var1][var2]); // L: 418 } } } - } // L: 448 + } // L: 422 - @ObfuscatedName("b") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IILan;Lat;I)I", - garbageValue = "1234221167" + descriptor = "(IILav;Lau;I)I", + garbageValue = "-2000366066" ) - int method517(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 451 452 454 + int method538(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 425 426 428 } - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IILan;[Lls;B)V", - garbageValue = "-109" + descriptor = "(IILav;[Lle;I)V", + garbageValue = "2146304456" ) - void method533(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 458 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 459 - if (var6 != null && var6.length != 0) { // L: 460 - WorldMapDecoration[] var7 = var6; // L: 464 + void method539(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 432 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 433 + if (var6 != null && var6.length != 0) { // L: 434 + WorldMapDecoration[] var7 = var6; // L: 438 - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 465 - WorldMapDecoration var9 = var7[var8]; // L: 466 - int var11 = var9.decoration; // L: 469 - boolean var10 = var11 >= WorldMapDecorationType.field2777.id && var11 <= WorldMapDecorationType.field2778.id; // L: 471 - if (!var10) { // L: 474 - int var13 = var9.decoration; // L: 476 - boolean var12 = var13 == WorldMapDecorationType.field2779.id; // L: 478 - if (!var12) { // L: 480 - continue; - } - } - - ObjectDefinition var14 = MidiPcmStream.getObjectDefinition(var9.objectDefinitionId); // L: 482 - if (var14.mapSceneId != -1) { // L: 483 - if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 484 - var4[var14.mapSceneId].method6217(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 488 - } else { - var4[var14.mapSceneId].method6217(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 485 + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 439 + WorldMapDecoration var9 = var7[var8]; // L: 440 + if (GameObject.method3416(var9.decoration) || class7.method108(var9.decoration)) { // L: 442 + ObjectDefinition var10 = ScriptEvent.getObjectDefinition(var9.objectDefinitionId); // L: 443 + if (var10.mapSceneId != -1) { // L: 444 + if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 445 + var4[var10.mapSceneId].method6247(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 449 + } else { + var4[var10.mapSceneId].method6247(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 446 + } } } } } } - } // L: 496 + } // L: 457 - @ObfuscatedName("e") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IILan;B)V", - garbageValue = "-118" + descriptor = "(IILav;I)V", + garbageValue = "-1846642435" ) - void method519(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 499 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 500 - if (var5 != null && var5.length != 0) { // L: 501 - WorldMapDecoration[] var6 = var5; // L: 505 + void method630(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 460 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 461 + if (var5 != null && var5.length != 0) { // L: 462 + WorldMapDecoration[] var6 = var5; // L: 466 - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 506 - WorldMapDecoration var8 = var6[var7]; // L: 507 - if (TextureProvider.method2876(var8.decoration)) { // L: 509 - ObjectDefinition var9 = MidiPcmStream.getObjectDefinition(var8.objectDefinitionId); // L: 510 - int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 511 - if (var8.decoration == WorldMapDecorationType.field2760.id) { // L: 512 - this.method585(var1, var2, var8.rotation, var10); // L: 513 + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 467 + WorldMapDecoration var8 = var6[var7]; // L: 468 + if (LoginPacket.method3751(var8.decoration)) { // L: 470 + ObjectDefinition var9 = ScriptEvent.getObjectDefinition(var8.objectDefinitionId); // L: 471 + int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 472 + if (var8.decoration == WorldMapDecorationType.field2750.id) { // L: 473 + this.method554(var1, var2, var8.rotation, var10); // L: 474 } - if (var8.decoration == WorldMapDecorationType.field2763.id) { // L: 515 - this.method585(var1, var2, var8.rotation, -3355444); // L: 516 - this.method585(var1, var2, var8.rotation + 1, var10); // L: 517 + if (var8.decoration == WorldMapDecorationType.field2748.id) { // L: 476 + this.method554(var1, var2, var8.rotation, -3355444); // L: 477 + this.method554(var1, var2, var8.rotation + 1, var10); // L: 478 } - if (var8.decoration == WorldMapDecorationType.field2757.id) { // L: 519 - if (var8.rotation == 0) { // L: 520 + if (var8.decoration == WorldMapDecorationType.field2754.id) { // L: 480 + if (var8.rotation == 0) { // L: 481 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); // L: 521 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 482 } - if (var8.rotation == 2) { // L: 522 + if (var8.rotation == 2) { // L: 483 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } - if (var8.rotation == 3) { // L: 523 + if (var8.rotation == 3) { // L: 484 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field2761.id) { // L: 525 - int var11 = var8.rotation % 2; // L: 526 + if (var8.decoration == WorldMapDecorationType.field2751.id) { // L: 486 + int var11 = var8.rotation % 2; // L: 487 int var12; - if (var11 == 0) { // L: 527 - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 528 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 529 + if (var11 == 0) { // L: 488 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 489 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 490 } } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 533 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 534 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 494 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 495 } } } @@ -658,372 +650,944 @@ public class WorldMapRegion { } } - } // L: 543 + } // L: 504 - @ObfuscatedName("ab") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "-473063416" + descriptor = "(IILjava/util/HashSet;IB)V", + garbageValue = "-66" ) + @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 546 - float var6 = var5 / 2.0F; // L: 547 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 548 + float var5 = (float)var4 / 64.0F; // L: 507 + float var6 = var5 / 2.0F; // L: 508 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 509 while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 549 - Coord var9 = (Coord)var8.getKey(); // L: 551 - int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); // L: 552 - int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 553 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 554 - if (var12 != null && var12.hasValidElement()) { // L: 555 - var12.screenX = var10; // L: 556 - var12.screenY = var11; // L: 557 - WorldMapElement var13 = WorldMapSection0.WorldMapElement_get(var12.getElement()); // L: 558 - if (!var3.contains(var13.getObjectId())) { // L: 559 - this.method523(var12, var10, var11, var5); // L: 560 + Entry var8 = (Entry)var7.next(); // L: 510 + Coord var9 = (Coord)var8.getKey(); // L: 512 + int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); // L: 513 + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 514 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 515 + if (var12 != null && var12.hasValidElement()) { // L: 516 + var12.screenX = var10; // L: 517 + var12.screenY = var11; // L: 518 + WorldMapElement var13 = class194.WorldMapElement_get(var12.getElement()); // L: 519 + if (!var3.contains(var13.getObjectId())) { // L: 520 + this.method544(var12, var10, var11, var5); // L: 521 } } } - } // L: 565 - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-1020675379" - ) - void method521(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 568 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 569 - if (var5.hasValidElement()) { // L: 571 - WorldMapElement var6 = WorldMapSection0.WorldMapElement_get(var5.getElement()); // L: 572 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 573 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 574 - } - } - } - - } // L: 578 + } // L: 526 @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(Liv;IIIII)V", - garbageValue = "-1177603152" + descriptor = "(Ljava/util/HashSet;IIS)V", + garbageValue = "-19257" ) - void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - Sprite var6 = var1.getSpriteBool(false); // L: 581 - if (var6 != null) { // L: 582 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 585 - if (var4 % var5 < var5 / 2) { // L: 586 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 587 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 588 - } + void method540(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 529 - } - } // L: 583 590 - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Laz;IIFI)V", - garbageValue = "-1943029754" - ) - void method523(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = WorldMapSection0.WorldMapElement_get(var1.getElement()); // L: 593 - this.method524(var5, var2, var3); // L: 594 - this.method567(var1, var5, var2, var3, var4); // L: 595 - } // L: 596 - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(Liv;III)V", - garbageValue = "1650240142" - ) - void method524(WorldMapElement var1, int var2, int var3) { - Sprite var4 = var1.getSpriteBool(false); // L: 599 - if (var4 != null) { // L: 600 - int var5 = this.method527(var4, var1.horizontalAlignment); // L: 601 - int var6 = this.method528(var4, var1.verticalAlignment); // L: 602 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 603 - } - - } // L: 605 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Laz;Liv;IIFB)V", - garbageValue = "-60" - ) - void method567(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 608 - if (var6 != null) { // L: 609 - if (var6.size.method274(var5)) { // L: 612 - Font var7 = (Font)this.fonts.get(var6.size); // L: 615 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3243, 0, 1, 0, var7.ascent / 2); // L: 616 - } - } - } // L: 610 613 617 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "-1868522380" - ) - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 620 - Iterator var6 = this.icon0List.iterator(); // L: 621 - - while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 622 - if (var7.hasValidElement()) { // L: 624 - int var8 = var7.coord2.x % 64; // L: 625 - int var9 = var7.coord2.y % 64; // L: 626 - var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 627 - var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); // L: 628 - if (!var3.contains(var7.getElement())) { // L: 629 - this.method523(var7, var7.screenX, var7.screenY, var5); // L: 632 + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 530 + if (var5.hasValidElement()) { // L: 532 + WorldMapElement var6 = class194.WorldMapElement_get(var5.getElement()); // L: 533 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 534 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 535 } } } - } // L: 635 + } // L: 539 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(Lij;IIIII)V", + garbageValue = "1701094485" + ) + @Export("drawBackgroundCircle") + void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { + Sprite var6 = var1.getSpriteBool(false); // L: 542 + if (var6 != null) { // L: 543 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 546 + if (var4 % var5 < var5 / 2) { // L: 547 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 548 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 549 + } + + } + } // L: 544 551 + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(Lam;IIFB)V", + garbageValue = "37" + ) + void method544(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = class194.WorldMapElement_get(var1.getElement()); // L: 554 + this.method545(var5, var2, var3); // L: 555 + this.method599(var1, var5, var2, var3, var4); // L: 556 + } // L: 557 @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Llp;Lju;I)I", - garbageValue = "-249160527" + descriptor = "(Lij;III)V", + garbageValue = "-1898823455" ) - int method527(Sprite var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 638 - case 0: - return -var1.subWidth / 2; // L: 649 - case 1: - return 0; // L: 641 - default: - return -var1.subWidth; // L: 645 + void method545(WorldMapElement var1, int var2, int var3) { + Sprite var4 = var1.getSpriteBool(false); // L: 560 + if (var4 != null) { // L: 561 + int var5 = this.method531(var4, var1.horizontalAlignment); // L: 562 + int var6 = this.method549(var4, var1.verticalAlignment); // L: 563 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 564 } - } - @ObfuscatedName("at") + } // L: 566 + + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Llp;Lit;I)I", - garbageValue = "-74495504" + descriptor = "(Lam;Lij;IIFI)V", + garbageValue = "-937867024" ) - int method528(Sprite var1, VerticalAlignment var2) { - switch(var2.value) { // L: 655 - case 0: - return -var1.subHeight / 2; // L: 658 - case 1: - return 0; // L: 662 - default: - return -var1.subHeight; // L: 666 - } - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(II)Laq;", - garbageValue = "-576832449" - ) - WorldMapLabel method529(int var1) { - WorldMapElement var2 = WorldMapSection0.WorldMapElement_get(var1); // L: 672 - return this.createMapLabel(var2); // L: 673 - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Liv;I)Laq;", - garbageValue = "-1919467673" - ) - WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 677 - WorldMapLabelSize var2 = WorldMapLabelSize.method270(var1.textSize); // L: 680 - if (var2 == null) { // L: 681 - return null; // L: 682 - } else { - Font var3 = (Font)this.fonts.get(var2); // L: 684 - if (var3 == null) { // L: 685 - return null; // L: 686 - } else { - int var4 = var3.lineCount(var1.name, 1000000); // L: 688 - String[] var5 = new String[var4]; // L: 689 - var3.breakLines(var1.name, (int[])null, var5); // L: 690 - int var6 = var5.length * var3.ascent / 2; // L: 691 - int var7 = 0; // L: 692 - String[] var8 = var5; // L: 694 - - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 695 - String var10 = var8[var9]; // L: 696 - int var11 = var3.stringWidth(var10); // L: 698 - if (var11 > var7) { // L: 699 - var7 = var11; // L: 700 - } - } - - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 705 - } + void method599(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 569 + if (var6 != null) { // L: 570 + if (var6.size.method277(var5)) { // L: 573 + Font var7 = (Font)this.fonts.get(var6.size); // L: 576 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3245, 0, 1, 0, var7.ascent / 2); // L: 577 } - } else { - return null; // L: 678 } - } + } // L: 571 574 578 @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "-2065951782" + descriptor = "(IILjava/util/HashSet;IB)V", + garbageValue = "-97" ) - List method531(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 709 - if (var4 >= var1 && var5 >= var2) { // L: 710 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 711 - Iterator var7 = this.iconMap.values().iterator(); + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 581 + Iterator var6 = this.icon0List.iterator(); // L: 582 + + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 583 + if (var7.hasValidElement()) { // L: 585 + int var8 = var7.coord2.x % 64; // L: 586 + int var9 = var7.coord2.y % 64; // L: 587 + var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 588 + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 589 + if (!var3.contains(var7.getElement())) { // L: 590 + this.method544(var7, var7.screenX, var7.screenY, var5); // L: 593 + } + } + } + + } // L: 596 + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(Llc;Ljy;I)I", + garbageValue = "2012053105" + ) + int method531(Sprite var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 599 + case 1: + return 0; // L: 606 + case 2: + return -var1.subWidth / 2; // L: 610 + default: + return -var1.subWidth; // L: 602 + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Llc;Lir;B)I", + garbageValue = "-1" + ) + int method549(Sprite var1, VerticalAlignment var2) { + switch(var2.value) { // L: 616 + case 0: + return 0; // L: 627 + case 1: + return -var1.subHeight / 2; // L: 619 + default: + return -var1.subHeight; // L: 623 + } + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(II)Lai;", + garbageValue = "-1045904165" + ) + WorldMapLabel method550(int var1) { + WorldMapElement var2 = class194.WorldMapElement_get(var1); // L: 654 + return this.createMapLabel(var2); // L: 655 + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Lij;I)Lai;", + garbageValue = "1905291224" + ) + @Export("createMapLabel") + WorldMapLabel createMapLabel(WorldMapElement var1) { + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 659 + int var3 = var1.textSize; // L: 663 + WorldMapLabelSize[] var4 = WorldMapLabelSize.method273(); // L: 666 + int var5 = 0; + + WorldMapLabelSize var2; + while (true) { + if (var5 >= var4.length) { + var2 = null; // L: 677 + break; + } + + WorldMapLabelSize var6 = var4[var5]; // L: 668 + if (var3 == var6.field150) { // L: 670 + var2 = var6; // L: 671 + break; + } + + ++var5; // L: 667 + } + + if (var2 == null) { // L: 680 + return null; // L: 681 + } else { + Font var14 = (Font)this.fonts.get(var2); // L: 683 + if (var14 == null) { // L: 684 + return null; // L: 685 + } else { + int var15 = var14.lineCount(var1.name, 1000000); // L: 687 + String[] var7 = new String[var15]; // L: 688 + var14.breakLines(var1.name, (int[])null, var7); // L: 689 + int var8 = var7.length * var14.ascent / 2; // L: 690 + int var9 = 0; // L: 691 + String[] var10 = var7; // L: 693 + + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 694 + String var12 = var10[var11]; // L: 695 + int var13 = var14.stringWidth(var12); // L: 697 + if (var13 > var9) { // L: 698 + var9 = var13; // L: 699 + } + } + + return new WorldMapLabel(var1.name, var9, var8, var2); // L: 704 + } + } + } else { + return null; // L: 660 + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(IIIIIB)Ljava/util/List;", + garbageValue = "-56" + ) + List method609(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 708 + if (var4 >= var1 && var5 >= var2) { // L: 709 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 710 + Iterator var7 = this.iconMap.values().iterator(); // L: 711 AbstractWorldMapIcon var8; - while (var7.hasNext()) { // L: 712 - var8 = (AbstractWorldMapIcon)var7.next(); // L: 713 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 715 - var6.add(var8); // L: 716 + while (var7.hasNext()) { + var8 = (AbstractWorldMapIcon)var7.next(); // L: 712 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 714 + var6.add(var8); // L: 715 } } - var7 = this.icon0List.iterator(); // L: 720 + var7 = this.icon0List.iterator(); // L: 719 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 721 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 723 - var6.add(var8); // L: 724 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 720 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 722 + var6.add(var8); // L: 723 } } - return var6; // L: 728 + return var6; // L: 727 } else { - return var6; // L: 719 + return var6; // L: 718 } } else { return var6; } } - @ObfuscatedName("av") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)Ljava/util/List;", - garbageValue = "-715702618" + descriptor = "(B)Ljava/util/List;", + garbageValue = "89" ) + @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 732 - var1.addAll(this.icon0List); // L: 733 - var1.addAll(this.iconMap.values()); // L: 734 - return var1; // L: 735 + LinkedList var1 = new LinkedList(); // L: 731 + var1.addAll(this.icon0List); // L: 732 + var1.addAll(this.iconMap.values()); // L: 733 + return var1; // L: 734 } - @ObfuscatedName("ax") + @ObfuscatedName("aw") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-301130878" + garbageValue = "-1518831838" ) - void method585(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 739 - if (var3 == 0) { // L: 740 + void method554(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 738 + if (var3 == 0) { // L: 739 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 741 + if (var3 == 1) { // L: 740 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 742 + if (var3 == 2) { // L: 741 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 743 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 742 } - } // L: 744 + } // L: 743 - @ObfuscatedName("z") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(IB)Ljm;", - garbageValue = "-91" + descriptor = "([Lht;IIIIIIIII)V", + garbageValue = "-1261994565" ) - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35 - if (var1 != null) { // L: 36 - return var1; - } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37 - var1 = new SequenceDefinition(); // L: 38 - if (var2 != null) { // L: 39 - var1.decode(new Buffer(var2)); - } + @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); // L: 9339 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9340 - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; - } - } + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9341 + Widget var10 = var0[var9]; // L: 9342 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9343 9344 + int var11; + if (var8 == -1) { // L: 9346 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9347 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9348 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9349 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9350 + var11 = ++Client.rootWidgetCount - 1; // L: 9351 + } else { + var11 = var8; // L: 9353 + } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lic;IIB)Lls;", - garbageValue = "20" - ) - static IndexedSprite method611(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); // L: 40 - boolean var3; - if (var4 == null) { // L: 41 - var3 = false; // L: 42 - } else { - Occluder.SpriteBuffer_decode(var4); // L: 45 - var3 = true; // L: 46 - } + var10.rootIndex = var11; // L: 9354 + var10.cycle = Client.cycle; // L: 9355 + if (!var10.isIf3 || !VertexNormal.isComponentHidden(var10)) { // L: 9356 + if (var10.contentType > 0) { // L: 9357 + WorldMapID.method664(var10); + } - return !var3 ? null : InvDefinition.method4448(); // L: 48 49 - } + int var12 = var10.x + var6; // L: 9358 + int var13 = var7 + var10.y; // L: 9359 + int var14 = var10.transparencyTop; // L: 9360 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 9361 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9362 + ItemContainer.field572 = var0; // L: 9363 + WorldMapSprite.field256 = var6; // L: 9364 + GrandExchangeOffer.field87 = var7; // L: 9365 + continue; // L: 9366 + } - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "783564244" - ) - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { // L: 177 - int var6 = (var0 + var1) / 2; // L: 178 - int var7 = var0; // L: 179 - World var8 = AbstractByteArrayCopier.World_worlds[var6]; // L: 180 - AbstractByteArrayCopier.World_worlds[var6] = AbstractByteArrayCopier.World_worlds[var1]; // L: 181 - AbstractByteArrayCopier.World_worlds[var1] = var8; // L: 182 + if (Client.isDraggingWidget && Client.field859) { // L: 9368 + var15 = MouseHandler.MouseHandler_x; // L: 9369 + var16 = MouseHandler.MouseHandler_y; // L: 9370 + var15 -= Client.widgetClickX; // L: 9371 + var16 -= Client.widgetClickY; // L: 9372 + if (var15 < Client.field860) { // L: 9373 + var15 = Client.field860; + } - for (int var9 = var0; var9 < var1; ++var9) { // L: 183 - if (ModelData0.method3376(AbstractByteArrayCopier.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 - World var10 = AbstractByteArrayCopier.World_worlds[var9]; // L: 185 - AbstractByteArrayCopier.World_worlds[var9] = AbstractByteArrayCopier.World_worlds[var7]; // L: 186 - AbstractByteArrayCopier.World_worlds[var7++] = var10; // L: 187 + if (var15 + var10.width > Client.field860 + Client.clickedWidgetParent.width) { // L: 9374 + var15 = Client.field860 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field861) { // L: 9375 + var16 = Client.field861; + } + + if (var16 + var10.height > Client.field861 + Client.clickedWidgetParent.height) { // L: 9376 + var16 = Client.field861 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 9377 + var13 = var16; // L: 9378 + } + + if (!var10.isScrollBar) { // L: 9380 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 9386 + var15 = var2; // L: 9387 + var16 = var3; // L: 9388 + var17 = var4; // L: 9389 + var18 = var5; // L: 9390 + } else if (var10.type == 9) { // L: 9392 + var19 = var12; // L: 9393 + var20 = var13; // L: 9394 + var21 = var12 + var10.width; // L: 9395 + var22 = var13 + var10.height; // L: 9396 + if (var21 < var12) { // L: 9397 + var19 = var21; // L: 9399 + var21 = var12; // L: 9400 + } + + if (var22 < var13) { // L: 9402 + var20 = var22; // L: 9404 + var22 = var13; // L: 9405 + } + + ++var21; // L: 9407 + ++var22; // L: 9408 + var15 = var19 > var2 ? var19 : var2; // L: 9409 + var16 = var20 > var3 ? var20 : var3; // L: 9410 + var17 = var21 < var4 ? var21 : var4; // L: 9411 + var18 = var22 < var5 ? var22 : var5; // L: 9412 + } else { + var19 = var12 + var10.width; // L: 9415 + var20 = var13 + var10.height; // L: 9416 + var15 = var12 > var2 ? var12 : var2; // L: 9417 + var16 = var13 > var3 ? var13 : var3; // L: 9418 + var17 = var19 < var4 ? var19 : var4; // L: 9419 + var18 = var20 < var5 ? var20 : var5; // L: 9420 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9422 + if (var10.contentType != 0) { // L: 9423 + if (var10.contentType == 1336) { // L: 9424 + if (Client.displayFps) { // L: 9425 + var13 += 15; // L: 9426 + WorldMapCacheName.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); // L: 9427 + var13 += 15; // L: 9428 + Runtime var42 = Runtime.getRuntime(); // L: 9429 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9430 + var21 = 16776960; // L: 9431 + if (var20 > 327680 && !Client.isLowDetail) { // L: 9432 + var21 = 16711680; + } + + WorldMapCacheName.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9433 + var13 += 15; // L: 9434 + } + continue; + } + + if (var10.contentType == 1337) { // L: 9438 + Client.viewportX = var12; // L: 9439 + Client.viewportY = var13; // L: 9440 + ItemContainer.drawEntities(var12, var13, var10.width, var10.height); // L: 9441 + Client.field834[var10.rootIndex] = true; // L: 9442 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9443 + continue; // L: 9444 + } + + if (var10.contentType == 1338) { // L: 9446 + UserComparator10.drawMinimap(var10, var12, var13, var11); // L: 9447 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9448 + continue; // L: 9449 + } + + if (var10.contentType == 1339) { // L: 9451 + WorldMapSectionType.drawCompass(var10, var12, var13, var11); // L: 9452 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9453 + continue; // L: 9454 + } + + if (var10.contentType == 1400) { // L: 9456 + KeyHandler.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9457 + } + + if (var10.contentType == 1401) { // L: 9459 + KeyHandler.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9460 + } + + if (var10.contentType == 1402) { // L: 9462 + Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9463 + } + } + + if (var10.type == 0) { // L: 9466 + if (!var10.isIf3 && VertexNormal.isComponentHidden(var10) && var10 != GrandExchangeEvent.mousedOverWidgetIf1) { // L: 9467 + continue; + } + + if (!var10.isIf3) { // L: 9468 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9469 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 9470 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9472 + if (var10.children != null) { // L: 9473 + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 9474 + if (var30 != null) { // L: 9475 + ClanChat.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9476 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9478 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9479 + } + + if (Client.isResizable || Client.field745[var11] || Client.gameDrawingMode > 1) { // L: 9481 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9482 9483 + WorldMapData_0.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 9485 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 9488 + var19 = 0; // L: 9489 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9490 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9491 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 9492 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 9493 + if (var19 < 20) { // L: 9494 + var22 += var10.inventoryXOffsets[var19]; // L: 9495 + var23 += var10.inventoryYOffsets[var19]; // L: 9496 + } + + if (var10.itemIds[var19] <= 0) { // L: 9498 + if (var10.inventorySprites != null && var19 < 20) { // L: 9543 + Sprite var46 = var10.getInventorySprite(var19); // L: 9544 + if (var46 != null) { // L: 9545 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2677) { // L: 9546 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 9499 + boolean var38 = false; // L: 9500 + var26 = var10.itemIds[var19] - 1; // L: 9501 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == GameBuild.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9502 + Sprite var35; + if (Client.isItemSelected == 1 && var19 == InvDefinition.selectedItemSlot && var10.id == SpotAnimationDefinition.selectedItemWidget) { // L: 9504 + var35 = TilePaint.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = TilePaint.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9505 + } + + if (var35 != null) { // L: 9506 + if (var10 == GameBuild.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9507 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9508 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9509 + if (var24 < 5 && var24 > -5) { // L: 9510 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 9511 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 9512 + var24 = 0; // L: 9513 + var25 = 0; // L: 9514 + } + + var35.drawTransAt(var22 + var24, var25 + var23, 128); // L: 9516 + if (var1 != -1) { // L: 9517 + Widget var28 = var0[var1 & 65535]; // L: 9518 + int var29; + if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9519 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field743 / 3; // L: 9520 + if (var29 > Client.field743 * 10) { // L: 9521 + var29 = Client.field743 * 10; + } + + if (var29 > var28.scrollY) { // L: 9522 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 9523 + Client.draggedWidgetY += var29; // L: 9524 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var28); // L: 9525 + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9527 + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field743 / 3; // L: 9528 + if (var29 > Client.field743 * 10) { // L: 9529 + var29 = Client.field743 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9530 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 9531 + Client.draggedWidgetY -= var29; // L: 9532 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var28); // L: 9533 + } + } + } else if (var10 == MouseHandler.field525 && var19 == Client.field788) { // L: 9537 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 9538 + } + } else { + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); // L: 9540 + } + } + } + + ++var19; // L: 9548 + } + } + } else if (var10.type == 3) { // L: 9553 + if (BufferedNetSocket.runCs1(var10)) { // L: 9555 + var19 = var10.color2; // L: 9556 + if (var10 == GrandExchangeEvent.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9557 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 9560 + if (var10 == GrandExchangeEvent.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9561 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 9563 + switch(var10.fillMode.id) { // L: 9564 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9573 + break; // L: 9574 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9570 + break; // L: 9571 + default: + if (var14 == 0) { // L: 9566 + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9567 + } + } + } else if (var14 == 0) { // L: 9578 + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9579 + } + } else { + Font var39; + if (var10.type == 4) { // L: 9583 + var39 = var10.getFont(); // L: 9584 + if (var39 == null) { // L: 9585 + if (Widget.field2677) { // L: 9586 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 9590 + if (BufferedNetSocket.runCs1(var10)) { // L: 9591 + var20 = var10.color2; // L: 9592 + if (var10 == GrandExchangeEvent.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9593 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 9594 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 9597 + if (var10 == GrandExchangeEvent.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9598 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 9600 + ItemDefinition var45 = AbstractWorldMapData.ItemDefinition_get(var10.itemId); // L: 9601 + var44 = var45.name; // L: 9602 + if (var44 == null) { // L: 9603 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9604 + var44 = Client.colorStartTag(16748608) + var44 + "" + " " + 'x' + InterfaceParent.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 9606 + var44 = "Please wait..."; // L: 9607 + var20 = var10.color; // L: 9608 + } + + if (!var10.isIf3) { // L: 9610 + var44 = class2.method39(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9611 + } + } else if (var10.type == 5) { // L: 9614 + Sprite var40; + if (!var10.isIf3) { // L: 9615 + var40 = var10.getSprite(BufferedNetSocket.runCs1(var10)); // L: 9616 + if (var40 != null) { // L: 9617 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2677) { // L: 9618 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 9622 + var40 = TilePaint.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); // L: 9623 + } + + if (var40 == null) { // L: 9624 + if (Widget.field2677) { // L: 9648 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 9625 + var21 = var40.height; // L: 9626 + if (!var10.spriteTiling) { // L: 9627 + var22 = var10.width * 4096 / var20; // L: 9641 + if (var10.spriteAngle != 0) { // L: 9642 + var40.method6299(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 9643 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 9644 + var40.drawTransBgAt(var12, var13); // L: 9645 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9628 + var22 = (var20 - 1 + var10.width) / var20; // L: 9629 + var23 = (var21 - 1 + var10.height) / var21; // L: 9630 + + for (var24 = 0; var24 < var22; ++var24) { // L: 9631 + for (var25 = 0; var25 < var23; ++var25) { // L: 9632 + if (var10.spriteAngle != 0) { // L: 9633 + var40.method6299(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 9634 + var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 9635 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9638 + } + } + } + } else { + ItemDefinition var33; + if (var10.type == 6) { // L: 9652 + boolean var36 = BufferedNetSocket.runCs1(var10); // L: 9653 + if (var36) { // L: 9655 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 9656 + } + + Model var41 = null; // L: 9657 + var22 = 0; // L: 9658 + if (var10.itemId != -1) { // L: 9659 + var33 = AbstractWorldMapData.ItemDefinition_get(var10.itemId); // L: 9660 + if (var33 != null) { // L: 9661 + var33 = var33.getCountObj(var10.itemQuantity); // L: 9662 + var41 = var33.getModel(1); // L: 9663 + if (var41 != null) { // L: 9664 + var41.calculateBoundsCylinder(); // L: 9665 + var22 = var41.height / 2; // L: 9666 + } else { + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); // L: 9668 + } + } + } else if (var10.modelType == 5) { // L: 9671 + if (var10.modelId == 0) { // L: 9672 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = PlayerType.localPlayer.getModel(); // L: 9673 + } + } else if (var20 == -1) { // L: 9675 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, PlayerType.localPlayer.appearance); // L: 9676 + if (var41 == null && Widget.field2677) { // L: 9677 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = class105.SequenceDefinition_get(var20); // L: 9680 + var41 = var10.getModel(var47, var10.modelFrame, var36, PlayerType.localPlayer.appearance); // L: 9681 + if (var41 == null && Widget.field2677) { // L: 9682 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); + } + } + + Rasterizer3D.method3174(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9684 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9685 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9686 + if (var41 != null) { // L: 9687 + if (!var10.isIf3) { // L: 9688 + var41.method3064(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 9690 + if (var10.modelOrthog) { // L: 9691 + var41.method3025(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method3064(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9692 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 9695 + } else { + if (var10.type == 7) { // L: 9698 + var39 = var10.getFont(); // L: 9699 + if (var39 == null) { // L: 9700 + if (Widget.field2677) { // L: 9701 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 9704 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9705 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9706 + if (var10.itemIds[var20] > 0) { // L: 9707 + var33 = AbstractWorldMapData.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9708 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9710 + var34 = Client.colorStartTag(16748608) + var33.name + ""; + } else { + var34 = Client.colorStartTag(16748608) + var33.name + "" + " " + 'x' + InterfaceParent.formatItemStacks(var10.itemQuantities[var20]); // L: 9711 + } + + var25 = var12 + var22 * (var10.paddingX + 115); // L: 9712 + var26 = var21 * (var10.paddingY + 12) + var13; // L: 9713 + if (var10.textXAlignment == 0) { // L: 9714 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 9715 + var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9716 + } + } + + ++var20; // L: 9718 + } + } + } + + if (var10.type == 8 && var10 == GrandExchangeOfferOwnWorldComparator.field677 && Client.field833 == Client.field832) { // L: 9722 9723 + var19 = 0; // L: 9724 + var20 = 0; // L: 9725 + Font var31 = WorldMapCacheName.fontPlain12; // L: 9726 + String var32 = var10.text; // L: 9727 + + String var43; + for (var32 = class2.method39(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9729 9730 9742 + var24 = var32.indexOf("
"); // L: 9731 + if (var24 != -1) { // L: 9732 + var43 = var32.substring(0, var24); // L: 9733 + var32 = var32.substring(var24 + 4); // L: 9734 + } else { + var43 = var32; // L: 9737 + var32 = ""; // L: 9738 + } + + var25 = var31.stringWidth(var43); // L: 9740 + if (var25 > var19) { // L: 9741 + var19 = var25; + } + } + + var19 += 6; // L: 9744 + var20 += 7; // L: 9745 + var24 = var12 + var10.width - 5 - var19; // L: 9746 + var25 = var13 + var10.height + 5; // L: 9747 + if (var24 < var12 + 5) { // L: 9748 + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { // L: 9749 + var24 = var4 - var19; + } + + if (var25 + var20 > var5) { // L: 9750 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9751 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9752 + var32 = var10.text; // L: 9753 + var26 = var25 + var31.ascent + 2; // L: 9754 + + for (var32 = class2.method39(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9755 9756 9767 + int var27 = var32.indexOf("
"); // L: 9757 + if (var27 != -1) { // L: 9758 + var43 = var32.substring(0, var27); // L: 9759 + var32 = var32.substring(var27 + 4); // L: 9760 + } else { + var43 = var32; // L: 9763 + var32 = ""; // L: 9764 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9766 + } + } + + if (var10.type == 9) { // L: 9771 + if (var10.field2627) { // L: 9776 + var19 = var12; // L: 9777 + var20 = var13 + var10.height; // L: 9778 + var21 = var12 + var10.width; // L: 9779 + var22 = var13; // L: 9780 + } else { + var19 = var12; // L: 9783 + var20 = var13; // L: 9784 + var21 = var12 + var10.width; // L: 9785 + var22 = var13 + var10.height; // L: 9786 + } + + if (var10.lineWid == 1) { // L: 9788 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9789 + } else { + class300.method5419(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9792 + } + } + } + } + } + } + } + } } } - - AbstractByteArrayCopier.World_worlds[var1] = AbstractByteArrayCopier.World_worlds[var7]; // L: 191 - AbstractByteArrayCopier.World_worlds[var7] = var8; // L: 192 - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 } - } // L: 196 - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1201601061" - ) - static final void method609(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; // L: 119 - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your ignore list first").toString(); - WorldMapRectangle.addGameMessage(30, "", var1); // L: 121 - } // L: 123 + } // L: 9797 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index a4f9e7199e..489549d5c1 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -1,52 +1,45 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("al") +@Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lei;" - ) - static UrlRequest World_request; - @ObfuscatedName("h") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("eb") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1388382927 - ) - static int port3; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1114368907 + intValue = 1152059267 ) + @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("tileTemplates") byte[][][] tileTemplates; WorldMapScaleHandler(int var1) { this.pixelsPerTile = var1; // L: 10 } // L: 11 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "315012939" + descriptor = "(IIIIIIIIS)V", + garbageValue = "22724" ) - void method802(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method826(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) { // L: 14 - var8 = this.method791(var8, var7); // L: 15 - var7 = this.method828(var7); // L: 16 + var8 = this.method830(var8, var7); // L: 15 + var7 = this.method856(var7); // L: 16 Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } - } + } // L: 18 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1896351316" + garbageValue = "-1831249934" ) - int method791(int var1, int var2) { + int method830(int var1, int var2) { if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } @@ -62,12 +55,12 @@ public class WorldMapScaleHandler { return var1; // L: 24 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "107" + descriptor = "(II)I", + garbageValue = "-688083607" ) - int method828(int var1) { + int method856(int var1) { if (var1 != 9 && var1 != 10) { // L: 28 return var1 == 11 ? 8 : var1; // L: 29 } else { @@ -75,11 +68,12 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1909065180" + garbageValue = "-1144178166" ) + @Export("init") void init() { if (this.tileTemplates == null) { // L: 34 this.tileTemplates = new byte[8][4][]; // L: 37 @@ -94,11 +88,12 @@ public class WorldMapScaleHandler { } } // L: 35 46 - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "97" + descriptor = "(I)V", + garbageValue = "-1214625649" ) + @Export("init0") void init0() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 49 int var2 = 0; // L: 50 @@ -160,11 +155,12 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; // L: 84 } // L: 85 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1716417605" + descriptor = "(B)V", + garbageValue = "-111" ) + @Export("init1") void init1() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 88 int var2 = 0; // L: 89 @@ -230,11 +226,12 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; // L: 127 } // L: 128 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1974218360" + descriptor = "(B)V", + garbageValue = "30" ) + @Export("init2") void init2() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 int var2 = 0; // L: 132 @@ -257,8 +254,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 - if (var4 >= var3 << 1) { - var1[var2] = -1; // L: 144 + if (var4 >= var3 << 1) { // L: 144 + var1[var2] = -1; } ++var2; // L: 145 @@ -296,11 +293,12 @@ public class WorldMapScaleHandler { this.tileTemplates[2][3] = var1; // L: 166 } // L: 167 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "922410315" + garbageValue = "-1097342155" ) + @Export("init3") void init3() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 int var2 = 0; // L: 171 @@ -362,11 +360,12 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; // L: 205 } // L: 206 - @ObfuscatedName("g") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1095934607" + garbageValue = "-1974243838" ) + @Export("init4") void init4() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 209 int var2 = 0; // L: 210 @@ -389,8 +388,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 - if (var4 <= var3 << 1) { // L: 222 - var1[var2] = -1; + if (var4 <= var3 << 1) { + var1[var2] = -1; // L: 222 } ++var2; // L: 223 @@ -428,11 +427,12 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; // L: 244 } // L: 245 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1883920620" + descriptor = "(B)V", + garbageValue = "76" ) + @Export("init5") void init5() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 248 boolean var2 = false; // L: 249 @@ -496,11 +496,12 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; // L: 285 } // L: 286 - @ObfuscatedName("n") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1746576330" + garbageValue = "-1292699212" ) + @Export("init6") void init6() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 289 boolean var2 = false; // L: 290 @@ -564,11 +565,12 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; // L: 326 } // L: 327 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1072905152" + garbageValue = "-1073112729" ) + @Export("init7") void init7() { byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 330 boolean var2 = false; // L: 331 @@ -632,12 +634,12 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; // L: 367 } // L: 368 - @ObfuscatedName("z") + @ObfuscatedName("gy") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1676022086" + descriptor = "(IIIII)V", + garbageValue = "1780999289" ) - static String method824(int var0) { - return ""; // L: 18 - } + static final void method864(int var0, int var1, int var2, int var3) { + KeyHandler.method931(); // L: 5389 + } // L: 5390 } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 4137db037a..caf5f84f10 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -1,47 +1,56 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("as") +@Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "100" + descriptor = "(Lak;I)V", + garbageValue = "-1645245778" ) + @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-339896458" + descriptor = "(IIIB)Z", + garbageValue = "51" ) + @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-2135820245" + descriptor = "(IIB)Z", + garbageValue = "10" ) + @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-1761492451" + descriptor = "(IIIB)[I", + garbageValue = "-25" ) + @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "-1553504587" + descriptor = "(IIB)Lhw;", + garbageValue = "1" ) + @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "2144381737" + descriptor = "(Lkb;I)V", + garbageValue = "-222098123" ) + @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 b81efacacb..41c8e4c235 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -1,136 +1,170 @@ +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("ao") +@Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -465345147 + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lap;" ) + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "[Lle;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1900849309 + ) + @Export("oldZ") int oldZ; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -202719925 + intValue = -1837492707 ) + @Export("newZ") int newZ; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 47110693 + intValue = 1798651577 ) + @Export("oldX") int oldX; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1315329307 - ) - int oldY; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -445154313 - ) - int newX; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1054372917 - ) - int newY; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 755868073 - ) - int oldChunkXLow; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1795067773 - ) - int oldChunkYLow; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -662709525 - ) - int oldChunkXHigh; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1849440565 + intValue = 921187823 ) + @Export("oldY") + int oldY; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -131099529 + ) + @Export("newX") + int newX; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 2025421843 + ) + @Export("newY") + int newY; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1814738027 + ) + @Export("oldChunkXLow") + int oldChunkXLow; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1792733085 + ) + @Export("oldChunkYLow") + int oldChunkYLow; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1592563299 + ) + @Export("oldChunkXHigh") + int oldChunkXHigh; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1478309445 + ) + @Export("oldChunkYHigh") int oldChunkYHigh; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 908411651 + ) + @Export("newChunkXLow") + int newChunkXLow; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1036645465 + ) + @Export("newChunkYLow") + int newChunkYLow; @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1861847067 - ) - int newChunkXLow; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1830088993 - ) - int newChunkYLow; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -878235337 + intValue = 1518275853 ) + @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2049654615 + intValue = -246372361 ) + @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { } // L: 22 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "100" + descriptor = "(Lak;I)V", + garbageValue = "-1645245778" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { // L: 25 + if (var1.regionLowX > this.newX) { var1.regionLowX = this.newX; } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; // L: 26 + var1.regionHighX = this.newX; } - if (var1.regionLowY > this.newY) { // L: 27 + if (var1.regionLowY > this.newY) { var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { // L: 28 + if (var1.regionHighY < this.newY) { var1.regionHighY = this.newY; } - } // L: 29 + } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-339896458" + descriptor = "(IIIB)Z", + garbageValue = "51" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { // L: 32 - 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; // L: 35 + 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; // L: 33 + return false; } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-2135820245" + descriptor = "(IIB)Z", + garbageValue = "10" ) + @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; // L: 39 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-1761492451" + descriptor = "(IIIB)[I", + garbageValue = "-25" ) + @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { + if (!this.containsCoord(var1, var2, var3)) { // L: 43 return null; // L: 44 } else { int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 @@ -138,11 +172,12 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "-1553504587" + descriptor = "(IIB)Lhw;", + garbageValue = "1" ) + @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 53 return null; // L: 54 @@ -153,11 +188,12 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "2144381737" + descriptor = "(Lkb;I)V", + garbageValue = "-222098123" ) + @Export("read") public void read(Buffer var1) { this.oldZ = var1.readUnsignedByte(); // L: 62 this.newZ = var1.readUnsignedByte(); // L: 63 @@ -176,29 +212,111 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); // L: 76 } // L: 77 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "60" + descriptor = "(I)V", + garbageValue = "-2087257379" ) + @Export("postRead") void postRead() { } // L: 79 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IS)Liv;", - garbageValue = "15751" + descriptor = "(II)Lco;", + garbageValue = "717728742" ) - 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); // L: 42 43 + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = ViewportMouse.archive12.takeFile(var0, 0); // L: 27 + if (var2 == null) { // L: 28 + return null; // L: 29 + } else { + var1 = ClientPacket.newScript(var2); // L: 31 + Script.Script_cached.put(var1, (long)var0); // L: 32 + return var1; + } + } } - @ObfuscatedName("eh") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Lmx;", - garbageValue = "122" + descriptor = "(Lll;ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "-111" ) - static WorldMap getWorldMap() { - return Message.worldMap; // L: 665 + static String method307(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { // L: 33 + return var2; + } else { + ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 34 + return var3 == null ? var2 : (String)var3.obj; // L: 35 36 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "1132603315" + ) + public static void method323(boolean var0) { + if (NetCache.NetCache_socket != null) { // L: 193 + try { + Buffer var1 = new Buffer(4); // L: 195 + var1.writeByte(var0 ? 2 : 3); // L: 196 + var1.writeMedium(0); // L: 197 + NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 198 + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); // L: 202 + } catch (Exception var3) { // L: 204 + } + + ++NetCache.NetCache_ioExceptions; // L: 205 + NetCache.NetCache_socket = null; // L: 206 + } + + } + } // L: 208 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "3" + ) + public static String method328(String var0) { + int var1 = var0.length(); // L: 155 + char[] var2 = new char[var1]; // L: 156 + byte var3 = 2; // L: 157 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 158 + char var5 = var0.charAt(var4); // L: 159 + if (var3 == 0) { // L: 160 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 161 + var5 = WorldMapSection2.method426(var5); + } + + if (Character.isLetter(var5)) { // L: 162 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 163 + if (Character.isSpaceChar(var5)) { // L: 164 + if (var3 != 2) { // L: 165 + var3 = 1; + } + } else { + var3 = 1; // L: 167 + } + } else { + var3 = 2; + } + + var2[var4] = var5; // L: 168 + } + + return new String(var2); // L: 170 } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 237b101b09..353ca615a7 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -1,59 +1,58 @@ -import java.util.Date; +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("an") +@Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("sy") - @ObfuscatedSignature( - descriptor = "Lc;" + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1213941935 ) - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("dm") - @ObfuscatedSignature( - descriptor = "Liw;" + @Export("minPlane") + int minPlane; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1306866299 ) - static Archive archive7; + @Export("planes") + int planes; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1337019749 + ) + @Export("regionStartX") + int regionStartX; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 741739179 + ) + @Export("regionStartY") + int regionStartY; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2060258139 - ) - int minPlane; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1398963829 - ) - int planes; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 682976363 - ) - int regionStartX; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 38335685 - ) - int regionStartY; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1282107961 + intValue = -1313402053 ) + @Export("regionEndX") int regionEndX; - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -167107483 + intValue = -1227163429 ) + @Export("regionEndY") int regionEndY; WorldMapSection1() { } // L: 14 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "100" + descriptor = "(Lak;I)V", + garbageValue = "-1645245778" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if (var1.regionLowX > this.regionEndX) { // L: 17 var1.regionLowX = this.regionEndX; @@ -71,49 +70,53 @@ public class WorldMapSection1 implements WorldMapSection { var1.regionHighY = this.regionEndY; } - } // L: 21 + } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-339896458" + descriptor = "(IIIB)Z", + garbageValue = "51" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { - return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { + return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 27 } else { - return false; + return false; // L: 25 } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-2135820245" + descriptor = "(IIB)Z", + garbageValue = "10" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; + return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-1761492451" + descriptor = "(IIIB)[I", + garbageValue = "-25" ) + @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; + if (!this.containsCoord(var1, var2, var3)) { // L: 35 + return null; // L: 36 } else { - int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 39 40 + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 38 39 40 return var4; // L: 41 } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "-1553504587" + descriptor = "(IIB)Lhw;", + garbageValue = "1" ) + @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 45 return null; // L: 46 @@ -124,11 +127,12 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "2144381737" + descriptor = "(Lkb;I)V", + garbageValue = "-222098123" ) + @Export("read") public void read(Buffer var1) { this.minPlane = var1.readUnsignedByte(); // L: 54 this.planes = var1.readUnsignedByte(); // L: 55 @@ -139,644 +143,36 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); // L: 60 } // L: 61 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1994421574" + descriptor = "(B)V", + garbageValue = "-72" ) + @Export("postRead") void postRead() { } // L: 63 - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1982002808" + descriptor = "(III)I", + garbageValue = "2108026740" ) - public static int getVarbit(int var0) { - VarbitDefinition var1 = TaskHandler.method3567(var0); // L: 24 - int var2 = var1.baseVar; // L: 25 - int var3 = var1.startBit; // L: 26 - int var4 = var1.endBit; // L: 27 - int var5 = Varps.Varps_masks[var4 - var3]; // L: 28 - return Varps.Varps_main[var2] >> var3 & var5; // L: 29 - } - - @ObfuscatedName("z") - public static String method650(long var0) { - Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 30 - int var2 = Calendar.Calendar_calendar.get(7); // L: 31 - int var3 = Calendar.Calendar_calendar.get(5); // L: 32 - int var4 = Calendar.Calendar_calendar.get(2); // L: 33 - int var5 = Calendar.Calendar_calendar.get(1); // L: 34 - int var6 = Calendar.Calendar_calendar.get(11); // L: 35 - int var7 = Calendar.Calendar_calendar.get(12); // L: 36 - int var8 = Calendar.Calendar_calendar.get(13); // L: 37 - 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"; // L: 38 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1996016917" - ) - static final void method649() { - Object var10000 = null; // L: 126 - String var0 = "You can't add yourself to your own friend list"; - WorldMapRectangle.addGameMessage(30, "", var0); // L: 128 - } // L: 130 - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(Lhq;IIIIIIB)V", - garbageValue = "21" - ) - static final void method648(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field743) { // L: 9277 - Client.alternativeScrollbarWidth = 32; + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 + if (var2 == null) { // L: 22 + return 0; } else { - Client.alternativeScrollbarWidth = 0; // L: 9278 + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 } + } - Client.field743 = false; // L: 9279 - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 9280 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 9281 - var0.scrollY -= 4; // L: 9282 - class52.invalidateWidget(var0); // L: 9283 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 9285 - var0.scrollY += 4; // L: 9286 - class52.invalidateWidget(var0); // L: 9287 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 9289 - var7 = var3 * (var3 - 32) / var4; // L: 9290 - if (var7 < 8) { // L: 9291 - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; // L: 9292 - int var9 = var3 - 32 - var7; // L: 9293 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 9294 - class52.invalidateWidget(var0); // L: 9295 - Client.field743 = true; // L: 9296 - } - } - - if (Client.mouseWheelRotation != 0) { // L: 9299 - var7 = var0.width; // L: 9300 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 9301 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 9302 - class52.invalidateWidget(var0); // L: 9303 - } - } - - } // L: 9306 - - @ObfuscatedName("jj") + @ObfuscatedName("gw") @ObfuscatedSignature( - descriptor = "([Lhq;IIIIIIIB)V", - garbageValue = "2" + descriptor = "(I)Z", + garbageValue = "-692815675" ) - 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) { // L: 9649 - Widget var9 = var0[var8]; // L: 9650 - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapIcon_0.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 9651 9652 9653 - if (var9.isIf3) { // L: 9654 - if (GrandExchangeOfferUnitPriceComparator.isComponentHidden(var9)) { // L: 9655 - continue; - } - } else if (var9.type == 0 && var9 != TriBool.mousedOverWidgetIf1 && GrandExchangeOfferUnitPriceComparator.isComponentHidden(var9)) { // L: 9658 - continue; - } - - int var10 = var9.x + var6; // L: 9660 - int var11 = var7 + var9.y; // L: 9661 - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { // L: 9666 - var12 = var2; // L: 9667 - var13 = var3; // L: 9668 - var14 = var4; // L: 9669 - var15 = var5; // L: 9670 - } else { - int var16; - if (var9.type == 9) { // L: 9672 - var16 = var10; // L: 9673 - var17 = var11; // L: 9674 - var18 = var10 + var9.width; // L: 9675 - int var19 = var11 + var9.height; // L: 9676 - if (var18 < var10) { // L: 9677 - var16 = var18; // L: 9679 - var18 = var10; // L: 9680 - } - - if (var19 < var11) { // L: 9682 - var17 = var19; // L: 9684 - var19 = var11; // L: 9685 - } - - ++var18; // L: 9687 - ++var19; // L: 9688 - var12 = var16 > var2 ? var16 : var2; // L: 9689 - var13 = var17 > var3 ? var17 : var3; // L: 9690 - var14 = var18 < var4 ? var18 : var4; // L: 9691 - var15 = var19 < var5 ? var19 : var5; // L: 9692 - } else { - var16 = var10 + var9.width; // L: 9695 - var17 = var11 + var9.height; // L: 9696 - var12 = var10 > var2 ? var10 : var2; // L: 9697 - var13 = var11 > var3 ? var11 : var3; // L: 9698 - var14 = var16 < var4 ? var16 : var4; // L: 9699 - var15 = var17 < var5 ? var17 : var5; // L: 9700 - } - } - - if (var9 == Client.clickedWidget) { // L: 9702 - Client.field880 = true; // L: 9703 - Client.field859 = var10; // L: 9704 - Client.field795 = var11; // L: 9705 - } - - boolean var32 = false; // L: 9707 - if (var9.field2676) { // L: 9708 - switch(Client.field865) { // L: 9709 - case 0: - var32 = true; // L: 9721 - case 1: - default: - break; - case 2: - if (Client.field840 == var9.id >>> 16) { // L: 9716 - var32 = true; // L: 9717 - } - break; - case 3: - if (var9.id == Client.field840) { // L: 9711 - var32 = true; // L: 9712 - } - } - } - - if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 9725 - if (var9.isIf3) { // L: 9726 - ScriptEvent var26; - if (var9.noClickThrough) { // L: 9727 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 9728 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 9729 - if (var26.isMouseInputEvent) { // L: 9730 - var26.remove(); // L: 9731 - var26.widget.containsMouse = false; // L: 9732 - } - } - - if (BoundaryObject.widgetDragDuration == 0) { // L: 9735 - Client.clickedWidget = null; // L: 9736 - Client.clickedWidgetParent = null; // L: 9737 - } - - if (!Client.isMenuOpen) { // L: 9739 - WorldMapAreaData.addCancelMenuEntry(); // L: 9740 - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 9744 9745 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 9746 - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 9747 - var26.remove(); // L: 9748 - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; // L: 9754 - var18 = MouseHandler.MouseHandler_y; // L: 9755 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 9756 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 9757 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 9758 - } - - boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 9760 - if (var9.contentType == 1337) { // L: 9761 - if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 9762 - JagexCache.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { // L: 9765 - GrandExchangeEvent.checkIfMinimapClicked(var9, var10, var11); // L: 9766 - } else { - if (var9.contentType == 1400) { // L: 9769 - Message.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 9770 - } - - if (!Client.isMenuOpen && var33) { // L: 9772 - if (var9.contentType == 1400) { // L: 9773 - Message.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 9774 - } else { - class1.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 9777 - } - } - - boolean var21; - int var23; - if (var32) { // L: 9780 - for (int var20 = 0; var20 < var9.field2626.length; ++var20) { // L: 9781 - var21 = false; // L: 9782 - boolean var27 = false; // L: 9783 - if (!var21 && var9.field2626[var20] != null) { // L: 9784 - for (var23 = 0; var23 < var9.field2626[var20].length; ++var23) { // L: 9785 - boolean var24 = false; // L: 9786 - if (var9.field2661 != null) { // L: 9787 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2626[var20][var23]]; // L: 9788 - } - - if (Buddy.method5277(var9.field2626[var20][var23]) || var24) { // L: 9790 - var21 = true; // L: 9791 - if (var9.field2661 != null && var9.field2661[var20] > Client.cycle) { // L: 9792 - break; - } - - byte var31 = var9.field2719[var20][var23]; // L: 9793 - if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 9794 9795 9796 9797 9798 - var27 = true; // L: 9800 - break; - } - } - } - } - - if (var27) { // L: 9806 - if (var20 < 10) { // L: 9807 - UserComparator8.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 9808 - class22.Widget_runOnTargetLeave(); // L: 9809 - User.selectSpell(var9.id, var9.childIndex, GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var9)), var9.itemId); // L: 9810 - Client.selectedSpellActionName = SpriteMask.Widget_getSpellActionName(var9); // L: 9811 - if (Client.selectedSpellActionName == null) { // L: 9812 - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + WorldMapAreaData.colorStartTag(16777215); // L: 9813 - } - - var23 = var9.field2682[var20]; // L: 9815 - if (var9.field2661 == null) { // L: 9816 - var9.field2661 = new int[var9.field2626.length]; - } - - if (var9.field2683 == null) { // L: 9817 - var9.field2683 = new int[var9.field2626.length]; - } - - if (var23 != 0) { // L: 9818 - if (var9.field2661[var20] == 0) { // L: 9819 - var9.field2661[var20] = var23 + Client.cycle + var9.field2683[var20]; - } else { - var9.field2661[var20] = var23 + Client.cycle; // L: 9820 - } - } else { - var9.field2661[var20] = Integer.MAX_VALUE; // L: 9822 - } - } - - if (!var21 && var9.field2661 != null) { // L: 9824 9825 - var9.field2661[var20] = 0; - } - } - } - - if (var9.isIf3) { // L: 9829 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 9830 - var33 = true; - } else { - var33 = false; // L: 9831 - } - - boolean var34 = false; // L: 9832 - if ((MouseHandler.MouseHandler_currentButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 9833 - var34 = true; - } - - var21 = false; // L: 9834 - if ((MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 9835 - var21 = true; - } - - if (var21) { // L: 9836 - class13.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { // L: 9837 - Message.worldMap.method6430(var17, var18, var33 & var34, var33 & var21); // L: 9838 - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && Archive.method4386(WorldMapIcon_0.getWidgetFlags(var9))) { // L: 9840 - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { // L: 9841 - Client.field799 = true; // L: 9842 - Client.field856 = var10; // L: 9843 - Client.field785 = var11; // L: 9844 - } - - if (var9.hasListener) { // L: 9846 - ScriptEvent var22; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 9847 - var22 = new ScriptEvent(); // L: 9848 - var22.isMouseInputEvent = true; // L: 9849 - var22.widget = var9; // L: 9850 - var22.mouseY = Client.mouseWheelRotation; // L: 9851 - var22.args = var9.onScroll; // L: 9852 - Client.scriptEvents.addFirst(var22); // L: 9853 - } - - if (Client.clickedWidget != null || BuddyRankComparator.dragInventoryWidget != null || Client.isMenuOpen) { // L: 9855 - var21 = false; // L: 9856 - var34 = false; // L: 9857 - var33 = false; // L: 9858 - } - - if (!var9.isClicked && var21) { // L: 9860 - var9.isClicked = true; // L: 9861 - if (var9.onClick != null) { // L: 9862 - var22 = new ScriptEvent(); // L: 9863 - var22.isMouseInputEvent = true; // L: 9864 - var22.widget = var9; // L: 9865 - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 9866 - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 9867 - var22.args = var9.onClick; // L: 9868 - Client.scriptEvents.addFirst(var22); // L: 9869 - } - } - - if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 9872 9873 - var22 = new ScriptEvent(); // L: 9874 - var22.isMouseInputEvent = true; // L: 9875 - var22.widget = var9; // L: 9876 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9877 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9878 - var22.args = var9.onClickRepeat; // L: 9879 - Client.scriptEvents.addFirst(var22); // L: 9880 - } - - if (var9.isClicked && !var34) { // L: 9883 - var9.isClicked = false; // L: 9884 - if (var9.onRelease != null) { // L: 9885 - var22 = new ScriptEvent(); // L: 9886 - var22.isMouseInputEvent = true; // L: 9887 - var22.widget = var9; // L: 9888 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9889 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9890 - var22.args = var9.onRelease; // L: 9891 - Client.field912.addFirst(var22); // L: 9892 - } - } - - if (var34 && var9.onHold != null) { // L: 9895 9896 - var22 = new ScriptEvent(); // L: 9897 - var22.isMouseInputEvent = true; // L: 9898 - var22.widget = var9; // L: 9899 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9900 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9901 - var22.args = var9.onHold; // L: 9902 - Client.scriptEvents.addFirst(var22); // L: 9903 - } - - if (!var9.containsMouse && var33) { // L: 9906 - var9.containsMouse = true; // L: 9907 - if (var9.onMouseOver != null) { // L: 9908 - var22 = new ScriptEvent(); // L: 9909 - var22.isMouseInputEvent = true; // L: 9910 - var22.widget = var9; // L: 9911 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9912 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9913 - var22.args = var9.onMouseOver; // L: 9914 - Client.scriptEvents.addFirst(var22); // L: 9915 - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 9918 9919 - var22 = new ScriptEvent(); // L: 9920 - var22.isMouseInputEvent = true; // L: 9921 - var22.widget = var9; // L: 9922 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9923 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9924 - var22.args = var9.onMouseRepeat; // L: 9925 - Client.scriptEvents.addFirst(var22); // L: 9926 - } - - if (var9.containsMouse && !var33) { // L: 9929 - var9.containsMouse = false; // L: 9930 - if (var9.onMouseLeave != null) { // L: 9931 - var22 = new ScriptEvent(); // L: 9932 - var22.isMouseInputEvent = true; // L: 9933 - var22.widget = var9; // L: 9934 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9935 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9936 - var22.args = var9.onMouseLeave; // L: 9937 - Client.field912.addFirst(var22); // L: 9938 - } - } - - if (var9.onTimer != null) { // L: 9941 - var22 = new ScriptEvent(); // L: 9942 - var22.widget = var9; // L: 9943 - var22.args = var9.onTimer; // L: 9944 - Client.field877.addFirst(var22); // L: 9945 - } - - ScriptEvent var25; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.field864 > var9.field2618) { // L: 9947 - if (var9.varTransmitTriggers != null && Client.field864 - var9.field2618 <= 32) { // L: 9948 - label783: - for (var36 = var9.field2618; var36 < Client.field864; ++var36) { // L: 9955 - var23 = Client.field863[var36 & 31]; // L: 9956 - - for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 9957 - if (var23 == var9.varTransmitTriggers[var35]) { // L: 9958 - var25 = new ScriptEvent(); // L: 9959 - var25.widget = var9; // L: 9960 - var25.args = var9.onVarTransmit; // L: 9961 - Client.scriptEvents.addFirst(var25); // L: 9962 - break label783; // L: 9963 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 9949 - var22.widget = var9; // L: 9950 - var22.args = var9.onVarTransmit; // L: 9951 - Client.scriptEvents.addFirst(var22); // L: 9952 - } - - var9.field2618 = Client.field864; // L: 9968 - } - - if (var9.onInvTransmit != null && Client.field903 > var9.field2727) { // L: 9970 - if (var9.invTransmitTriggers != null && Client.field903 - var9.field2727 <= 32) { // L: 9971 - label759: - for (var36 = var9.field2727; var36 < Client.field903; ++var36) { // L: 9978 - var23 = Client.changedItemContainers[var36 & 31]; // L: 9979 - - for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 9980 - if (var23 == var9.invTransmitTriggers[var35]) { // L: 9981 - var25 = new ScriptEvent(); // L: 9982 - var25.widget = var9; // L: 9983 - var25.args = var9.onInvTransmit; // L: 9984 - Client.scriptEvents.addFirst(var25); // L: 9985 - break label759; // L: 9986 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 9972 - var22.widget = var9; // L: 9973 - var22.args = var9.onInvTransmit; // L: 9974 - Client.scriptEvents.addFirst(var22); // L: 9975 - } - - var9.field2727 = Client.field903; // L: 9991 - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2681) { // L: 9993 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2681 <= 32) { // L: 9994 - label735: - for (var36 = var9.field2681; var36 < Client.changedSkillsCount; ++var36) { // L: 10001 - var23 = Client.changedSkills[var36 & 31]; // L: 10002 - - for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10003 - if (var23 == var9.statTransmitTriggers[var35]) { // L: 10004 - var25 = new ScriptEvent(); // L: 10005 - var25.widget = var9; // L: 10006 - var25.args = var9.onStatTransmit; // L: 10007 - Client.scriptEvents.addFirst(var25); // L: 10008 - break label735; // L: 10009 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 9995 - var22.widget = var9; // L: 9996 - var22.args = var9.onStatTransmit; // L: 9997 - Client.scriptEvents.addFirst(var22); // L: 9998 - } - - var9.field2681 = Client.changedSkillsCount; // L: 10014 - } - - if (Client.chatCycle > var9.field2664 && var9.onChatTransmit != null) { // L: 10016 - var22 = new ScriptEvent(); // L: 10017 - var22.widget = var9; // L: 10018 - var22.args = var9.onChatTransmit; // L: 10019 - Client.scriptEvents.addFirst(var22); // L: 10020 - } - - if (Client.field870 > var9.field2664 && var9.onFriendTransmit != null) { // L: 10022 - var22 = new ScriptEvent(); // L: 10023 - var22.widget = var9; // L: 10024 - var22.args = var9.onFriendTransmit; // L: 10025 - Client.scriptEvents.addFirst(var22); // L: 10026 - } - - if (Client.field871 > var9.field2664 && var9.onClanTransmit != null) { // L: 10028 - var22 = new ScriptEvent(); // L: 10029 - var22.widget = var9; // L: 10030 - var22.args = var9.onClanTransmit; // L: 10031 - Client.scriptEvents.addFirst(var22); // L: 10032 - } - - if (Client.field872 > var9.field2664 && var9.onStockTransmit != null) { // L: 10034 - var22 = new ScriptEvent(); // L: 10035 - var22.widget = var9; // L: 10036 - var22.args = var9.onStockTransmit; // L: 10037 - Client.scriptEvents.addFirst(var22); // L: 10038 - } - - if (Client.field873 > var9.field2664 && var9.field2722 != null) { // L: 10040 - var22 = new ScriptEvent(); // L: 10041 - var22.widget = var9; // L: 10042 - var22.args = var9.field2722; // L: 10043 - Client.scriptEvents.addFirst(var22); // L: 10044 - } - - if (Client.field775 > var9.field2664 && var9.onMiscTransmit != null) { // L: 10046 - var22 = new ScriptEvent(); // L: 10047 - var22.widget = var9; // L: 10048 - var22.args = var9.onMiscTransmit; // L: 10049 - Client.scriptEvents.addFirst(var22); // L: 10050 - } - - var9.field2664 = Client.cycleCntr; // L: 10052 - if (var9.onKey != null) { // L: 10053 - for (var36 = 0; var36 < Client.field898; ++var36) { // L: 10054 - ScriptEvent var30 = new ScriptEvent(); // L: 10055 - var30.widget = var9; // L: 10056 - var30.keyTyped = Client.field900[var36]; // L: 10057 - var30.keyPressed = Client.field899[var36]; // L: 10058 - var30.args = var9.onKey; // L: 10059 - Client.scriptEvents.addFirst(var30); // L: 10060 - } - } - } - } - - if (!var9.isIf3) { // L: 10065 - if (Client.clickedWidget != null || BuddyRankComparator.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10066 - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10067 - if (var9.mouseOverRedirect >= 0) { // L: 10068 - TriBool.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - TriBool.mousedOverWidgetIf1 = var9; // L: 10069 - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10071 - Occluder.field1950 = var9; // L: 10072 - } - - if (var9.scrollHeight > var9.height) { // L: 10074 - method648(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { // L: 10076 - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10077 - if (var9.children != null) { // L: 10078 - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 10079 - if (var28 != null) { // L: 10080 - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10081 - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10082 - if (var29.isMouseInputEvent) { // L: 10083 - var29.remove(); // L: 10084 - var29.widget.containsMouse = false; // L: 10085 - } - } - - if (BoundaryObject.widgetDragDuration == 0) { // L: 10088 - Client.clickedWidget = null; // L: 10089 - Client.clickedWidgetParent = null; // L: 10090 - } - - if (!Client.isMenuOpen) { // L: 10092 - WorldMapAreaData.addCancelMenuEntry(); // L: 10093 - } - } - - GameObject.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10096 - } - } - } - } - } - } - - } // L: 10100 + static boolean method681() { + return (Client.drawPlayerNames & 4) != 0; // L: 4914 + } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index bc0beb92e6..b85f69e1f9 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -1,231 +1,220 @@ +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("au") +@ObfuscatedName("ah") +@Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("z") + @ObfuscatedName("rv") @ObfuscatedGetter( - intValue = -1201238509 + intValue = 1167994355 ) + static int field225; + @ObfuscatedName("as") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -432633541 + ) + @Export("minPlane") int minPlane; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1333374059 + intValue = -1968130081 ) + @Export("planes") int planes; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1475797575 + intValue = -741529837 ) + @Export("regionStartX") int regionStartX; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 905621997 - ) - int regionStartY; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1367224805 - ) - int regionEndX; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -359238835 - ) - int regionEndY; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 994649457 - ) - int field224; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -287102607 - ) - int field223; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -64559715 - ) - int field228; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1728764959 + intValue = 1317553213 ) - int field225; + @Export("regionStartY") + int regionStartY; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1484434025 + ) + @Export("regionEndX") + int regionEndX; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 2055867539 + ) + @Export("regionEndY") + int regionEndY; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -38953615 + ) + int field222; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 458609745 + ) + int field223; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 562473149 + ) + int field224; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2130603605 + ) + int field226; WorldMapSection2() { } // L: 18 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "100" + descriptor = "(Lak;I)V", + garbageValue = "-1645245778" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field224) { // L: 21 - var1.regionLowX = this.field224; + if (var1.regionLowX > this.field222) { // L: 21 + var1.regionLowX = this.field222; } - if (var1.regionHighX < this.field228) { - var1.regionHighX = this.field228; // L: 22 + if (var1.regionHighX < this.field224) { + var1.regionHighX = this.field224; // L: 22 } if (var1.regionLowY > this.field223) { // L: 23 var1.regionLowY = this.field223; } - if (var1.regionHighY < this.field225) { // L: 24 - var1.regionHighY = this.field225; + if (var1.regionHighY < this.field226) { // L: 24 + var1.regionHighY = this.field226; } } // L: 25 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-339896458" + descriptor = "(IIIB)Z", + garbageValue = "51" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 28 + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 28 return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 31 } else { return false; // L: 29 } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-2135820245" + descriptor = "(IIB)Z", + garbageValue = "10" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field224 && var1 >> 6 <= this.field228 && var2 >> 6 >= this.field223 && var2 >> 6 <= this.field225; // L: 35 + return var1 >> 6 >= this.field222 && var1 >> 6 <= this.field224 && var2 >> 6 >= this.field223 && var2 >> 6 <= this.field226; // L: 35 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-1761492451" + descriptor = "(IIIB)[I", + garbageValue = "-25" ) + @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 39 - return null; + return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field224 * 64 - this.regionStartX * 64), var3 + (this.field223 * 64 - this.regionStartY * 64)}; // L: 42 43 44 + int[] var4 = new int[]{var2 + (this.field222 * 64 - this.regionStartX * 64), var3 + (this.field223 * 64 - this.regionStartY * 64)}; // L: 42 43 44 return var4; // L: 45 } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "-1553504587" + descriptor = "(IIB)Lhw;", + garbageValue = "1" ) + @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 } else { - int var3 = this.regionStartX * 64 - this.field224 * 64 + var1; // L: 52 + int var3 = this.regionStartX * 64 - this.field222 * 64 + var1; // L: 52 int var4 = var2 + (this.regionStartY * 64 - this.field223 * 64); // L: 53 return new Coord(this.minPlane, var3, var4); // L: 54 } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "2144381737" + descriptor = "(Lkb;I)V", + garbageValue = "-222098123" ) + @Export("read") public void read(Buffer var1) { this.minPlane = var1.readUnsignedByte(); // L: 58 this.planes = var1.readUnsignedByte(); // L: 59 this.regionStartX = var1.readUnsignedShort(); // L: 60 this.regionStartY = var1.readUnsignedShort(); // L: 61 this.regionEndX = var1.readUnsignedShort(); // L: 62 - this.regionEndY = var1.readUnsignedShort(); // L: 63 - this.field224 = var1.readUnsignedShort(); // L: 64 + this.regionEndY = var1.readUnsignedShort(); + this.field222 = var1.readUnsignedShort(); this.field223 = var1.readUnsignedShort(); // L: 65 - this.field228 = var1.readUnsignedShort(); // L: 66 - this.field225 = var1.readUnsignedShort(); // L: 67 + this.field224 = var1.readUnsignedShort(); // L: 66 + this.field226 = var1.readUnsignedShort(); // L: 67 this.postRead(); // L: 68 } // L: 69 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "240000675" + garbageValue = "335411255" ) + @Export("postRead") void postRead() { } // L: 71 - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IB)Lbk;", - garbageValue = "1" + descriptor = "(CB)C", + garbageValue = "0" ) - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + static char method426(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 63 64 } - @ObfuscatedName("ff") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "835345001" + descriptor = "(I)Z", + garbageValue = "166784628" ) - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 3424 - Tile.clientPreferences.roofsHidden = !Tile.clientPreferences.roofsHidden; // L: 3425 - WorldMapData_1.savePreferences(); // L: 3426 - if (Tile.clientPreferences.roofsHidden) { // L: 3427 - WorldMapRectangle.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - WorldMapRectangle.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3428 - } - } + static final boolean method425() { + return ViewportMouse.ViewportMouse_isInViewport; // L: 87 + } - if (var0.equalsIgnoreCase("displayfps")) { // L: 3430 - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { // L: 3431 - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3432 - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { // L: 3433 - if (var0.equalsIgnoreCase("errortest")) { // L: 3434 - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { // L: 3435 - Message.worldMap.showCoord = !Message.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { // L: 3436 - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { // L: 3437 - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { // L: 3438 - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { // L: 3439 - ArchiveLoader.method1208(); - } - } - - PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); // L: 3442 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 3443 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3444 - Client.packetWriter.addNode(var1); // L: 3445 - } // L: 3446 + @ObfuscatedName("hp") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-26" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + AbstractWorldMapData.method375(); // L: 7734 + Client.menuActions[0] = "Cancel"; // L: 7735 + Client.menuTargets[0] = ""; // L: 7736 + Client.menuOpcodes[0] = 1006; // L: 7737 + Client.menuShiftClick[0] = false; // L: 7738 + Client.menuOptionsCount = 1; // L: 7739 + } // L: 7740 } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 9d80216255..ca82f726ee 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -1,68 +1,78 @@ +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("ac") +@ObfuscatedName("ad") +@Implements("WorldMapSection3") public class WorldMapSection3 implements WorldMapSection { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1540857287 + @ObfuscatedName("dc") + @ObfuscatedSignature( + descriptor = "Lid;" ) - int field391; - @ObfuscatedName("k") + @Export("archive2") + static Archive archive2; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1117083463 + intValue = 375073711 ) int field381; - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -186376071 - ) - int field382; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1787934953 - ) - int field392; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1247077539 - ) - int field384; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -134643499 - ) - int field385; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1837481963 - ) - int field389; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1861989631 + intValue = -670342777 ) int field387; - @ObfuscatedName("g") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 185317539 + intValue = -831871381 ) - int field380; + int field382; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1881120603 + intValue = -1970843519 + ) + int field383; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1989869311 + ) + int field384; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1016940673 + ) + int field385; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -597741031 ) int field386; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -664935547 + ) + int field389; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 266959941 + ) + int field388; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -486540041 + ) + int field391; WorldMapSection3() { } // L: 18 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "100" + descriptor = "(Lak;I)V", + garbageValue = "-1645245778" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if (var1.regionLowX > this.field384) { // L: 21 var1.regionLowX = this.field384; @@ -82,81 +92,113 @@ public class WorldMapSection3 implements WorldMapSection { } // L: 25 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "-339896458" + descriptor = "(IIIB)Z", + garbageValue = "51" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field391 && var1 < this.field381 + this.field391) { // L: 28 - return var2 >= (this.field382 << 6) + (this.field389 << 3) && var2 <= (this.field382 << 6) + (this.field389 << 3) + 7 && var3 >= (this.field392 << 6) + (this.field387 << 3) && var3 <= (this.field392 << 6) + (this.field387 << 3) + 7; // L: 31 + if (var1 >= this.field381 && var1 < this.field381 + this.field387) { // L: 28 + return var2 >= (this.field382 << 6) + (this.field386 << 3) && var2 <= (this.field382 << 6) + (this.field386 << 3) + 7 && var3 >= (this.field383 << 6) + (this.field389 << 3) && var3 <= (this.field383 << 6) + (this.field389 << 3) + 7; // L: 31 } else { return false; // L: 29 } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-2135820245" + descriptor = "(IIB)Z", + garbageValue = "10" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field384 << 6) + (this.field380 << 3) && var1 <= (this.field384 << 6) + (this.field380 << 3) + 7 && var2 >= (this.field385 << 6) + (this.field386 << 3) && var2 <= (this.field385 << 6) + (this.field386 << 3) + 7; // L: 35 + return var1 >= (this.field384 << 6) + (this.field388 << 3) && var1 <= (this.field384 << 6) + (this.field388 << 3) + 7 && var2 >= (this.field385 << 6) + (this.field391 << 3) && var2 <= (this.field385 << 6) + (this.field391 << 3) + 7; // L: 35 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "-1761492451" + descriptor = "(IIIB)[I", + garbageValue = "-25" ) + @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 39 return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field384 * 64 - this.field382 * 64) + (this.field380 * 8 - this.field389 * 8), var3 + (this.field385 * 64 - this.field392 * 64) + (this.field386 * 8 - this.field387 * 8)}; // L: 42 43 44 + int[] var4 = new int[]{var2 + (this.field384 * 64 - this.field382 * 64) + (this.field388 * 8 - this.field386 * 8), var3 + (this.field385 * 64 - this.field383 * 64) + (this.field391 * 8 - this.field389 * 8)}; // L: 42 43 44 return var4; // L: 45 } } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "-1553504587" + descriptor = "(IIB)Lhw;", + garbageValue = "1" ) + @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 } else { - int var3 = this.field382 * 64 - this.field384 * 64 + (this.field389 * 8 - this.field380 * 8) + var1; // L: 52 - int var4 = var2 + (this.field392 * 64 - this.field385 * 64) + (this.field387 * 8 - this.field386 * 8); // L: 53 - return new Coord(this.field391, var3, var4); // L: 54 + int var3 = this.field382 * 64 - this.field384 * 64 + (this.field386 * 8 - this.field388 * 8) + var1; // L: 52 + int var4 = var2 + (this.field383 * 64 - this.field385 * 64) + (this.field389 * 8 - this.field391 * 8); // L: 53 + return new Coord(this.field381, var3, var4); // L: 54 } } - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkf;I)V", - garbageValue = "2144381737" + descriptor = "(Lkb;I)V", + garbageValue = "-222098123" ) + @Export("read") public void read(Buffer var1) { - this.field391 = var1.readUnsignedByte(); // L: 58 - this.field381 = var1.readUnsignedByte(); // L: 59 + this.field381 = var1.readUnsignedByte(); // L: 58 + this.field387 = var1.readUnsignedByte(); // L: 59 this.field382 = var1.readUnsignedShort(); // L: 60 - this.field389 = var1.readUnsignedByte(); // L: 61 - this.field392 = var1.readUnsignedShort(); // L: 62 - this.field387 = var1.readUnsignedByte(); // L: 63 + this.field386 = var1.readUnsignedByte(); // L: 61 + this.field383 = var1.readUnsignedShort(); // L: 62 + this.field389 = var1.readUnsignedByte(); // L: 63 this.field384 = var1.readUnsignedShort(); // L: 64 - this.field380 = var1.readUnsignedByte(); // L: 65 + this.field388 = var1.readUnsignedByte(); // L: 65 this.field385 = var1.readUnsignedShort(); // L: 66 - this.field386 = var1.readUnsignedByte(); // L: 67 - this.method838(); // L: 68 + this.field391 = var1.readUnsignedByte(); // L: 67 + this.method874(); // L: 68 } // L: 69 - @ObfuscatedName("x") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1599277860" + descriptor = "(B)V", + garbageValue = "-115" ) - void method838() { + void method874() { } // L: 71 + + @ObfuscatedName("f") + @Export("sleepExact") + public static final void sleepExact(long var0) { + if (var0 > 0L) { // L: 9 + if (0L == var0 % 10L) { // L: 10 + VertexNormal.method3135(var0 - 1L); // L: 11 + VertexNormal.method3135(1L); // L: 12 + } else { + VertexNormal.method3135(var0); // L: 14 + } + + } + } // L: 15 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "606509160" + ) + static void method870(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 258 + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 259 + if (var4 != null) { // L: 260 + NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 261 + } + } // L: 262 } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index d65fb9f9bb..14edd76ffe 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -1,63 +1,121 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +@ObfuscatedName("af") +@Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Laf;" ) + @Export("WORLDMAPSECTIONTYPE0") WORLDMAPSECTIONTYPE0(2, (byte)0), - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Laf;" ) - WORLDMAPSECTIONTYPE1(1, (byte)1), - @ObfuscatedName("s") + @Export("WORLDMAPSECTIONTYPE1") + WORLDMAPSECTIONTYPE1(3, (byte)1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Laf;" ) - WORLDMAPSECTIONTYPE2(3, (byte)2), - @ObfuscatedName("t") + @Export("WORLDMAPSECTIONTYPE2") + WORLDMAPSECTIONTYPE2(1, (byte)2), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Laf;" ) + @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("g") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 872496481 - ) - static int field178; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 750880259 + intValue = 1960357597 ) + @Export("type") final int type; - @ObfuscatedName("o") + @ObfuscatedName("q") + @Export("id") final byte id; WorldMapSectionType(int var3, byte var4) { - this.type = var3; // L: 21 - this.id = var4; // L: 22 - } // L: 23 + this.type = var3; // L: 17 + this.id = var4; // L: 18 + } // L: 19 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 26 + return this.id; // L: 22 } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)[Lae;", - garbageValue = "278613741" + descriptor = "([BI)V", + garbageValue = "1810910487" ) - static WorldMapSectionType[] method327() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE3}; // L: 17 + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 + } else { + if (ByteArrayPool.ByteArrayPool_arrays != null) { // L: 88 + for (int var1 = 0; var1 < Coord.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 + if (var0.length == Coord.ByteArrayPool_alternativeSizes[var1] && FloorDecoration.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { // L: 90 + ByteArrayPool.ByteArrayPool_arrays[var1][FloorDecoration.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 + return; // L: 92 + } + } + } + + } + } // L: 78 82 86 96 + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "1" + ) + static final boolean method336(int var0) { + if (var0 < 0) { // L: 7925 + return false; + } else { + int var1 = Client.menuOpcodes[var0]; // L: 7926 + if (var1 >= 2000) { // L: 7927 + var1 -= 2000; + } + + return var1 == 1007; // L: 7928 + } } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(Lht;IIIB)V", + garbageValue = "-90" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 11444 + if (var4 != null) { // L: 11445 + if (Client.minimapState < 3) { // L: 11446 + UserComparator5.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); // L: 11447 + } + + } + } // L: 11448 } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 8a79415ab1..69f98628d4 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,16 +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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("at") +@ObfuscatedName("au") +@Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("w") - public static short[][] field253; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Llw;" + @ObfuscatedName("nm") + @ObfuscatedGetter( + intValue = -1577465281 ) - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("k") + static int field256; + @ObfuscatedName("b") + @Export("tileColors") final int[] tileColors; WorldMapSprite() { @@ -21,168 +25,338 @@ public final class WorldMapSprite { this.tileColors = var1; // L: 15 } // L: 16 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1945716520" + garbageValue = "38290774" ) + @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var2 * 64 + var1]; // L: 24 + return this.tileColors[var1 + var2 * 64]; // L: 24 } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1682041122" + descriptor = "(Lcf;Lcf;IZI)I", + garbageValue = "-1899610512" ) - public static final boolean method496(char var0) { - if (Character.isISOControl(var0)) { // L: 28 - return false; - } else if (class204.isAlphaNumeric(var0)) { // L: 29 - return true; + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 211 + int var4 = var0.population; // L: 212 + int var5 = var1.population; // L: 213 + if (!var3) { // L: 214 + if (var4 == -1) { // L: 215 + var4 = 2001; + } + + if (var5 == -1) { // L: 216 + var5 = 2001; + } + } + + return var4 - var5; // L: 218 + } else if (var2 == 2) { // L: 220 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 221 + if (var0.activity.equals("-")) { // L: 222 + if (var1.activity.equals("-")) { // L: 223 + return 0; + } else { + return var3 ? -1 : 1; // L: 224 + } + } else if (var1.activity.equals("-")) { // L: 226 + return var3 ? 1 : -1; + } else { + return var0.activity.compareTo(var1.activity); // L: 227 + } + } else if (var2 == 4) { // L: 229 + return var0.method1888() ? (var1.method1888() ? 0 : 1) : (var1.method1888() ? -1 : 0); + } else if (var2 == 5) { // L: 230 + return var0.method1901() ? (var1.method1901() ? 0 : 1) : (var1.method1901() ? -1 : 0); + } else if (var2 == 6) { // L: 231 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 232 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); } else { - char[] var1 = class348.field4067; // L: 31 - - int var2; - char var3; - for (var2 = 0; var2 < var1.length; ++var2) { // L: 32 - var3 = var1[var2]; // L: 33 - if (var0 == var3) { // L: 34 - return true; - } - } - - var1 = class348.field4065; // L: 38 - - for (var2 = 0; var2 < var1.length; ++var2) { // L: 39 - var3 = var1[var2]; // L: 40 - if (var0 == var3) { - return true; // L: 41 - } - } - - return false; // L: 44 + return var0.id - var1.id; // L: 233 } } - @ObfuscatedName("s") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "20454" + descriptor = "(ILco;ZI)I", + garbageValue = "1481006152" ) - public static boolean loadInterface(int var0) { - if (Bounds.Widget_loadedInterfaces[var0]) { // L: 203 - return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { // L: 204 - return false; - } else { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); // L: 205 - if (var1 == 0) { // L: 206 - Bounds.Widget_loadedInterfaces[var0] = true; // L: 207 - return true; // L: 208 - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { // L: 210 - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } + static int method518(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 2822 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 2823 + return 1; // L: 2824 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 2826 + MilliClock.Interpreter_intStackSize -= 3; // L: 2827 + Client.publicChatMode = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2828 + class39.privateChatMode = MouseRecorder.method1287(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 2829 + if (class39.privateChatMode == null) { // L: 2830 + class39.privateChatMode = PrivateChatMode.field3824; + } - for (int var2 = 0; var2 < var1; ++var2) { // L: 211 - if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 212 - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); // L: 213 - if (var3 != null) { // L: 214 - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 215 - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 216 - if (var3[0] == -1) { // L: 217 - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 218 - } + Client.tradeChatMode = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 2831 + PacketBufferNode var18 = class4.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); // L: 2833 + var18.packetBuffer.writeByte(Client.publicChatMode); // L: 2834 + var18.packetBuffer.writeByte(class39.privateChatMode.field3825); // L: 2835 + var18.packetBuffer.writeByte(Client.tradeChatMode); // L: 2836 + Client.packetWriter.addNode(var18); // L: 2837 + return 1; // L: 2838 + } else { + String var3; + int var11; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 2840 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2841 + MilliClock.Interpreter_intStackSize -= 2; // L: 2842 + var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2843 + int var12 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2844 + PacketBufferNode var13 = class4.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); // L: 2846 + var13.packetBuffer.writeByte(SpriteMask.stringCp1252NullTerminatedByteSize(var3) + 2); // L: 2847 + var13.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 2848 + var13.packetBuffer.writeByte(var11 - 1); // L: 2849 + var13.packetBuffer.writeByte(var12); // L: 2850 + Client.packetWriter.addNode(var13); // L: 2851 + return 1; // L: 2852 + } else { + int var10; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 2854 + MilliClock.Interpreter_intStackSize -= 2; // L: 2855 + var10 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 2856 + var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 2857 + Message var16 = class4.Messages_getByChannelAndID(var10, var11); // L: 2858 + if (var16 != null) { // L: 2859 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var16.count; // L: 2860 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var16.cycle; // L: 2861 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; // L: 2862 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; // L: 2863 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; // L: 2864 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); // L: 2865 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 2868 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2869 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2870 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2871 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2872 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2873 + } + + return 1; // L: 2875 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 2877 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2878 + Message var14 = class89.Messages_getMessage(var10); // L: 2879 + if (var14 != null) { // L: 2880 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var14.type; // L: 2881 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var14.cycle; // L: 2882 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var14.sender != null ? var14.sender : ""; // L: 2883 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var14.prefix != null ? var14.prefix : ""; // L: 2884 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var14.text != null ? var14.text : ""; // L: 2885 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var14.isFromFriend() ? 1 : (var14.isFromIgnored() ? 2 : 0); // L: 2886 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 2889 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2890 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2891 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2892 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = ""; // L: 2893 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 2894 + } + + return 1; // L: 2896 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 2898 + if (class39.privateChatMode == null) { // L: 2899 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = class39.privateChatMode.field3825; // L: 2900 + } + + return 1; // L: 2901 + } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 2903 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 2904 + var11 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2905 + String var15 = var3.toLowerCase(); // L: 2906 + byte var17 = 0; // L: 2907 + if (var15.startsWith("yellow:")) { // L: 2908 + var17 = 0; // L: 2909 + var3 = var3.substring("yellow:".length()); // L: 2910 + } else if (var15.startsWith("red:")) { // L: 2912 + var17 = 1; // L: 2913 + var3 = var3.substring("red:".length()); // L: 2914 + } else if (var15.startsWith("green:")) { // L: 2916 + var17 = 2; // L: 2917 + var3 = var3.substring("green:".length()); // L: 2918 + } else if (var15.startsWith("cyan:")) { // L: 2920 + var17 = 3; // L: 2921 + var3 = var3.substring("cyan:".length()); // L: 2922 + } else if (var15.startsWith("purple:")) { // L: 2924 + var17 = 4; // L: 2925 + var3 = var3.substring("purple:".length()); // L: 2926 + } else if (var15.startsWith("white:")) { // L: 2928 + var17 = 5; // L: 2929 + var3 = var3.substring("white:".length()); // L: 2930 + } else if (var15.startsWith("flash1:")) { // L: 2932 + var17 = 6; // L: 2933 + var3 = var3.substring("flash1:".length()); // L: 2934 + } else if (var15.startsWith("flash2:")) { // L: 2936 + var17 = 7; // L: 2937 + var3 = var3.substring("flash2:".length()); // L: 2938 + } else if (var15.startsWith("flash3:")) { // L: 2940 + var17 = 8; // L: 2941 + var3 = var3.substring("flash3:".length()); // L: 2942 + } else if (var15.startsWith("glow1:")) { // L: 2944 + var17 = 9; // L: 2945 + var3 = var3.substring("glow1:".length()); // L: 2946 + } else if (var15.startsWith("glow2:")) { // L: 2948 + var17 = 10; // L: 2949 + var3 = var3.substring("glow2:".length()); // L: 2950 + } else if (var15.startsWith("glow3:")) { // L: 2952 + var17 = 11; // L: 2953 + var3 = var3.substring("glow3:".length()); // L: 2954 + } else if (FontName.clientLanguage != Language.Language_EN) { // L: 2956 + if (var15.startsWith("yellow:")) { // L: 2957 + var17 = 0; // L: 2958 + var3 = var3.substring("yellow:".length()); // L: 2959 + } else if (var15.startsWith("red:")) { // L: 2961 + var17 = 1; // L: 2962 + var3 = var3.substring("red:".length()); // L: 2963 + } else if (var15.startsWith("green:")) { // L: 2965 + var17 = 2; // L: 2966 + var3 = var3.substring("green:".length()); // L: 2967 + } else if (var15.startsWith("cyan:")) { // L: 2969 + var17 = 3; // L: 2970 + var3 = var3.substring("cyan:".length()); // L: 2971 + } else if (var15.startsWith("purple:")) { // L: 2973 + var17 = 4; // L: 2974 + var3 = var3.substring("purple:".length()); // L: 2975 + } else if (var15.startsWith("white:")) { // L: 2977 + var17 = 5; // L: 2978 + var3 = var3.substring("white:".length()); // L: 2979 + } else if (var15.startsWith("flash1:")) { // L: 2981 + var17 = 6; // L: 2982 + var3 = var3.substring("flash1:".length()); // L: 2983 + } else if (var15.startsWith("flash2:")) { // L: 2985 + var17 = 7; // L: 2986 + var3 = var3.substring("flash2:".length()); // L: 2987 + } else if (var15.startsWith("flash3:")) { // L: 2989 + var17 = 8; // L: 2990 + var3 = var3.substring("flash3:".length()); // L: 2991 + } else if (var15.startsWith("glow1:")) { // L: 2993 + var17 = 9; // L: 2994 + var3 = var3.substring("glow1:".length()); // L: 2995 + } else if (var15.startsWith("glow2:")) { // L: 2997 + var17 = 10; // L: 2998 + var3 = var3.substring("glow2:".length()); // L: 2999 + } else if (var15.startsWith("glow3:")) { // L: 3001 + var17 = 11; // L: 3002 + var3 = var3.substring("glow3:".length()); // L: 3003 } } + + var15 = var3.toLowerCase(); // L: 3006 + byte var7 = 0; // L: 3007 + if (var15.startsWith("wave:")) { // L: 3008 + var7 = 1; // L: 3009 + var3 = var3.substring("wave:".length()); // L: 3010 + } else if (var15.startsWith("wave2:")) { // L: 3012 + var7 = 2; // L: 3013 + var3 = var3.substring("wave2:".length()); // L: 3014 + } else if (var15.startsWith("shake:")) { // L: 3016 + var7 = 3; // L: 3017 + var3 = var3.substring("shake:".length()); // L: 3018 + } else if (var15.startsWith("scroll:")) { // L: 3020 + var7 = 4; // L: 3021 + var3 = var3.substring("scroll:".length()); // L: 3022 + } else if (var15.startsWith("slide:")) { // L: 3024 + var7 = 5; // L: 3025 + var3 = var3.substring("slide:".length()); // L: 3026 + } else if (Language.Language_EN != FontName.clientLanguage) { // L: 3028 + if (var15.startsWith("wave:")) { // L: 3029 + var7 = 1; // L: 3030 + var3 = var3.substring("wave:".length()); // L: 3031 + } else if (var15.startsWith("wave2:")) { // L: 3033 + var7 = 2; // L: 3034 + var3 = var3.substring("wave2:".length()); // L: 3035 + } else if (var15.startsWith("shake:")) { // L: 3037 + var7 = 3; // L: 3038 + var3 = var3.substring("shake:".length()); // L: 3039 + } else if (var15.startsWith("scroll:")) { // L: 3041 + var7 = 4; // L: 3042 + var3 = var3.substring("scroll:".length()); // L: 3043 + } else if (var15.startsWith("slide:")) { // L: 3045 + var7 = 5; // L: 3046 + var3 = var3.substring("slide:".length()); // L: 3047 + } + } + + PacketBufferNode var8 = class4.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); // L: 3051 + var8.packetBuffer.writeByte(0); // L: 3052 + int var9 = var8.packetBuffer.offset; // L: 3053 + var8.packetBuffer.writeByte(var11); // L: 3054 + var8.packetBuffer.writeByte(var17); // L: 3055 + var8.packetBuffer.writeByte(var7); // L: 3056 + WorldMapData_0.method269(var8.packetBuffer, var3); // L: 3057 + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); // L: 3058 + Client.packetWriter.addNode(var8); // L: 3059 + return 1; // L: 3060 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3062 + UrlRequester.Interpreter_stringStackSize -= 2; // L: 3063 + var3 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize]; // L: 3064 + String var4 = Interpreter.Interpreter_stringStack[UrlRequester.Interpreter_stringStackSize + 1]; // L: 3065 + PacketBufferNode var5 = class4.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); // L: 3067 + var5.packetBuffer.writeShort(0); // L: 3068 + int var6 = var5.packetBuffer.offset; // L: 3069 + var5.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 3070 + WorldMapData_0.method269(var5.packetBuffer, var4); // L: 3071 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); // L: 3072 + Client.packetWriter.addNode(var5); // L: 3073 + return 1; // L: 3074 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3076 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3083 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3084 + return 1; // L: 3085 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3087 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3088 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = class2.Messages_getHistorySize(var10); // L: 3089 + return 1; // L: 3090 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3092 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3093 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = SoundSystem.Messages_getNextChatID(var10); // L: 3094 + return 1; // L: 3095 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3097 + var10 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3098 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = class90.Messages_getLastChatID(var10); // L: 3099 + return 1; // L: 3100 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3102 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 3103 + class308.doCheat(var3); // L: 3104 + return 1; // L: 3105 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3107 + Client.field710 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3108 + return 1; // L: 3109 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3111 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = Client.field710; // L: 3112 + return 1; // L: 3113 + } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3115 + var3 = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 3116 + System.out.println(var3); // L: 3117 + return 1; // L: 3118 + } else { + return 2; // L: 3120 + } + } else { + if (PlayerType.localPlayer != null && PlayerType.localPlayer.username != null) { // L: 3078 + var3 = PlayerType.localPlayer.username.getName(); + } else { + var3 = ""; // L: 3079 + } + + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3; // L: 3080 + return 1; // L: 3081 } - - Bounds.Widget_loadedInterfaces[var0] = true; // L: 222 - return true; // L: 223 } } } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2072659501" - ) - static void method493(int var0, int var1) { - int var2 = class4.fontBold12.stringWidth("Choose Option"); // L: 7209 - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7210 - Font var7 = class4.fontBold12; // L: 7211 - String var8; - if (var3 < 0) { // L: 7214 - var8 = ""; // L: 7215 - } else if (Client.menuTargets[var3].length() > 0) { // L: 7218 - var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var8 = Client.menuActions[var3]; // L: 7219 - } - - int var6 = var7.stringWidth(var8); // L: 7221 - if (var6 > var2) { // L: 7222 - var2 = var6; - } - } - - var2 += 8; // L: 7224 - var3 = Client.menuOptionsCount * 15 + 22; // L: 7225 - int var4 = var0 - var2 / 2; // L: 7226 - if (var2 + var4 > FloorDecoration.canvasWidth) { // L: 7227 - var4 = FloorDecoration.canvasWidth - var2; - } - - if (var4 < 0) { // L: 7228 - var4 = 0; - } - - int var5 = var1; // L: 7229 - if (var3 + var1 > GameShell.canvasHeight) { // L: 7230 - var5 = GameShell.canvasHeight - var3; - } - - if (var5 < 0) { // L: 7231 - var5 = 0; - } - - ChatChannel.menuX = var4; // L: 7232 - Client.menuY = var5; // L: 7233 - DevicePcmPlayerProvider.menuWidth = var2; // L: 7234 - WorldMapManager.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7235 - } // L: 7236 - - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "(IIIB)Lbq;", - garbageValue = "-81" - ) - static final InterfaceParent method494(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 10486 - var3.group = var1; // L: 10487 - var3.type = var2; // L: 10488 - Client.interfaceParents.put(var3, (long)var0); // L: 10489 - PacketWriter.Widget_resetModelFrames(var1); // L: 10490 - Widget var4 = TileItem.getWidget(var0); // L: 10491 - class52.invalidateWidget(var4); // L: 10492 - if (Client.meslayerContinueWidget != null) { // L: 10493 - class52.invalidateWidget(Client.meslayerContinueWidget); // L: 10494 - Client.meslayerContinueWidget = null; // L: 10495 - } - - class2.method24(); // L: 10497 - class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 10498 - class235.runWidgetOnLoadListener(var1); // L: 10499 - if (Client.rootInterface != -1) { // L: 10500 - ClientPacket.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; // L: 10501 - } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index e49eb2e268..4e24db81f4 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -1,17 +1,23 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fx") +@ObfuscatedName("fw") +@Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("size") final int size; Wrapper(int var1) { this.size = var1; // L: 9 } // L: 10 - @ObfuscatedName("z") + @ObfuscatedName("f") + @Export("get") abstract Object get(); - @ObfuscatedName("k") + @ObfuscatedName("b") + @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index fc28a2018f..5268db926f 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("z") +@ObfuscatedName("f") public interface class0 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkf;B)V", - garbageValue = "21" + descriptor = "(Ljava/lang/Object;Lkb;I)V", + garbageValue = "192866787" ) - void vmethod70(Object var1, Buffer var2); + void vmethod69(Object var1, Buffer var2); - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-453860591" + descriptor = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1094020977" ) - Object vmethod61(Buffer var1); + Object vmethod72(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 0921a716b4..22c1cfe3bc 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,301 +1,754 @@ +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("k") +@ObfuscatedName("b") final class class1 implements class0 { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lic;" + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -115998375 ) - public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("m") + static int field3; + @ObfuscatedName("x") + static int[] field1; + @ObfuscatedName("eq") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Lid;" ) - static SoundSystem soundSystem; + @Export("archive15") + static Archive archive15; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkf;B)V", - garbageValue = "21" + descriptor = "(Ljava/lang/Object;Lkb;I)V", + garbageValue = "192866787" ) - public void vmethod70(Object var1, Buffer var2) { - this.method10((Integer)var1, var2); // L: 20 + public void vmethod69(Object var1, Buffer var2) { + this.method9((Integer)var1, var2); // L: 20 } // L: 21 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-453860591" + descriptor = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1094020977" ) - public Object vmethod61(Buffer var1) { + public Object vmethod72(Buffer var1) { return var1.readInt(); // L: 16 } - @ObfuscatedName("m") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lkf;I)V", - garbageValue = "-1705916618" + descriptor = "(Ljava/lang/Integer;Lkb;B)V", + garbageValue = "0" ) - void method10(Integer var1, Buffer var2) { + void method9(Integer var1, Buffer var2) { var2.writeInt(var1); // L: 12 } // L: 13 - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-1453115535" - ) - static int method22(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 732 - var0 -= 1000; // L: 733 - var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 734 - } else { - var3 = var2 ? Canvas.field438 : class3.field12; // L: 736 - } - - class52.invalidateWidget(var3); // L: 737 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 738 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 758 - var3.modelType = 2; // L: 759 - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 760 - return 1; // L: 761 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 763 - var3.modelType = 3; // L: 764 - var3.modelId = WorldMapLabelSize.localPlayer.appearance.getChatHeadId(); // L: 765 - return 1; // L: 766 - } else { - return 2; // L: 768 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 739 - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 740 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 741 - var3.itemId = var4; // L: 742 - var3.itemQuantity = var5; // L: 743 - ItemDefinition var6 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var4); // L: 744 - var3.modelAngleX = var6.xan2d; // L: 745 - var3.modelAngleY = var6.yan2d; // L: 746 - var3.modelAngleZ = var6.zan2d; // L: 747 - var3.modelOffsetX = var6.offsetX2d; // L: 748 - var3.modelOffsetY = var6.offsetY2d; // L: 749 - var3.modelZoom = var6.zoom2d; // L: 750 - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { - var3.itemQuantityMode = 0; // L: 751 - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 752 - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; // L: 753 - } - - if (var3.field2728 > 0) { // L: 754 - var3.modelZoom = var3.modelZoom * 32 / var3.field2728; - } else if (var3.rawWidth > 0) { // L: 755 - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; // L: 756 - } + @ObfuscatedName("f") + static boolean method8(long var0) { + return KeyHandler.Entity_unpackSceneX(var0) == 2; // L: 44 } - @ObfuscatedName("m") + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IIIZIZI)V", + garbageValue = "1800966997" + ) + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { // L: 177 + int var6 = (var0 + var1) / 2; // L: 178 + int var7 = var0; // L: 179 + World var8 = DefaultsGroup.World_worlds[var6]; // L: 180 + DefaultsGroup.World_worlds[var6] = DefaultsGroup.World_worlds[var1]; // L: 181 + DefaultsGroup.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + if (WorldMapIcon_1.method395(DefaultsGroup.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 + World var10 = DefaultsGroup.World_worlds[var9]; // L: 185 + DefaultsGroup.World_worlds[var9] = DefaultsGroup.World_worlds[var7]; // L: 186 + DefaultsGroup.World_worlds[var7++] = var10; // L: 187 + } + } + + DefaultsGroup.World_worlds[var1] = DefaultsGroup.World_worlds[var7]; // L: 191 + DefaultsGroup.World_worlds[var7] = var8; // L: 192 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 + } + + } // L: 196 + + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(CI)Z", - garbageValue = "2143002774" + garbageValue = "-1463898709" ) + @Export("isDigit") public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 146 + return var0 >= '0' && var0 <= '9'; // L: 147 } - @ObfuscatedName("ie") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lhq;III)V", - garbageValue = "362928511" + descriptor = "(IIB)I", + garbageValue = "6" ) - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 9454 - StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 9455 - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 9458 - var3 = SpriteMask.Widget_getSpellActionName(var0); // L: 9459 - if (var3 != null) { // L: 9460 - StructDefinition.insertMenuItemNoShift(var3, WorldMapAreaData.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 9461 + static final int method20(int var0, int var1) { + if (var0 == -2) { // L: 477 + return 12345678; + } else if (var0 == -1) { // L: 478 + if (var1 < 2) { + var1 = 2; // L: 479 + } else if (var1 > 126) { // L: 480 + var1 = 126; } + + return var1; // L: 481 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 483 + if (var1 < 2) { // L: 484 + var1 = 2; + } else if (var1 > 126) { // L: 485 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 486 } + } - if (var0.buttonType == 3) { // L: 9465 - StructDefinition.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 9466 - } + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(Lcs;IIIIII)V", + garbageValue = "-1076468107" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4930 + if (var0 instanceof NPC) { // L: 4931 + NPCDefinition var6 = ((NPC)var0).definition; // L: 4932 + if (var6.transforms != null) { // L: 4933 + var6 = var6.transform(); + } - if (var0.buttonType == 4) { // L: 9469 - StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 9470 - } + if (var6 == null) { // L: 4934 + return; + } + } - if (var0.buttonType == 5) { // L: 9473 - StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 9474 - } + int var76 = Players.Players_count; // L: 4936 + int[] var7 = Players.Players_indices; // L: 4937 + byte var8 = 0; // L: 4938 + Player var10; + int var12; + if (var1 < var76 && var0.playerCycle == Client.cycle) { // L: 4939 + var10 = (Player)var0; // L: 4941 + boolean var9; + if (Client.drawPlayerNames == 0) { // L: 4943 + var9 = false; // L: 4944 + } else if (var10 == PlayerType.localPlayer) { // L: 4947 + var9 = WorldMapAreaData.method786(); // L: 4950 + } else { + var9 = WorldMapSection1.method681() || class2.method28() && var10.isFriend() || Widget.method4239() && var10.isClanMember(); // L: 4948 + } - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 9477 - StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 9478 - } + if (var9) { // L: 4952 + Player var11 = (Player)var0; // L: 4953 + if (var1 < var76) { // L: 4954 + var12 = var0.defaultHeight + 15; // L: 4955 + class13.worldToScreen(var0.x, var0.y, var12); // L: 4957 + AbstractFont var13 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4959 + byte var14 = 9; // L: 4960 + var13.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var14, 16777215, 0); // L: 4961 + var8 = 18; // L: 4962 + } + } + } - int var4; - int var19; - if (var0.type == 2) { // L: 9481 - var19 = 0; // L: 9482 + int var88 = -2; // L: 4966 + int var17; + int var23; + int var24; + int var77; + if (!var0.healthBars.method4990()) { // L: 4967 + var77 = var0.defaultHeight + 15; // L: 4968 + class13.worldToScreen(var0.x, var0.y, var77); // L: 4970 - for (var4 = 0; var4 < var0.height; ++var4) { // L: 9483 - for (int var21 = 0; var21 < var0.width; ++var21) { // L: 9484 - int var6 = (var0.paddingX + 32) * var21; // L: 9485 - int var7 = (var0.paddingY + 32) * var4; // L: 9486 - if (var19 < 20) { // L: 9487 - var6 += var0.inventoryXOffsets[var19]; // L: 9488 - var7 += var0.inventoryYOffsets[var19]; // L: 9489 + for (HealthBar var90 = (HealthBar)var0.healthBars.last(); var90 != null; var90 = (HealthBar)var0.healthBars.previous()) { // L: 4972 + HealthBarUpdate var80 = var90.get(Client.cycle); // L: 4973 + if (var80 == null) { // L: 4974 + if (var90.isEmpty()) { // L: 5032 + var90.remove(); + } + } else { + HealthBarDefinition var91 = var90.definition; // L: 4975 + Sprite var81 = var91.getBackSprite(); // L: 4976 + Sprite var82 = var91.getFrontSprite(); // L: 4977 + var17 = 0; // L: 4979 + int var83; + if (var81 != null && var82 != null) { // L: 4980 + if (var91.widthPadding * 2 < var82.subWidth) { // L: 4981 + var17 = var91.widthPadding; + } + + var83 = var82.subWidth - var17 * 2; // L: 4982 + } else { + var83 = var91.width; // L: 4984 + } + + int var18 = 255; // L: 4985 + boolean var84 = true; // L: 4986 + int var85 = Client.cycle - var80.cycle; // L: 4987 + int var86 = var83 * var80.health2 / var91.width; // L: 4988 + int var87; + int var95; + if (var80.cycleOffset > var85) { // L: 4989 + var87 = var91.field3314 == 0 ? 0 : var91.field3314 * (var85 / var91.field3314); // L: 4990 + var23 = var83 * var80.health / var91.width; // L: 4991 + var95 = var87 * (var86 - var23) / var80.cycleOffset + var23; // L: 4992 + } else { + var95 = var86; // L: 4995 + var87 = var91.int5 + var80.cycleOffset - var85; // L: 4996 + if (var91.int3 >= 0) { // L: 4997 + var18 = (var87 << 8) / (var91.int5 - var91.int3); + } + } + + if (var80.health2 > 0 && var95 < 1) { // L: 4999 + var95 = 1; + } + + if (var81 != null && var82 != null) { // L: 5000 + if (var83 == var95) { // L: 5001 + var95 += var17 * 2; + } else { + var95 += var17; // L: 5002 + } + + var87 = var81.subHeight; // L: 5003 + var88 += var87; // L: 5004 + var23 = var2 + Client.viewportTempX - (var83 >> 1); // L: 5005 + var24 = var3 + Client.viewportTempY - var88; // L: 5006 + var23 -= var17; // L: 5007 + if (var18 >= 0 && var18 < 255) { // L: 5008 + var81.drawTransAt(var23, var24, var18); // L: 5009 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var95, var87 + var24); // L: 5010 + var82.drawTransAt(var23, var24, var18); // L: 5011 + } else { + var81.drawTransBgAt(var23, var24); // L: 5014 + Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var95, var24 + var87); // L: 5015 + var82.drawTransBgAt(var23, var24); // L: 5016 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 5018 + var88 += 2; // L: 5019 + } else { + var88 += 5; // L: 5022 + if (Client.viewportTempX > -1) { // L: 5023 + var87 = var2 + Client.viewportTempX - (var83 >> 1); // L: 5024 + var23 = var3 + Client.viewportTempY - var88; // L: 5025 + Rasterizer2D.Rasterizer2D_fillRectangle(var87, var23, var95, 5, 65280); // L: 5026 + Rasterizer2D.Rasterizer2D_fillRectangle(var87 + var95, var23, var83 - var95, 5, 16711680); // L: 5027 + } + + var88 += 2; // L: 5029 + } + } + } + } + + if (var88 == -2) { // L: 5035 + var88 += 7; + } + + var88 += var8; // L: 5036 + int var78; + if (var1 < var76) { // L: 5037 + var10 = (Player)var0; // L: 5038 + if (var10.isHidden) { // L: 5039 + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 5040 + var78 = var0.defaultHeight + 15; // L: 5041 + class13.worldToScreen(var0.x, var0.y, var78); // L: 5043 + if (Client.viewportTempX > -1) { // L: 5045 + if (var10.headIconPk != -1) { // L: 5046 + var88 += 25; // L: 5047 + World.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var88); // L: 5048 + } + + if (var10.headIconPrayer != -1) { // L: 5050 + var88 += 25; // L: 5051 + TaskHandler.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var88); // L: 5052 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 5056 + var78 = var0.defaultHeight + 15; // L: 5057 + class13.worldToScreen(var0.x, var0.y, var78); // L: 5059 + if (Client.viewportTempX > -1) { // L: 5061 + var88 += class337.headIconHintSprites[1].subHeight; // L: 5062 + class337.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var88); // L: 5063 + } + } + } else { + NPCDefinition var89 = ((NPC)var0).definition; // L: 5068 + if (var89.transforms != null) { // L: 5069 + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < TaskHandler.headIconPrayerSprites.length) { // L: 5070 + var78 = var0.defaultHeight + 15; // L: 5071 + class13.worldToScreen(var0.x, var0.y, var78); // L: 5073 + if (Client.viewportTempX > -1) { // L: 5075 + TaskHandler.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5076 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5079 + var78 = var0.defaultHeight + 15; // L: 5080 + class13.worldToScreen(var0.x, var0.y, var78); // L: 5082 + if (Client.viewportTempX > -1) { // L: 5084 + class337.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var76 || !var0.field974 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5087 5088 + var77 = var0.defaultHeight; // L: 5089 + class13.worldToScreen(var0.x, var0.y, var77); // L: 5091 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5093 + Client.overheadTextXOffsets[Client.overheadTextCount] = ReflectionCheck.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5094 + Client.overheadTextAscents[Client.overheadTextCount] = ReflectionCheck.fontBold12.ascent; // L: 5095 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5096 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5097 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5098 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5099 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5100 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5101 + ++Client.overheadTextCount; // L: 5102 + } + } + + for (var77 = 0; var77 < 4; ++var77) { // L: 5106 + var78 = var0.hitSplatCycles[var77]; // L: 5107 + var12 = var0.hitSplatTypes[var77]; // L: 5108 + HitSplatDefinition var92 = null; // L: 5109 + int var93 = 0; // L: 5110 + if (var12 >= 0) { // L: 5111 + if (var78 <= Client.cycle) { // L: 5112 + continue; } - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 9491 - Client.dragItemSlotDestination = var19; // L: 9492 - VerticalAlignment.hoveredItemContainer = var0; // L: 9493 - if (var0.itemIds[var19] > 0) { // L: 9494 - label313: { - ItemDefinition var8 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var0.itemIds[var19] - 1); // L: 9495 - boolean var9; - int var10; - if (Client.isItemSelected == 1) { // L: 9497 - var10 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9499 - var9 = (var10 >> 30 & 1) != 0; // L: 9501 - if (var9) { // L: 9503 - if (var0.id != class105.selectedItemWidget || var19 != GrandExchangeOfferUnitPriceComparator.selectedItemSlot) { // L: 9504 - StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); // L: 9505 - } - break label313; + var92 = class258.method4654(var0.hitSplatTypes[var77]); // L: 5113 + var93 = var92.field3370; // L: 5114 + if (var92 != null && var92.transforms != null) { // L: 5115 + var92 = var92.transform(); // L: 5116 + if (var92 == null) { // L: 5117 + var0.hitSplatCycles[var77] = -1; // L: 5118 + continue; // L: 5119 + } + } + } else if (var78 < 0) { // L: 5123 + continue; + } + + int var15 = var0.hitSplatTypes2[var77]; // L: 5124 + HitSplatDefinition var16 = null; // L: 5125 + if (var15 >= 0) { // L: 5126 + var16 = class258.method4654(var15); // L: 5127 + if (var16 != null && var16.transforms != null) { // L: 5128 + var16 = var16.transform(); + } + } + + if (var78 - var93 <= Client.cycle) { // L: 5130 + if (var92 == null) { // L: 5131 + var0.hitSplatCycles[var77] = -1; // L: 5132 + } else { + var17 = var0.defaultHeight / 2; // L: 5135 + class13.worldToScreen(var0.x, var0.y, var17); // L: 5137 + if (Client.viewportTempX > -1) { // L: 5139 + if (var77 == 1) { // L: 5141 + Client.viewportTempY -= 20; // L: 5142 + } + + if (var77 == 2) { // L: 5144 + Client.viewportTempX -= 15; // L: 5145 + Client.viewportTempY -= 10; // L: 5146 + } + + if (var77 == 3) { // L: 5148 + Client.viewportTempX += 15; // L: 5149 + Client.viewportTempY -= 10; // L: 5150 + } + + Sprite var19 = null; // L: 5152 + Sprite var20 = null; // L: 5153 + Sprite var21 = null; // L: 5154 + Sprite var22 = null; // L: 5155 + var23 = 0; // L: 5156 + var24 = 0; // L: 5157 + int var25 = 0; // L: 5158 + int var26 = 0; // L: 5159 + int var27 = 0; // L: 5160 + int var28 = 0; // L: 5161 + int var29 = 0; // L: 5162 + int var30 = 0; // L: 5163 + Sprite var31 = null; // L: 5164 + Sprite var32 = null; // L: 5165 + Sprite var33 = null; // L: 5166 + Sprite var34 = null; // L: 5167 + int var35 = 0; // L: 5168 + int var36 = 0; // L: 5169 + int var37 = 0; // L: 5170 + int var38 = 0; // L: 5171 + int var39 = 0; // L: 5172 + int var40 = 0; // L: 5173 + int var41 = 0; // L: 5174 + int var42 = 0; // L: 5175 + int var43 = 0; // L: 5176 + var19 = var92.method4748(); // L: 5177 + int var44; + if (var19 != null) { // L: 5178 + var23 = var19.subWidth; // L: 5179 + var44 = var19.subHeight; // L: 5180 + if (var44 > var43) { // L: 5181 + var43 = var44; + } + + var27 = var19.xOffset; // L: 5182 + } + + var20 = var92.method4733(); // L: 5184 + if (var20 != null) { // L: 5185 + var24 = var20.subWidth; // L: 5186 + var44 = var20.subHeight; // L: 5187 + if (var44 > var43) { // L: 5188 + var43 = var44; + } + + var28 = var20.xOffset; // L: 5189 + } + + var21 = var92.method4731(); // L: 5191 + if (var21 != null) { // L: 5192 + var25 = var21.subWidth; // L: 5193 + var44 = var21.subHeight; // L: 5194 + if (var44 > var43) { // L: 5195 + var43 = var44; + } + + var29 = var21.xOffset; // L: 5196 + } + + var22 = var92.method4727(); // L: 5198 + if (var22 != null) { // L: 5199 + var26 = var22.subWidth; // L: 5200 + var44 = var22.subHeight; // L: 5201 + if (var44 > var43) { // L: 5202 + var43 = var44; + } + + var30 = var22.xOffset; // L: 5203 + } + + if (var16 != null) { // L: 5205 + var31 = var16.method4748(); // L: 5206 + if (var31 != null) { // L: 5207 + var35 = var31.subWidth; // L: 5208 + var44 = var31.subHeight; // L: 5209 + if (var44 > var43) { // L: 5210 + var43 = var44; + } + + var39 = var31.xOffset; // L: 5211 + } + + var32 = var16.method4733(); // L: 5213 + if (var32 != null) { // L: 5214 + var36 = var32.subWidth; // L: 5215 + var44 = var32.subHeight; // L: 5216 + if (var44 > var43) { // L: 5217 + var43 = var44; + } + + var40 = var32.xOffset; // L: 5218 + } + + var33 = var16.method4731(); // L: 5220 + if (var33 != null) { // L: 5221 + var37 = var33.subWidth; // L: 5222 + var44 = var33.subHeight; // L: 5223 + if (var44 > var43) { // L: 5224 + var43 = var44; + } + + var41 = var33.xOffset; // L: 5225 + } + + var34 = var16.method4727(); // L: 5227 + if (var34 != null) { // L: 5228 + var38 = var34.subWidth; // L: 5229 + var44 = var34.subHeight; // L: 5230 + if (var44 > var43) { // L: 5231 + var43 = var44; + } + + var42 = var34.xOffset; // L: 5232 + } + } + + Font var79 = var92.getFont(); // L: 5237 + if (var79 == null) { // L: 5238 + var79 = DevicePcmPlayerProvider.fontPlain11; + } + + Font var45; + if (var16 != null) { // L: 5239 + var45 = var16.getFont(); // L: 5240 + if (var45 == null) { // L: 5241 + var45 = DevicePcmPlayerProvider.fontPlain11; + } + } else { + var45 = DevicePcmPlayerProvider.fontPlain11; // L: 5243 + } + + String var46 = null; // L: 5244 + String var47 = null; // L: 5245 + boolean var48 = false; // L: 5246 + int var49 = 0; // L: 5247 + var46 = var92.getString(var0.hitSplatValues[var77]); // L: 5248 + int var94 = var79.stringWidth(var46); // L: 5249 + if (var16 != null) { // L: 5250 + var47 = var16.getString(var0.hitSplatValues2[var77]); // L: 5251 + var49 = var45.stringWidth(var47); // L: 5252 + } + + int var50 = 0; // L: 5254 + int var51 = 0; // L: 5255 + if (var24 > 0) { // L: 5256 + if (var21 == null && var22 == null) { // L: 5257 + var50 = 1; // L: 5258 + } else { + var50 = var94 / var24 + 1; + } + } + + if (var16 != null && var36 > 0) { // L: 5260 5261 + if (var33 == null && var34 == null) { // L: 5262 + var51 = 1; // L: 5263 + } else { + var51 = var49 / var36 + 1; + } + } + + int var52 = 0; // L: 5266 + int var53 = var52; // L: 5267 + if (var23 > 0) { // L: 5268 + var52 += var23; + } + + var52 += 2; // L: 5269 + int var54 = var52; // L: 5270 + if (var25 > 0) { // L: 5271 + var52 += var25; + } + + int var55 = var52; // L: 5272 + int var56 = var52; // L: 5273 + int var57; + if (var24 > 0) { // L: 5274 + var57 = var24 * var50; // L: 5275 + var52 += var57; // L: 5276 + var56 += (var57 - var94) / 2; // L: 5277 + } else { + var52 += var94; // L: 5280 + } + + var57 = var52; // L: 5282 + if (var26 > 0) { // L: 5283 + var52 += var26; + } + + int var58 = 0; // L: 5284 + int var59 = 0; // L: 5285 + int var60 = 0; // L: 5286 + int var61 = 0; // L: 5287 + int var62 = 0; // L: 5288 + int var63; + if (var16 != null) { // L: 5289 + var52 += 2; // L: 5290 + var58 = var52; // L: 5291 + if (var35 > 0) { // L: 5292 + var52 += var35; + } + + var52 += 2; // L: 5293 + var59 = var52; // L: 5294 + if (var37 > 0) { // L: 5295 + var52 += var37; + } + + var60 = var52; // L: 5296 + var62 = var52; // L: 5297 + if (var36 > 0) { // L: 5298 + var63 = var36 * var51; // L: 5299 + var52 += var63; // L: 5300 + var62 += (var63 - var49) / 2; // L: 5301 + } else { + var52 += var49; // L: 5304 + } + + var61 = var52; // L: 5306 + if (var38 > 0) { // L: 5307 + var52 += var38; + } + } + + var63 = var0.hitSplatCycles[var77] - Client.cycle; // L: 5309 + int var64 = var92.field3364 - var63 * var92.field3364 / var92.field3370; // L: 5310 + int var65 = var63 * var92.field3365 / var92.field3370 + -var92.field3365; // L: 5311 + int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 5312 + int var67 = var65 + (var3 + Client.viewportTempY - 12); // L: 5313 + int var68 = var67; // L: 5314 + int var69 = var43 + var67; // L: 5315 + int var70 = var67 + var92.field3351 + 15; // L: 5316 + int var71 = var70 - var79.maxAscent; // L: 5317 + int var72 = var70 + var79.maxDescent; // L: 5318 + if (var71 < var67) { // L: 5319 + var68 = var71; + } + + if (var72 > var69) { // L: 5320 + var69 = var72; + } + + int var73 = 0; // L: 5321 + int var74; + int var75; + if (var16 != null) { // L: 5322 + var73 = var67 + var16.field3351 + 15; // L: 5323 + var74 = var73 - var45.maxAscent; // L: 5324 + var75 = var73 + var45.maxDescent; // L: 5325 + if (var74 < var68) { // L: 5326 + ; + } + + if (var75 > var69) { // L: 5327 + ; + } + } + + var74 = 255; // L: 5329 + if (var92.field3366 >= 0) { // L: 5330 + var74 = (var63 << 8) / (var92.field3370 - var92.field3366); + } + + if (var74 >= 0 && var74 < 255) { // L: 5331 + if (var19 != null) { // L: 5332 + var19.drawTransAt(var66 + var53 - var27, var67, var74); + } + + if (var21 != null) { // L: 5333 + var21.drawTransAt(var54 + var66 - var29, var67, var74); + } + + if (var20 != null) { // L: 5334 + for (var75 = 0; var75 < var50; ++var75) { // L: 5335 + var20.drawTransAt(var24 * var75 + (var66 + var55 - var28), var67, var74); // L: 5336 } } - if (Client.isSpellSelected) { // L: 9512 - var10 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9514 - var9 = (var10 >> 30 & 1) != 0; // L: 9516 - if (var9) { // L: 9518 - if ((UserComparator8.selectedSpellFlags & 16) == 16) { // L: 9519 - StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); // L: 9520 - } - break label313; + if (var22 != null) { // L: 5339 + var22.drawTransAt(var66 + var57 - var30, var67, var74); + } + + var79.drawAlpha(var46, var66 + var56, var70, var92.textColor, 0, var74); // L: 5340 + if (var16 != null) { // L: 5341 + if (var31 != null) { // L: 5342 + var31.drawTransAt(var66 + var58 - var39, var67, var74); } - } - String[] var22 = var8.inventoryActions; // L: 9526 - var10 = -1; // L: 9527 - if (Client.shiftClickDrop && SoundSystem.shouldPrioritizeDrop()) { // L: 9528 - var10 = var8.getShiftClickIndex(); // L: 9529 - } - - int var12 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9532 - boolean var11 = (var12 >> 30 & 1) != 0; // L: 9534 - if (var11) { // L: 9536 - for (int var13 = 4; var13 >= 3; --var13) { // L: 9537 - if (var13 != var10) { // L: 9538 - class247.addWidgetItemMenuItem(var0, var8, var19, var13, false); // L: 9539 - } + if (var33 != null) { // L: 5343 + var33.drawTransAt(var66 + var59 - var41, var67, var74); } - } - int var14 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9543 - boolean var23 = (var14 >> 31 & 1) != 0; // L: 9545 - if (var23) { // L: 9547 - StructDefinition.insertMenuItemNoShift("Use", WorldMapAreaData.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); // L: 9548 - } - - int var16 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9552 - boolean var15 = (var16 >> 30 & 1) != 0; // L: 9554 - int var17; - if (var15) { // L: 9556 - for (var17 = 2; var17 >= 0; --var17) { // L: 9557 - if (var17 != var10) { // L: 9558 - class247.addWidgetItemMenuItem(var0, var8, var19, var17, false); // L: 9559 + if (var32 != null) { // L: 5344 + for (var75 = 0; var75 < var51; ++var75) { // L: 5345 + var32.drawTransAt(var75 * var36 + (var60 + var66 - var40), var67, var74); // L: 5346 } } - if (var10 >= 0) { // L: 9561 - class247.addWidgetItemMenuItem(var0, var8, var19, var10, true); // L: 9562 + if (var34 != null) { // L: 5349 + var34.drawTransAt(var66 + var61 - var42, var67, var74); + } + + var45.drawAlpha(var47, var62 + var66, var73, var16.textColor, 0, var74); // L: 5350 + } + } else { + if (var19 != null) { // L: 5354 + var19.drawTransBgAt(var66 + var53 - var27, var67); + } + + if (var21 != null) { // L: 5355 + var21.drawTransBgAt(var66 + var54 - var29, var67); + } + + if (var20 != null) { // L: 5356 + for (var75 = 0; var75 < var50; ++var75) { // L: 5357 + var20.drawTransBgAt(var24 * var75 + (var66 + var55 - var28), var67); // L: 5358 } } - var22 = var0.itemActions; // L: 9565 - if (var22 != null) { // L: 9566 - for (var17 = 4; var17 >= 0; --var17) { // L: 9567 - if (var22[var17] != null) { // L: 9568 - byte var18 = 0; // L: 9569 - if (var17 == 0) { // L: 9570 - var18 = 39; - } + if (var22 != null) { // L: 5361 + var22.drawTransBgAt(var57 + var66 - var30, var67); + } - if (var17 == 1) { // L: 9571 - var18 = 40; - } + var79.draw(var46, var66 + var56, var70, var92.textColor | -16777216, 0); // L: 5362 + if (var16 != null) { // L: 5363 + if (var31 != null) { // L: 5364 + var31.drawTransBgAt(var58 + var66 - var39, var67); + } - if (var17 == 2) { // L: 9572 - var18 = 41; - } + if (var33 != null) { // L: 5365 + var33.drawTransBgAt(var59 + var66 - var41, var67); + } - if (var17 == 3) { // L: 9573 - var18 = 42; - } - - if (var17 == 4) { // L: 9574 - var18 = 43; - } - - StructDefinition.insertMenuItemNoShift(var22[var17], WorldMapAreaData.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); // L: 9575 + if (var32 != null) { // L: 5366 + for (var75 = 0; var75 < var51; ++var75) { // L: 5367 + var32.drawTransBgAt(var75 * var36 + (var66 + var60 - var40), var67); // L: 5368 } } - } - StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); // L: 9580 + if (var34 != null) { // L: 5371 + var34.drawTransBgAt(var66 + var61 - var42, var67); + } + + var45.draw(var47, var66 + var62, var73, var16.textColor | -16777216, 0); // L: 5372 + } } } } - - ++var19; // L: 9586 } } + } + } // L: 5377 - if (var0.isIf3) { // L: 9590 - if (Client.isSpellSelected) { // L: 9591 - var4 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9593 - boolean var24 = (var4 >> 21 & 1) != 0; // L: 9595 - if (var24 && (UserComparator8.selectedSpellFlags & 32) == 32) { // L: 9597 - StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 9598 - } - } else { - for (var19 = 9; var19 >= 5; --var19) { // L: 9603 - String var20 = WorldMapAreaData.method756(var0, var19); // L: 9604 - if (var20 != null) { // L: 9605 - StructDefinition.insertMenuItemNoShift(var20, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); // L: 9606 - } - } - - var3 = SpriteMask.Widget_getSpellActionName(var0); // L: 9610 - if (var3 != null) { // L: 9611 - StructDefinition.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 9612 - } - - for (var4 = 4; var4 >= 0; --var4) { // L: 9615 - String var5 = WorldMapAreaData.method756(var0, var4); // L: 9616 - if (var5 != null) { // L: 9617 - Tiles.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 9618 - } - } - - if (class39.Widget_hasContinueOption(WorldMapIcon_0.getWidgetFlags(var0))) { // L: 9622 - StructDefinition.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 9623 - } - } - } - - } // L: 9628 + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2141272771" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = class4.getPacketBufferNode(ClientPacket.field2329, Client.packetWriter.isaacCipher); // L: 11512 + var0.packetBuffer.writeByte(0); // L: 11513 + Client.packetWriter.addNode(var0); // L: 11514 + } // L: 11515 } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 64f93c3b7a..03d3470f69 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("e") public class class10 { - @ObfuscatedName("z") - final int field55; - @ObfuscatedName("k") - final int field56; - @ObfuscatedName("s") - final String field54; + @ObfuscatedName("f") + final int field48; + @ObfuscatedName("b") + final int field49; + @ObfuscatedName("l") + final String field50; @ObfuscatedSignature( - descriptor = "(Lkf;)V" + descriptor = "(Lkb;)V" ) class10(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 } // L: 20 class10(int var1, int var2, String var3) { - this.field55 = var1; // L: 13 - this.field56 = var2; // L: 14 - this.field54 = var3; // L: 15 + this.field48 = var1; // L: 13 + this.field49 = var2; // L: 14 + this.field50 = var3; // L: 15 } // L: 16 - @ObfuscatedName("z") - String method126() { - return Integer.toHexString(this.field55) + Integer.toHexString(this.field56) + this.field54; // L: 23 + @ObfuscatedName("f") + String method134() { + return Integer.toHexString(this.field48) + Integer.toHexString(this.field49) + this.field50; // L: 23 } - @ObfuscatedName("k") - int method125() { - return this.field56; // L: 27 + @ObfuscatedName("b") + int method135() { + return this.field49; // L: 27 } } diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index 4538d8f456..5a1437d71e 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -1,21 +1,50 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("db") public class class105 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljs;" ) + @Export("reflectionChecks") public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("ix") + @ObfuscatedName("z") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("md") @ObfuscatedGetter( - intValue = 1183836299 + intValue = 998916811 ) - static int selectedItemWidget; + @Export("selectedSpellFlags") + static int selectedSpellFlags; static { reflectionChecks = new IterableNodeDeque(); // L: 17 } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Ljg;", + garbageValue = "-595128316" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35 + if (var1 != null) { // L: 36 + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37 + var1 = new SequenceDefinition(); // L: 38 + if (var2 != null) { // L: 39 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 40 + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 41 + return var1; // L: 42 + } + } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index 0da869e1c1..b63c9cd4af 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("d") +@ObfuscatedName("o") public interface class11 { } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index beff48dab8..9c40914d30 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("h") +@ObfuscatedName("n") public interface class12 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;)Lkf;" + descriptor = "(Lkb;)Lkb;" ) - Buffer vmethod127(Buffer var1); + Buffer vmethod145(Buffer var1); } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 6183871204..d70c1c857f 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,143 +1,389 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("x") public final class class13 { - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-905483159" + descriptor = "Lgv;" ) - static long method134() { - try { - URL var0 = new URL(HealthBarDefinition.method4563("services", false) + "m=accountappeal/login.ws"); // L: 36 - URLConnection var1 = var0.openConnection(); // L: 37 - var1.setRequestProperty("connection", "close"); // L: 38 - var1.setDoInput(true); // L: 39 - var1.setDoOutput(true); // L: 40 - var1.setConnectTimeout(5000); // L: 41 - OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); // L: 42 - var2.write("data1=req"); // L: 43 - var2.flush(); // L: 44 - InputStream var3 = var1.getInputStream(); // L: 45 - Buffer var4 = new Buffer(new byte[1000]); // L: 46 + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("u") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; - do { - int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48 - if (var5 == -1) { // L: 49 - var4.offset = 0; // L: 55 - long var7 = var4.readLong(); // L: 56 - return var7; // L: 57 + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-53" + ) + public static void method150() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 177 + } // L: 178 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lfl;III)Ldh;", + garbageValue = "474300455" + ) + public static final PcmPlayer method146(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.field1442 == 0) { // L: 45 + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { // L: 46 + if (var2 < 256) { // L: 47 + var2 = 256; + } + + try { + PcmPlayer var3 = class69.pcmPlayerProvider.player(); // L: 49 + var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 50 + var3.field1441 = var2; // L: 51 + var3.init(); // L: 52 + var3.capacity = (var2 & -1024) + 1024; // L: 53 + if (var3.capacity > 16384) { // L: 54 + var3.capacity = 16384; } - var4.offset += var5; // L: 50 - } while(var4.offset < 1000); // L: 51 + var3.open(var3.capacity); // L: 55 + if (FontName.field3694 > 0 && WorldMapDecoration.soundSystem == null) { // L: 56 + WorldMapDecoration.soundSystem = new SoundSystem(); // L: 57 + RunException.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 58 + RunException.soundSystemExecutor.scheduleAtFixedRate(WorldMapDecoration.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 59 + } - return 0L; // L: 52 - } catch (Exception var9) { // L: 59 - return 0L; // L: 60 - } - } + if (WorldMapDecoration.soundSystem != null) { // L: 61 + if (WorldMapDecoration.soundSystem.players[var1] != null) { // L: 62 + throw new IllegalArgumentException(); + } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "101" - ) - public static int method129(int var0, int var1) { - return (var0 << 8) + var1; // L: 13 - } + WorldMapDecoration.soundSystem.players[var1] = var3; // L: 63 + } - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "347660061" - ) - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[Huffman.Client_plane][var0][var1]; // L: 6697 - if (var2 == null) { // L: 6698 - ScriptEvent.scene.removeGroundItemPile(Huffman.Client_plane, var0, var1); // L: 6699 + return var3; // L: 65 + } catch (Throwable var4) { // L: 67 + return new PcmPlayer(); // L: 68 + } } else { - long var3 = -99999999L; // L: 6702 - TileItem var5 = null; // L: 6703 - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 6704 6705 6713 - ItemDefinition var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6.id); // L: 6706 - long var11 = (long)var7.price; // L: 6707 - if (var7.isStackable == 1) { // L: 6708 - var11 *= (long)(var6.quantity + 1); - } - - if (var11 > var3) { // L: 6709 - var3 = var11; // L: 6710 - var5 = var6; // L: 6711 - } - } - - if (var5 == null) { // L: 6715 - ScriptEvent.scene.removeGroundItemPile(Huffman.Client_plane, var0, var1); // L: 6716 - } else { - var2.addLast(var5); // L: 6719 - TileItem var13 = null; // L: 6720 - TileItem var8 = null; // L: 6721 - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 6722 6723 6728 - if (var6.id != var5.id) { // L: 6724 - if (var13 == null) { // L: 6725 - var13 = var6; - } - - if (var6.id != var13.id && var8 == null) { // L: 6726 - var8 = var6; - } - } - } - - long var9 = class227.calculateTag(var0, var1, 3, false, 0); // L: 6730 - ScriptEvent.scene.newGroundItemPile(Huffman.Client_plane, var0, var1, ArchiveLoader.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, Huffman.Client_plane), var5, var9, var13, var8); // L: 6731 - } + throw new IllegalArgumentException(); } - } // L: 6700 6717 6732 + } - @ObfuscatedName("jq") + @ObfuscatedName("fe") @ObfuscatedSignature( - descriptor = "(Lhq;IIB)V", - garbageValue = "-96" + descriptor = "(Lcs;IB)V", + garbageValue = "-27" ) - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10145 - if (var0 != null) { // L: 10147 - Widget var4 = ReflectionCheck.method2381(var0); // L: 10150 - if (var4 == null) { // L: 10151 - var4 = var0.parent; - } + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + SequenceDefinition var2; + int var11; + if (var0.field1009 >= Client.cycle) { // L: 3904 + class236.method4265(var0); + } else if (var0.field1024 >= Client.cycle) { // L: 3905 + WorldMapID.method666(var0); + } else { + var0.movementSequence = var0.idleSequence; // L: 3907 + if (var0.pathLength == 0) { // L: 3908 + var0.field978 = 0; // L: 3909 + } else { + label398: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3912 + var2 = class105.SequenceDefinition_get(var0.sequence); // L: 3913 + if (var0.field1034 > 0 && var2.field3549 == 0) { // L: 3914 + ++var0.field978; // L: 3915 + break label398; // L: 3916 + } - if (var4 != null) { // L: 10154 - Client.clickedWidget = var0; // L: 10158 - var4 = ReflectionCheck.method2381(var0); // L: 10161 - if (var4 == null) { // L: 10162 - var4 = var0.parent; + if (var0.field1034 <= 0 && var2.field3550 == 0) { // L: 3918 + ++var0.field978; // L: 3919 + break label398; // L: 3920 + } } - Client.clickedWidgetParent = var4; // L: 10165 - Client.widgetClickX = var1; // L: 10166 - Client.widgetClickY = var2; // L: 10167 - BoundaryObject.widgetDragDuration = 0; // L: 10168 - Client.isDraggingWidget = false; // L: 10169 - int var5 = GrandExchangeOffer.method209(); // L: 10170 - if (var5 != -1) { // L: 10171 - ObjectSound.method1983(var5); + var11 = var0.x; // L: 3923 + int var3 = var0.y; // L: 3924 + int var4 = var0.field1011 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3925 + int var5 = var0.field1011 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3926 + if (var11 < var4) { // L: 3927 + if (var3 < var5) { // L: 3928 + var0.orientation = 1280; + } else if (var3 > var5) { // L: 3929 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 3930 + } + } else if (var11 > var4) { // L: 3932 + if (var3 < var5) { // L: 3933 + var0.orientation = 768; + } else if (var3 > var5) { // L: 3934 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 3935 + } + } else if (var3 < var5) { // L: 3937 + var0.orientation = 1024; + } else if (var3 > var5) { // L: 3938 + var0.orientation = 0; } - return; // L: 10172 + byte var6 = var0.pathTraversed[var0.pathLength - 1]; // L: 3939 + if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3940 + int var7 = var0.orientation - var0.rotation & 2047; // L: 3947 + if (var7 > 1024) { // L: 3948 + var7 -= 2048; + } + + int var8 = var0.walkBackSequence; // L: 3949 + if (var7 >= -256 && var7 <= 256) { // L: 3950 + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { // L: 3951 + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { // L: 3952 + var8 = var0.walkLeftSequence; + } + + if (var8 == -1) { // L: 3953 + var8 = var0.walkSequence; + } + + var0.movementSequence = var8; // L: 3954 + int var9 = 4; // L: 3955 + boolean var10 = true; // L: 3956 + if (var0 instanceof NPC) { // L: 3957 + var10 = ((NPC)var0).definition.isClickable; + } + + if (var10) { // L: 3958 + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1028 != 0) { // L: 3959 + var9 = 2; + } + + if (var0.pathLength > 2) { // L: 3960 + var9 = 6; + } + + if (var0.pathLength > 3) { // L: 3961 + var9 = 8; + } + + if (var0.field978 > 0 && var0.pathLength > 1) { // L: 3962 + var9 = 8; // L: 3963 + --var0.field978; // L: 3964 + } + } else { + if (var0.pathLength > 1) { // L: 3968 + var9 = 6; + } + + if (var0.pathLength > 2) { // L: 3969 + var9 = 8; + } + + if (var0.field978 > 0 && var0.pathLength > 1) { // L: 3970 + var9 = 8; // L: 3971 + --var0.field978; // L: 3972 + } + } + + if (var6 == 2) { // L: 3975 + var9 <<= 1; + } + + if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3976 + var0.movementSequence = var0.runSequence; + } + + if (var4 != var11 || var3 != var5) { // L: 3977 + if (var11 < var4) { // L: 3978 + var0.x += var9; // L: 3979 + if (var0.x > var4) { // L: 3980 + var0.x = var4; + } + } else if (var11 > var4) { // L: 3982 + var0.x -= var9; // L: 3983 + if (var0.x < var4) { // L: 3984 + var0.x = var4; + } + } + + if (var3 < var5) { // L: 3986 + var0.y += var9; // L: 3987 + if (var0.y > var5) { // L: 3988 + var0.y = var5; + } + } else if (var3 > var5) { // L: 3990 + var0.y -= var9; // L: 3991 + if (var0.y < var5) { // L: 3992 + var0.y = var5; + } + } + } + + if (var4 == var0.x && var5 == var0.y) { // L: 3995 + --var0.pathLength; // L: 3996 + if (var0.field1034 > 0) { // L: 3997 + --var0.field1034; + } + } + } else { + var0.x = var4; // L: 3941 + var0.y = var5; // L: 3942 + --var0.pathLength; // L: 3943 + if (var0.field1034 > 0) { // L: 3944 + --var0.field1034; + } + } } } - } - } // L: 10156 + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4000 + var0.sequence = -1; // L: 4001 + var0.spotAnimation = -1; // L: 4002 + var0.field1009 = 0; // L: 4003 + var0.field1024 = 0; // L: 4004 + var0.x = var0.pathX[0] * 128 + var0.field1011 * 64; // L: 4005 + var0.y = var0.field1011 * 64 + var0.pathY[0] * 128; // L: 4006 + var0.method1845(); // L: 4007 + } + + if (PlayerType.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4009 4010 + var0.sequence = -1; // L: 4011 + var0.spotAnimation = -1; // L: 4012 + var0.field1009 = 0; // L: 4013 + var0.field1024 = 0; // L: 4014 + var0.x = var0.pathX[0] * 128 + var0.field1011 * 64; // L: 4015 + var0.y = var0.pathY[0] * 128 + var0.field1011 * 64; // L: 4016 + var0.method1845(); // L: 4017 + } + + GameObject.method3415(var0); // L: 4020 + var0.isWalking = false; // L: 4022 + if (var0.movementSequence != -1) { // L: 4023 + var2 = class105.SequenceDefinition_get(var0.movementSequence); // L: 4024 + if (var2 != null && var2.frameIds != null) { // L: 4025 + ++var0.movementFrameCycle; // L: 4026 + if (var0.movementFrame < var2.frameIds.length && var0.movementFrameCycle > var2.frameLengths[var0.movementFrame]) { // L: 4027 + var0.movementFrameCycle = 1; // L: 4028 + ++var0.movementFrame; // L: 4029 + UserComparator6.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); // L: 4030 + } + + if (var0.movementFrame >= var2.frameIds.length) { // L: 4032 + var0.movementFrameCycle = 0; // L: 4033 + var0.movementFrame = 0; // L: 4034 + UserComparator6.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); // L: 4035 + } + } else { + var0.movementSequence = -1; // L: 4038 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1015) { // L: 4040 + if (var0.spotAnimationFrame < 0) { // L: 4041 + var0.spotAnimationFrame = 0; + } + + var11 = HealthBarUpdate.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4042 + if (var11 != -1) { // L: 4043 + SequenceDefinition var12 = class105.SequenceDefinition_get(var11); // L: 4044 + if (var12 != null && var12.frameIds != null) { // L: 4045 + ++var0.spotAnimationFrameCycle; // L: 4046 + if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { // L: 4047 + var0.spotAnimationFrameCycle = 1; // L: 4048 + ++var0.spotAnimationFrame; // L: 4049 + UserComparator6.addSequenceSoundEffect(var12, var0.spotAnimationFrame, var0.x, var0.y); // L: 4050 + } + + if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) { // L: 4052 4053 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 4056 + } + } else { + var0.spotAnimation = -1; // L: 4058 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4060 + var2 = class105.SequenceDefinition_get(var0.sequence); // L: 4061 + if (var2.field3549 == 1 && var0.field1034 > 0 && var0.field1009 <= Client.cycle && var0.field1024 < Client.cycle) { // L: 4062 4063 + var0.sequenceDelay = 1; // L: 4064 + return; // L: 4091 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4069 + var2 = class105.SequenceDefinition_get(var0.sequence); // L: 4070 + if (var2 != null && var2.frameIds != null) { // L: 4071 + ++var0.sequenceFrameCycle; // L: 4072 + if (var0.sequenceFrame < var2.frameIds.length && var0.sequenceFrameCycle > var2.frameLengths[var0.sequenceFrame]) { // L: 4073 + var0.sequenceFrameCycle = 1; // L: 4074 + ++var0.sequenceFrame; // L: 4075 + UserComparator6.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); // L: 4076 + } + + if (var0.sequenceFrame >= var2.frameIds.length) { // L: 4078 + var0.sequenceFrame -= var2.frameCount; // L: 4079 + ++var0.field1022; // L: 4080 + if (var0.field1022 >= var2.field3547) { // L: 4081 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2.frameIds.length) { // L: 4082 + UserComparator6.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); // L: 4083 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var2.field3544; // L: 4085 + } else { + var0.sequence = -1; // L: 4087 + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; // L: 4089 + } + + } + + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "966303255" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5393 + int var3 = GrandExchangeOfferWorldComparator.getTileHeight(var0, var1, GrandExchangeOfferUnitPriceComparator.Client_plane) - var2; // L: 5398 + var0 -= ItemContainer.cameraX; // L: 5399 + var3 -= ChatChannel.cameraY; // L: 5400 + var1 -= WorldMapManager.cameraZ; // L: 5401 + int var4 = Rasterizer3D.Rasterizer3D_sine[World.cameraPitch]; // L: 5402 + int var5 = Rasterizer3D.Rasterizer3D_cosine[World.cameraPitch]; // L: 5403 + int var6 = Rasterizer3D.Rasterizer3D_sine[ViewportMouse.cameraYaw]; // L: 5404 + int var7 = Rasterizer3D.Rasterizer3D_cosine[ViewportMouse.cameraYaw]; // L: 5405 + int var8 = var0 * var7 + var6 * var1 >> 16; // L: 5406 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 5407 + var0 = var8; // L: 5408 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 5409 + var1 = var3 * var4 + var5 * var1 >> 16; // L: 5410 + if (var1 >= 50) { // L: 5412 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5413 + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5414 + } else { + Client.viewportTempX = -1; // L: 5417 + Client.viewportTempY = -1; // L: 5418 + } + + } else { + Client.viewportTempX = -1; // L: 5394 + Client.viewportTempY = -1; // L: 5395 + } + } // L: 5396 5420 } diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java index 991f157a61..af980e7ccd 100644 --- a/runescape-client/src/main/java/class155.java +++ b/runescape-client/src/main/java/class155.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ea") +@ObfuscatedName("ee") public interface class155 { - @ObfuscatedName("z") - void method3442(Object var1); + @ObfuscatedName("f") + void method3450(Object var1); } diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index 49b8a4d115..f125071cac 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -1,134 +1,133 @@ +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("ff") +@ObfuscatedName("fz") public enum class169 implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfz;" ) - field2045(3, 0), - @ObfuscatedName("k") + field2033(2, 0), + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfz;" ) - field2046(1, 1), - @ObfuscatedName("s") + field2029(0, 1), + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfz;" ) - field2043(2, 2), - @ObfuscatedName("t") + field2028(1, 2), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lff;" + descriptor = "Lfz;" ) - field2044(0, 3); + field2034(3, 3); - @ObfuscatedName("i") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1066802481 + intValue = -1161977131 ) - public final int field2042; - @ObfuscatedName("o") + static int field2035; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1306076667 + intValue = 1105831857 ) + public final int field2032; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1075265281 + ) + @Export("id") final int id; class169(int var3, int var4) { - this.field2042 = var3; // L: 16 + this.field2032 = var3; // L: 16 this.id = var4; // L: 17 } // L: 18 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 21 } - @ObfuscatedName("ag") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-306559930" + descriptor = "(III)V", + garbageValue = "19136995" ) - static int method3542(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 1861 - Interpreter.Interpreter_intStackSize -= 2; // L: 1862 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1863 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1864 - EnumDefinition var10 = GrandExchangeOfferNameComparator.getEnum(var3); // L: 1865 - if (var10.outputType != 's') { // L: 1866 - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 1867 - if (var9 == var10.keys[var6]) { // L: 1868 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 1869 - var10 = null; // L: 1870 - break; - } - } - - if (var10 != null) { // L: 1874 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; // L: 1875 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 1877 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 1903 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1904 - EnumDefinition var4 = GrandExchangeOfferNameComparator.getEnum(var3); // L: 1905 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); // L: 1906 - return 1; // L: 1907 - } else { - return 2; // L: 1909 - } + public static void method3571(int var0, int var1) { + VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); // L: 48 + VarbitDefinition var2; + if (var3 != null) { // L: 49 + var2 = var3; // L: 50 } else { - Interpreter.Interpreter_intStackSize -= 4; // L: 1878 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1879 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1880 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1881 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 1882 - EnumDefinition var7 = GrandExchangeOfferNameComparator.getEnum(var5); // L: 1883 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 1884 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 1889 - if (var6 == var7.keys[var8]) { // L: 1890 - if (var9 == 115) { // L: 1891 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 1892 - } - - var7 = null; // L: 1893 - break; - } - } - - if (var7 != null) { // L: 1897 - if (var9 == 115) { // L: 1898 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 1899 - } - } - - return 1; // L: 1901 - } else { - if (var9 == 115) { // L: 1885 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1886 - } - - return 1; // L: 1887 + byte[] var4 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 + var3 = new VarbitDefinition(); // L: 54 + if (var4 != null) { // L: 55 + var3.decode(new Buffer(var4)); } + + VarbitDefinition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 + var2 = var3; // L: 57 + } + + int var8 = var2.baseVar; // L: 60 + int var5 = var2.startBit; // L: 61 + int var6 = var2.endBit; // L: 62 + int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 + if (var1 < 0 || var1 > var7) { // L: 64 + var1 = 0; + } + + var7 <<= var5; // L: 65 + Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 + } // L: 67 + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ILco;ZB)I", + garbageValue = "-118" + ) + static int method3572(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3153 + MilliClock.Interpreter_intStackSize -= 2; // L: 3154 + var3 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3155 + int var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 3156 + if (!Client.isCameraLocked) { // L: 3157 + Client.camAngleX = var3; // L: 3158 + Client.camAngleY = var4; // L: 3159 + } + + return 1; // L: 3161 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3163 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3164 + return 1; // L: 3165 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3167 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3168 + return 1; // L: 3169 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3171 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 3172 + if (var3 < 0) { // L: 3173 + var3 = 0; + } + + Client.camFollowHeight = var3; // L: 3174 + return 1; // L: 3175 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3177 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3178 + return 1; // L: 3179 + } else { + return 2; // L: 3181 } } } diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java index 1cdaa0fa9d..e3988116ff 100644 --- a/runescape-client/src/main/java/class170.java +++ b/runescape-client/src/main/java/class170.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fr") +@ObfuscatedName("fd") public interface class170 { } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 410a103ff1..5711ba3cc5 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -1,295 +1,19 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fi") +@ObfuscatedName("fe") public class class171 implements class170 { - @ObfuscatedName("x") - static byte[][][] field2049; - - @ObfuscatedName("z") + @ObfuscatedName("hd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1487282942" + descriptor = "(III)V", + garbageValue = "-1877711272" ) - public static void method3543() { - class105.reflectionChecks = new IterableNodeDeque(); // L: 24 - } // L: 25 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "-94" - ) - static int method3544(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 2822 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 2823 - return 1; // L: 2824 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 2826 - Interpreter.Interpreter_intStackSize -= 3; // L: 2827 - Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2828 - Player.privateChatMode = TileItem.method2202(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 2829 - if (Player.privateChatMode == null) { // L: 2830 - Player.privateChatMode = PrivateChatMode.field3821; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2831 - PacketBufferNode var18 = Client.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); // L: 2833 - var18.packetBuffer.writeByte(Client.publicChatMode); // L: 2834 - var18.packetBuffer.writeByte(Player.privateChatMode.field3824); // L: 2835 - var18.packetBuffer.writeByte(Client.tradeChatMode); // L: 2836 - Client.packetWriter.addNode(var18); // L: 2837 - return 1; // L: 2838 - } else { - String var3; - int var11; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 2840 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2841 - Interpreter.Interpreter_intStackSize -= 2; // L: 2842 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2843 - int var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2844 - PacketBufferNode var13 = Client.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); // L: 2846 - var13.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var3) + 2); // L: 2847 - var13.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 2848 - var13.packetBuffer.writeByte(var11 - 1); // L: 2849 - var13.packetBuffer.writeByte(var12); // L: 2850 - Client.packetWriter.addNode(var13); // L: 2851 - return 1; // L: 2852 - } else { - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 2854 - Interpreter.Interpreter_intStackSize -= 2; // L: 2855 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2856 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2857 - Message var16 = WorldMapCacheName.Messages_getByChannelAndID(var10, var11); // L: 2858 - if (var16 != null) { // L: 2859 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.count; // L: 2860 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle; // L: 2861 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; // L: 2862 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; // L: 2863 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; // L: 2864 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); // L: 2865 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 2868 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2869 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2870 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2871 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2872 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2873 - } - - return 1; // L: 2875 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 2877 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2878 - Message var14 = WorldMapSection2.Messages_getMessage(var10); // L: 2879 - if (var14 != null) { // L: 2880 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.type; // L: 2881 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.cycle; // L: 2882 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var14.sender != null ? var14.sender : ""; // L: 2883 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var14.prefix != null ? var14.prefix : ""; // L: 2884 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var14.text != null ? var14.text : ""; // L: 2885 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.isFromFriend() ? 1 : (var14.isFromIgnored() ? 2 : 0); // L: 2886 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 2889 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2890 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2891 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2892 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2893 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2894 - } - - return 1; // L: 2896 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 2898 - if (Player.privateChatMode == null) { // L: 2899 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Player.privateChatMode.field3824; // L: 2900 - } - - return 1; // L: 2901 - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 2903 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2904 - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2905 - String var15 = var3.toLowerCase(); // L: 2906 - byte var17 = 0; // L: 2907 - if (var15.startsWith("yellow:")) { // L: 2908 - var17 = 0; // L: 2909 - var3 = var3.substring("yellow:".length()); // L: 2910 - } else if (var15.startsWith("red:")) { // L: 2912 - var17 = 1; // L: 2913 - var3 = var3.substring("red:".length()); // L: 2914 - } else if (var15.startsWith("green:")) { // L: 2916 - var17 = 2; // L: 2917 - var3 = var3.substring("green:".length()); // L: 2918 - } else if (var15.startsWith("cyan:")) { // L: 2920 - var17 = 3; // L: 2921 - var3 = var3.substring("cyan:".length()); // L: 2922 - } else if (var15.startsWith("purple:")) { // L: 2924 - var17 = 4; // L: 2925 - var3 = var3.substring("purple:".length()); // L: 2926 - } else if (var15.startsWith("white:")) { // L: 2928 - var17 = 5; // L: 2929 - var3 = var3.substring("white:".length()); // L: 2930 - } else if (var15.startsWith("flash1:")) { // L: 2932 - var17 = 6; // L: 2933 - var3 = var3.substring("flash1:".length()); // L: 2934 - } else if (var15.startsWith("flash2:")) { // L: 2936 - var17 = 7; // L: 2937 - var3 = var3.substring("flash2:".length()); // L: 2938 - } else if (var15.startsWith("flash3:")) { // L: 2940 - var17 = 8; // L: 2941 - var3 = var3.substring("flash3:".length()); // L: 2942 - } else if (var15.startsWith("glow1:")) { // L: 2944 - var17 = 9; // L: 2945 - var3 = var3.substring("glow1:".length()); // L: 2946 - } else if (var15.startsWith("glow2:")) { // L: 2948 - var17 = 10; // L: 2949 - var3 = var3.substring("glow2:".length()); // L: 2950 - } else if (var15.startsWith("glow3:")) { // L: 2952 - var17 = 11; // L: 2953 - var3 = var3.substring("glow3:".length()); // L: 2954 - } else if (class58.clientLanguage != Language.Language_EN) { // L: 2956 - if (var15.startsWith("yellow:")) { // L: 2957 - var17 = 0; // L: 2958 - var3 = var3.substring("yellow:".length()); // L: 2959 - } else if (var15.startsWith("red:")) { // L: 2961 - var17 = 1; // L: 2962 - var3 = var3.substring("red:".length()); // L: 2963 - } else if (var15.startsWith("green:")) { // L: 2965 - var17 = 2; // L: 2966 - var3 = var3.substring("green:".length()); // L: 2967 - } else if (var15.startsWith("cyan:")) { // L: 2969 - var17 = 3; // L: 2970 - var3 = var3.substring("cyan:".length()); // L: 2971 - } else if (var15.startsWith("purple:")) { // L: 2973 - var17 = 4; // L: 2974 - var3 = var3.substring("purple:".length()); // L: 2975 - } else if (var15.startsWith("white:")) { // L: 2977 - var17 = 5; // L: 2978 - var3 = var3.substring("white:".length()); // L: 2979 - } else if (var15.startsWith("flash1:")) { // L: 2981 - var17 = 6; // L: 2982 - var3 = var3.substring("flash1:".length()); // L: 2983 - } else if (var15.startsWith("flash2:")) { // L: 2985 - var17 = 7; // L: 2986 - var3 = var3.substring("flash2:".length()); // L: 2987 - } else if (var15.startsWith("flash3:")) { // L: 2989 - var17 = 8; // L: 2990 - var3 = var3.substring("flash3:".length()); // L: 2991 - } else if (var15.startsWith("glow1:")) { // L: 2993 - var17 = 9; // L: 2994 - var3 = var3.substring("glow1:".length()); // L: 2995 - } else if (var15.startsWith("glow2:")) { // L: 2997 - var17 = 10; // L: 2998 - var3 = var3.substring("glow2:".length()); // L: 2999 - } else if (var15.startsWith("glow3:")) { // L: 3001 - var17 = 11; // L: 3002 - var3 = var3.substring("glow3:".length()); // L: 3003 - } - } - - var15 = var3.toLowerCase(); // L: 3006 - byte var7 = 0; // L: 3007 - if (var15.startsWith("wave:")) { // L: 3008 - var7 = 1; // L: 3009 - var3 = var3.substring("wave:".length()); // L: 3010 - } else if (var15.startsWith("wave2:")) { // L: 3012 - var7 = 2; // L: 3013 - var3 = var3.substring("wave2:".length()); // L: 3014 - } else if (var15.startsWith("shake:")) { // L: 3016 - var7 = 3; // L: 3017 - var3 = var3.substring("shake:".length()); // L: 3018 - } else if (var15.startsWith("scroll:")) { // L: 3020 - var7 = 4; // L: 3021 - var3 = var3.substring("scroll:".length()); // L: 3022 - } else if (var15.startsWith("slide:")) { // L: 3024 - var7 = 5; // L: 3025 - var3 = var3.substring("slide:".length()); // L: 3026 - } else if (class58.clientLanguage != Language.Language_EN) { // L: 3028 - if (var15.startsWith("wave:")) { // L: 3029 - var7 = 1; // L: 3030 - var3 = var3.substring("wave:".length()); // L: 3031 - } else if (var15.startsWith("wave2:")) { // L: 3033 - var7 = 2; // L: 3034 - var3 = var3.substring("wave2:".length()); // L: 3035 - } else if (var15.startsWith("shake:")) { // L: 3037 - var7 = 3; // L: 3038 - var3 = var3.substring("shake:".length()); // L: 3039 - } else if (var15.startsWith("scroll:")) { // L: 3041 - var7 = 4; // L: 3042 - var3 = var3.substring("scroll:".length()); // L: 3043 - } else if (var15.startsWith("slide:")) { // L: 3045 - var7 = 5; // L: 3046 - var3 = var3.substring("slide:".length()); // L: 3047 - } - } - - PacketBufferNode var8 = Client.getPacketBufferNode(ClientPacket.field2342, Client.packetWriter.isaacCipher); // L: 3051 - var8.packetBuffer.writeByte(0); // L: 3052 - int var9 = var8.packetBuffer.offset; // L: 3053 - var8.packetBuffer.writeByte(var11); // L: 3054 - var8.packetBuffer.writeByte(var17); // L: 3055 - var8.packetBuffer.writeByte(var7); // L: 3056 - Player.method1326(var8.packetBuffer, var3); // L: 3057 - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); // L: 3058 - Client.packetWriter.addNode(var8); // L: 3059 - return 1; // L: 3060 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3062 - Varps.Interpreter_stringStackSize -= 2; // L: 3063 - var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 3064 - String var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 3065 - PacketBufferNode var5 = Client.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); // L: 3067 - var5.packetBuffer.writeShort(0); // L: 3068 - int var6 = var5.packetBuffer.offset; // L: 3069 - var5.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 3070 - Player.method1326(var5.packetBuffer, var4); // L: 3071 - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); // L: 3072 - Client.packetWriter.addNode(var5); // L: 3073 - return 1; // L: 3074 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3076 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3083 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3084 - return 1; // L: 3085 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3087 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3088 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SecureRandomFuture.Messages_getHistorySize(var10); // L: 3089 - return 1; // L: 3090 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3092 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3093 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBar.Messages_getNextChatID(var10); // L: 3094 - return 1; // L: 3095 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3097 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3098 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.Messages_getLastChatID(var10); // L: 3099 - return 1; // L: 3100 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3102 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 3103 - WorldMapSection2.doCheat(var3); // L: 3104 - return 1; // L: 3105 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3107 - Client.field913 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3108 - return 1; // L: 3109 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3111 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Client.field913; // L: 3112 - return 1; // L: 3113 - } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3115 - var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 3116 - System.out.println(var3); // L: 3117 - return 1; // L: 3118 - } else { - return 2; // L: 3120 - } - } else { - if (WorldMapLabelSize.localPlayer != null && WorldMapLabelSize.localPlayer.username != null) { // L: 3078 - var3 = WorldMapLabelSize.localPlayer.username.getName(); - } else { - var3 = ""; // L: 3079 - } - - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3; // L: 3080 - return 1; // L: 3081 - } - } - } - } + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = class4.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); // L: 8822 + var2.packetBuffer.method5674(var1); // L: 8823 + var2.packetBuffer.method5684(var0); // L: 8824 + Client.packetWriter.addNode(var2); // L: 8825 + } // L: 8826 } diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java index 6ea2805e12..f6afebdf96 100644 --- a/runescape-client/src/main/java/class182.java +++ b/runescape-client/src/main/java/class182.java @@ -1,33 +1,27 @@ -import java.awt.Component; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gs") public class class182 { - @ObfuscatedName("s") + @ObfuscatedName("l") + @Export("directions") static int[][] directions; - @ObfuscatedName("t") + @ObfuscatedName("m") + @Export("distances") static int[][] distances; - @ObfuscatedName("i") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 346475307 + intValue = -1047012721 ) - static int field2135; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1906338265 - ) - static int field2136; - @ObfuscatedName("w") + static int field2122; + @ObfuscatedName("c") + @Export("bufferX") static int[] bufferX; - @ObfuscatedName("g") + @ObfuscatedName("u") + @Export("bufferY") static int[] bufferY; - @ObfuscatedName("dw") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive0; static { directions = new int[128][128]; // L: 6 @@ -36,14 +30,101 @@ public class class182 { bufferY = new int[4096]; // L: 12 } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1480646346" + descriptor = "(Liw;Liw;S)V", + garbageValue = "19317" ) - static void method3683(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 150 - var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 151 - KeyHandler.field418 = -1; // L: 152 - } // L: 153 + public static void method3716(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32 + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33 + } // L: 34 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(CLgb;I)C", + garbageValue = "1155060289" + ) + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { // L: 69 + if (var0 >= 192 && var0 <= 198) { // L: 70 + return 'A'; + } + + if (var0 == 199) { // L: 71 + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { // L: 72 + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { // L: 73 + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { // L: 74 + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { // L: 75 + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { // L: 76 + return 'U'; + } + + if (var0 == 221) { // L: 77 + return 'Y'; + } + + if (var0 == 223) { // L: 78 + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { // L: 79 + return 'a'; + } + + if (var0 == 231) { // L: 80 + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { // L: 81 + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { // L: 82 + return 'i'; + } + + if (var0 == 241 && var1 != Language.Language_ES) { // L: 83 + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { // L: 84 + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { // L: 85 + return 'u'; + } + + if (var0 == 253 || var0 == 255) { // L: 86 + return 'y'; + } + } + + if (var0 == 338) { // L: 88 + return 'O'; + } else if (var0 == 339) { // L: 89 + return 'o'; + } else if (var0 == 376) { // L: 90 + return 'Y'; + } else { + return var0; // L: 91 + } + } } diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java index 636381c083..69324ebce1 100644 --- a/runescape-client/src/main/java/class190.java +++ b/runescape-client/src/main/java/class190.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gh") +@ObfuscatedName("gt") public interface class190 { } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 250426df25..d8a2b90451 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,89 +1,109 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gg") public class class194 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgg;" ) - public static final class194 field2371; - @ObfuscatedName("k") + public static final class194 field2356; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgg;" ) - public static final class194 field2362; - @ObfuscatedName("s") + public static final class194 field2349; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgg;" ) - public static final class194 field2363; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final class194 field2370; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final class194 field2365; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final class194 field2366; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final class194 field2364; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final class194 field2368; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final class194 field2361; + public static final class194 field2359; @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgg;" ) - public static final class194 field2367; + public static final class194 field2348; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final class194 field2352; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final class194 field2351; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final class194 field2354; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final class194 field2353; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final class194 field2355; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final class194 field2357; static { - field2371 = new class194(5); // L: 5 - field2362 = new class194(4); // L: 6 - field2363 = new class194(3); // L: 7 - field2370 = new class194(5); // L: 8 - field2365 = new class194(4); // L: 9 - field2366 = new class194(14); // L: 10 - field2364 = new class194(15); // L: 11 - field2368 = new class194(6); // L: 12 - field2361 = new class194(7); // L: 13 - field2367 = new class194(2); // L: 14 + field2356 = new class194(3); // L: 5 + field2349 = new class194(6); // L: 6 + field2359 = new class194(2); // L: 7 + field2348 = new class194(4); // L: 8 + field2352 = new class194(15); // L: 9 + field2351 = new class194(5); // L: 10 + field2354 = new class194(4); // L: 11 + field2353 = new class194(5); // L: 12 + field2355 = new class194(14); // L: 13 + field2357 = new class194(7); // L: 14 } @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "5" + garbageValue = "3" ) class194(int var1) { } // L: 20 - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IS)Ljava/lang/String;", - garbageValue = "4096" + descriptor = "(III)I", + garbageValue = "-893482237" ) - static final String inventoryQuantityFormat(int var0) { - if (var0 < 100000) { // L: 421 - return "" + var0 + ""; + public static int method3753(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 + if ((var1 & 1) != 0) { + var2 = var0 * var2; // L: 26 + } + + var0 *= var0; // L: 27 + } + + if (var1 == 1) { // L: 30 + return var0 * var2; } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 422 423 + return var2; // L: 31 } } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Lij;", + garbageValue = "1718964805" + ) + @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); // L: 62 63 + } } diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index f364bcd7ea..9c81ca1acc 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -1,149 +1,121 @@ -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.security.SecureRandom; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("gz") +@ObfuscatedName("gr") public class class195 { - @ObfuscatedName("k") + @ObfuscatedName("qx") @ObfuscatedSignature( - descriptor = "(II)Lik;", - garbageValue = "-26050751" + descriptor = "Ldh;" ) - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 25 - var1 = new VarpDefinition(); // L: 26 - if (var2 != null) { // L: 27 - var1.decode(new Buffer(var2)); - } + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("e") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("eg") + @Export("secureRandom") + static SecureRandom secureRandom; - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 - return var1; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([Lga;II)Lga;", + garbageValue = "2137068077" + ) + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; // L: 17 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + Enumerated var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 + } } + + return null; // L: 25 } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;I)V", - garbageValue = "1634836666" + descriptor = "(IB)Z", + garbageValue = "64" ) - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 29 - if (var1 != null) { // L: 30 - int var2 = var0.offset; // L: 31 - var0.writeInt(var1.id); // L: 32 + @Export("Widget_hasContinueOption") + public static boolean Widget_hasContinueOption(int var0) { + return (var0 & 1) != 0; // L: 9 + } - for (int var3 = 0; var3 < var1.size; ++var3) { // L: 33 - if (var1.creationErrors[var3] != 0) { // L: 34 - var0.writeByte(var1.creationErrors[var3]); // L: 35 - } else { - try { - int var4 = var1.operations[var3]; // L: 39 - Field var5; - int var6; - if (var4 == 0) { // L: 40 - var5 = var1.fields[var3]; // L: 41 - var6 = Reflection.getInt(var5, (Object)null); // L: 42 - var0.writeByte(0); // L: 43 - var0.writeInt(var6); // L: 44 - } else if (var4 == 1) { // L: 46 - var5 = var1.fields[var3]; // L: 47 - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 48 - var0.writeByte(0); // L: 49 - } else if (var4 == 2) { // L: 51 - var5 = var1.fields[var3]; // L: 52 - var6 = var5.getModifiers(); // L: 53 - var0.writeByte(0); // L: 54 - var0.writeInt(var6); // L: 55 - } + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "461882503" + ) + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + boolean var2 = false; // L: 37 + boolean var3 = false; // L: 38 + int var4 = 0; // L: 39 + int var5 = var0.length(); // L: 40 + int var6 = 0; - Method var25; - if (var4 != 3) { // L: 57 - if (var4 == 4) { // L: 77 - var25 = var1.methods[var3]; // L: 78 - var6 = var25.getModifiers(); // L: 79 - var0.writeByte(0); // L: 80 - var0.writeInt(var6); // L: 81 - } - } else { - var25 = var1.methods[var3]; // L: 58 - byte[][] var10 = var1.arguments[var3]; // L: 59 - Object[] var7 = new Object[var10.length]; // L: 60 - - for (int var8 = 0; var8 < var10.length; ++var8) { // L: 61 - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 62 - var7[var8] = var9.readObject(); // L: 63 - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 65 - if (var11 == null) { // L: 66 - var0.writeByte(0); - } else if (var11 instanceof Number) { // L: 67 - var0.writeByte(1); // L: 68 - var0.writeLong(((Number)var11).longValue()); // L: 69 - } else if (var11 instanceof String) { // L: 71 - var0.writeByte(2); // L: 72 - var0.writeStringCp1252NullTerminated((String)var11); // L: 73 - } else { - var0.writeByte(4); // L: 75 - } - } - } catch (ClassNotFoundException var13) { // L: 84 - var0.writeByte(-10); // L: 85 - } catch (InvalidClassException var14) { // L: 87 - var0.writeByte(-11); // L: 88 - } catch (StreamCorruptedException var15) { // L: 90 - var0.writeByte(-12); // L: 91 - } catch (OptionalDataException var16) { // L: 93 - var0.writeByte(-13); // L: 94 - } catch (IllegalAccessException var17) { // L: 96 - var0.writeByte(-14); // L: 97 - } catch (IllegalArgumentException var18) { // L: 99 - var0.writeByte(-15); // L: 100 - } catch (InvocationTargetException var19) { // L: 102 - var0.writeByte(-16); // L: 103 - } catch (SecurityException var20) { // L: 105 - var0.writeByte(-17); // L: 106 - } catch (IOException var21) { // L: 108 - var0.writeByte(-18); // L: 109 - } catch (NullPointerException var22) { // L: 111 - var0.writeByte(-19); // L: 112 - } catch (Exception var23) { // L: 114 - var0.writeByte(-20); // L: 115 - } catch (Throwable var24) { // L: 117 - var0.writeByte(-21); // L: 118 - } - } + boolean var1; + while (true) { + if (var6 >= var5) { + var1 = var3; // L: 70 + break; } - var0.writeCrc(var2); // L: 121 - var1.remove(); // L: 122 - } - } // L: 123 + label84: { + char var7 = var0.charAt(var6); // L: 42 + if (var6 == 0) { // L: 43 + if (var7 == '-') { // L: 44 + var2 = true; // L: 45 + break label84; + } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-64" - ) - public static void method3714() { - if (KeyHandler.KeyHandler_instance != null) { // L: 156 - synchronized(KeyHandler.KeyHandler_instance) { // L: 157 - KeyHandler.KeyHandler_instance = null; // L: 158 - } // L: 159 + if (var7 == '+') { // L: 48 + break label84; + } + } + + int var9; + if (var7 >= '0' && var7 <= '9') { // L: 50 + var9 = var7 - '0'; + } else if (var7 >= 'A' && var7 <= 'Z') { // L: 51 + var9 = var7 - '7'; + } else { + if (var7 < 'a' || var7 > 'z') { // L: 52 + var1 = false; // L: 54 + break; + } + + var9 = var7 - 'W'; + } + + if (var9 >= 10) { // L: 57 + var1 = false; // L: 58 + break; // L: 59 + } + + if (var2) { // L: 61 + var9 = -var9; + } + + int var8 = var4 * 10 + var9; // L: 62 + if (var4 != var8 / 10) { // L: 63 + var1 = false; // L: 64 + break; // L: 65 + } + + var4 = var8; // L: 67 + var3 = true; // L: 68 + } + + ++var6; // L: 41 } - } // L: 161 + return var1; // L: 72 + } } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index 0dcf1a64fa..d7e5d6e83f 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -1,151 +1,51 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("gp") +@ObfuscatedName("gy") public class class197 { - @ObfuscatedName("z") - static int[] field2380; + @ObfuscatedName("f") + static int[] field2373; static { new Object(); - field2380 = new int[33]; // L: 8 - field2380[0] = 0; // L: 11 + field2373 = new int[33]; // L: 8 + field2373[0] = 0; // L: 11 int var0 = 2; // L: 12 for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field2380[var1] = var0 - 1; // L: 14 + field2373[var1] = var0 - 1; // L: 14 var0 += var0; // L: 15 } } // L: 17 - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "1" + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "657840099" ) - static void method3743(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 93 - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 94 - int var5 = 0; // L: 95 - if (var1 > var4.field1106) { // L: 96 - var5 += var1 - var4.field1106; - } else if (var1 < var4.x) { // L: 97 - var5 += var4.x - var1; - } + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? class258.method4655(var0, 10, var1) : Integer.toString(var0); // L: 110 111 + } - if (var2 > var4.field1117) { // L: 98 - var5 += var2 - var4.field1117; - } else if (var2 < var4.y) { // L: 99 - var5 += var4.y - var2; - } + @ObfuscatedName("kq") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1748256399" + ) + static void method3783() { + if (ModelData0.field1895 != null) { // L: 11693 + Client.field950 = Client.cycle; // L: 11694 + ModelData0.field1895.method4466(); // L: 11695 - if (var5 - 64 <= var4.field1108 && Client.areaSoundEffectVolume != 0 && var0 == var4.plane) { // L: 100 - var5 -= 64; // L: 111 - if (var5 < 0) { // L: 112 - var5 = 0; - } - - int var6 = (var4.field1108 - var5) * Client.areaSoundEffectVolume / var4.field1108; // L: 113 - if (var4.stream1 == null) { // L: 114 - if (var4.soundEffectId >= 0) { // L: 115 - SoundEffect var7 = SoundEffect.readSoundEffect(GrandExchangeOfferUnitPriceComparator.archive4, var4.soundEffectId, 0); // L: 116 - if (var7 != null) { // L: 117 - RawSound var8 = var7.toRawSound().resample(class9.decimator); // L: 118 - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 119 - var9.setNumLoops(-1); // L: 120 - Players.pcmStreamMixer.addSubStream(var9); // L: 121 - var4.stream1 = var9; // L: 122 - } - } - } else { - var4.stream1.method2641(var6); // L: 126 - } - - if (var4.stream2 == null) { // L: 127 - if (var4.soundEffectIds != null && (var4.field1118 -= var3) <= 0) { // L: 128 - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 129 - SoundEffect var12 = SoundEffect.readSoundEffect(GrandExchangeOfferUnitPriceComparator.archive4, var4.soundEffectIds[var11], 0); // L: 130 - if (var12 != null) { // L: 131 - RawSound var13 = var12.toRawSound().resample(class9.decimator); // L: 132 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 133 - var10.setNumLoops(0); // L: 134 - Players.pcmStreamMixer.addSubStream(var10); // L: 135 - var4.stream2 = var10; // L: 136 - var4.field1118 = var4.field1109 + (int)(Math.random() * (double)(var4.field1115 - var4.field1109)); // L: 137 - } - } - } else { - var4.stream2.method2641(var6); // L: 142 - if (!var4.stream2.hasNext()) { // L: 143 - var4.stream2 = null; // L: 144 - } - } - } else { - if (var4.stream1 != null) { // L: 101 - Players.pcmStreamMixer.removeSubStream(var4.stream1); // L: 102 - var4.stream1 = null; // L: 103 - } - - if (var4.stream2 != null) { // L: 105 - Players.pcmStreamMixer.removeSubStream(var4.stream2); // L: 106 - var4.stream2 = null; // L: 107 - } + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11696 + if (Client.players[var0] != null) { // L: 11697 + ModelData0.field1895.method4465((Client.players[var0].x >> 7) + FloorDecoration.baseX, (Client.players[var0].y >> 7) + WorldMapData_0.baseY); // L: 11698 } } } - } // L: 148 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "432871093" - ) - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { // L: 216 - return Byte.TYPE; - } else if (var0.equals("I")) { // L: 217 - return Integer.TYPE; - } else if (var0.equals("S")) { // L: 218 - return Short.TYPE; - } else if (var0.equals("J")) { // L: 219 - return Long.TYPE; - } else if (var0.equals("Z")) { // L: 220 - return Boolean.TYPE; - } else if (var0.equals("F")) { // L: 221 - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lic;IB)Z", - garbageValue = "1" - ) - public static boolean method3742(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); // L: 222 - if (var2 == null) { // L: 223 - return false; - } else { - Occluder.SpriteBuffer_decode(var2); // L: 224 - return true; // L: 225 - } - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-822542722" - ) - static int method3741(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3193 - } + } // L: 11702 } diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index 5200633a02..8ba0e8798e 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -1,14 +1,20 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gu") public class class198 { - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Lga;", - garbageValue = "900094506" + descriptor = "(CII)Ljava/lang/String;", + garbageValue = "-2114436646" ) - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2164, ServerPacket.field2185, ServerPacket.field2200, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2243, ServerPacket.field2163, ServerPacket.field2178, ServerPacket.field2189, ServerPacket.field2244, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2169, ServerPacket.field2170, ServerPacket.field2171, ServerPacket.field2242, ServerPacket.field2173, ServerPacket.field2215, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2159, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2219, ServerPacket.field2182, ServerPacket.field2197, ServerPacket.field2190, ServerPacket.field2166, ServerPacket.field2186, ServerPacket.field2187, ServerPacket.field2217, ServerPacket.field2195, ServerPacket.field2158, ServerPacket.field2191, ServerPacket.field2196, ServerPacket.field2193, ServerPacket.field2194, ServerPacket.field2214, ServerPacket.field2165, ServerPacket.field2204, ServerPacket.field2213, ServerPacket.field2199, ServerPacket.field2224, ServerPacket.field2201, ServerPacket.field2202, ServerPacket.field2203, ServerPacket.field2239, ServerPacket.field2205, ServerPacket.field2206, ServerPacket.field2207, ServerPacket.field2208, ServerPacket.field2209, ServerPacket.field2210, ServerPacket.field2211, ServerPacket.field2212, ServerPacket.field2229, ServerPacket.field2174, ServerPacket.field2222, ServerPacket.field2162, ServerPacket.field2172, ServerPacket.field2218, ServerPacket.field2227, ServerPacket.field2220, ServerPacket.field2221, ServerPacket.field2181, ServerPacket.field2223, ServerPacket.field2232, ServerPacket.field2225, ServerPacket.field2183, ServerPacket.field2184, ServerPacket.field2228, ServerPacket.field2234, ServerPacket.field2230, ServerPacket.field2231, ServerPacket.field2226, ServerPacket.field2233, ServerPacket.field2216, ServerPacket.field2235, ServerPacket.field2236, ServerPacket.field2237, ServerPacket.field2238, ServerPacket.field2188, ServerPacket.field2240, ServerPacket.field2241, ServerPacket.field2192}; // L: 95 + static String method3786(char var0, int var1) { + char[] var2 = new char[var1]; // L: 174 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 175 + var2[var3] = var0; + } + + return new String(var2); // L: 176 } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 6d13705860..793ba7aae0 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,340 +1,317 @@ -import java.io.File; -import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("l") final class class2 implements class0 { - @ObfuscatedName("ak") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lclient;" + descriptor = "(Ljava/lang/Object;Lkb;I)V", + garbageValue = "192866787" ) - static Client client; - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkf;B)V", - garbageValue = "21" - ) - public void vmethod70(Object var1, Buffer var2) { + public void vmethod69(Object var1, Buffer var2) { this.method25((Long)var1, var2); // L: 33 } // L: 34 - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-453860591" + descriptor = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1094020977" ) - public Object vmethod61(Buffer var1) { + public Object vmethod72(Buffer var1) { return var1.readLong(); // L: 29 } - @ObfuscatedName("m") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lkf;B)V", - garbageValue = "-94" + descriptor = "(Ljava/lang/Long;Lkb;B)V", + garbageValue = "3" ) void method25(Long var1, Buffer var2) { var2.writeLong(var1); // L: 25 } // L: 26 - @ObfuscatedName("z") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "([BB)Ljava/lang/String;", - garbageValue = "36" + descriptor = "(II)I", + garbageValue = "929998205" ) - public static String method40(byte[] var0) { - return PlayerAppearance.method4116(var0, 0, var0.length); // L: 58 + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 48 + return var1 == null ? 0 : var1.size(); // L: 49 50 } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmy;", - garbageValue = "-65308195" - ) - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 254 - if (var3.exists()) { // L: 255 - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 257 - return var10; // L: 258 - } catch (IOException var9) { // L: 260 - } - } - - String var4 = ""; // L: 262 - if (SoundSystem.cacheGamebuild == 33) { // L: 263 - var4 = "_rc"; - } else if (SoundSystem.cacheGamebuild == 34) { // L: 264 - var4 = "_wip"; - } - - File var5 = new File(UserComparator2.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 265 - AccessFile var6; - if (!var2 && var5.exists()) { // L: 266 - try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 268 - return var6; // L: 269 - } catch (IOException var8) { // L: 271 - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 274 - return var6; // L: 275 - } catch (IOException var7) { // L: 277 - throw new RuntimeException(); // L: 278 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lky;IB)V", + descriptor = "(B)V", garbageValue = "0" ) - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; // L: 71 - Players.Players_pendingUpdateCount = 0; // L: 72 - int var3 = 0; // L: 74 - var0.importIndex(); // L: 75 - - byte[] var10000; - int var4; - int var6; - int var7; - for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76 - var7 = Players.Players_indices[var4]; // L: 77 - if ((Players.field1285[var7] & 1) == 0) { // L: 78 - if (var3 > 0) { // L: 79 - --var3; // L: 80 - var10000 = Players.field1285; // L: 81 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 84 - if (var6 == 0) { // L: 85 - var3 = Tiles.method1186(var0); // L: 86 - var10000 = Players.field1285; // L: 87 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - class225.readPlayerUpdate(var0, var7); // L: 90 - } - } - } - } - - var0.exportIndex(); // L: 93 - if (var3 != 0) { - throw new RuntimeException(); + static void method38() { + Login.Login_username = Login.Login_username.trim(); // L: 835 + if (Login.Login_username.length() == 0) { // L: 836 + GrandExchangeOfferNameComparator.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 837 } else { - var0.importIndex(); // L: 97 + long var1; + try { + URL var3 = new URL(NPC.method2157("services", false) + "m=accountappeal/login.ws"); // L: 844 + URLConnection var4 = var3.openConnection(); // L: 845 + var4.setRequestProperty("connection", "close"); // L: 846 + var4.setDoInput(true); // L: 847 + var4.setDoOutput(true); // L: 848 + var4.setConnectTimeout(5000); // L: 849 + OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 850 + var5.write("data1=req"); // L: 851 + var5.flush(); // L: 852 + InputStream var6 = var4.getInputStream(); // L: 853 + Buffer var7 = new Buffer(new byte[1000]); // L: 854 - for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 - var7 = Players.Players_indices[var4]; // L: 99 - if ((Players.field1285[var7] & 1) != 0) { // L: 100 - if (var3 > 0) { // L: 101 - --var3; // L: 102 - var10000 = Players.field1285; // L: 103 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 106 - if (var6 == 0) { // L: 107 - var3 = Tiles.method1186(var0); // L: 108 - var10000 = Players.field1285; // L: 109 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - class225.readPlayerUpdate(var0, var7); // L: 112 - } + while (true) { + int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 856 + if (var8 == -1) { // L: 857 + var7.offset = 0; // L: 864 + long var22 = var7.readLong(); // L: 865 + var1 = var22; // L: 866 + break; + } + + var7.offset += var8; // L: 858 + if (var7.offset >= 1000) { // L: 859 + var1 = 0L; // L: 860 + break; } } + } catch (Exception var30) { // L: 868 + var1 = 0L; // L: 869 } - var0.exportIndex(); // L: 115 - if (var3 != 0) { // L: 116 - throw new RuntimeException(); // L: 117 + byte var0; + if (var1 == 0L) { // L: 873 + var0 = 5; } else { - var0.importIndex(); // L: 119 + String var31 = Login.Login_username; // L: 876 + Random var32 = new Random(); // L: 878 + Buffer var26 = new Buffer(128); // L: 879 + Buffer var9 = new Buffer(128); // L: 880 + int[] var10 = new int[]{var32.nextInt(), var32.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 881 882 883 884 885 + var26.writeByte(10); // L: 886 - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 - var7 = Players.Players_emptyIndices[var4]; // L: 121 - if ((Players.field1285[var7] & 1) != 0) { // L: 122 - if (var3 > 0) { // L: 123 - --var3; // L: 124 - var10000 = Players.field1285; // L: 125 - var10000[var7] = (byte)(var10000[var7] | 2); - } else { - var6 = var0.readBits(1); // L: 128 - if (var6 == 0) { // L: 129 - var3 = Tiles.method1186(var0); // L: 130 - var10000 = Players.field1285; // L: 131 - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (FileSystem.updateExternalPlayer(var0, var7)) { // L: 134 - var10000 = Players.field1285; - var10000[var7] = (byte)(var10000[var7] | 2); - } - } - } + int var11; + for (var11 = 0; var11 < 4; ++var11) { // L: 887 + var26.writeInt(var32.nextInt()); // L: 888 } - var0.exportIndex(); // L: 137 - if (var3 != 0) { // L: 138 - throw new RuntimeException(); // L: 139 - } else { - var0.importIndex(); // L: 141 + var26.writeInt(var10[0]); // L: 890 + var26.writeInt(var10[1]); // L: 891 + var26.writeLong(var1); // L: 892 + var26.writeLong(0L); // L: 893 - for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 - var7 = Players.Players_emptyIndices[var4]; // L: 143 - if ((Players.field1285[var7] & 1) == 0) { // L: 144 - if (var3 > 0) { // L: 145 - --var3; // L: 146 - var10000 = Players.field1285; // L: 147 - var10000[var7] = (byte)(var10000[var7] | 2); + for (var11 = 0; var11 < 4; ++var11) { // L: 894 + var26.writeInt(var32.nextInt()); // L: 895 + } + + var26.encryptRsa(class89.field1166, class89.field1167); // L: 897 + var9.writeByte(10); // L: 898 + + for (var11 = 0; var11 < 3; ++var11) { // L: 899 + var9.writeInt(var32.nextInt()); // L: 900 + } + + var9.writeLong(var32.nextLong()); // L: 902 + var9.writeLongMedium(var32.nextLong()); // L: 903 + Language.method3801(var9); // L: 904 + var9.writeLong(var32.nextLong()); // L: 905 + var9.encryptRsa(class89.field1166, class89.field1167); // L: 906 + var11 = SpriteMask.stringCp1252NullTerminatedByteSize(var31); // L: 907 + if (var11 % 8 != 0) { // L: 908 + var11 += 8 - var11 % 8; + } + + Buffer var12 = new Buffer(var11); // L: 909 + var12.writeStringCp1252NullTerminated(var31); // L: 910 + var12.offset = var11; // L: 911 + var12.xteaEncryptAll(var10); // L: 912 + Buffer var13 = new Buffer(var12.offset + var26.offset + var9.offset + 5); // L: 913 + var13.writeByte(2); // L: 914 + var13.writeByte(var26.offset); // L: 915 + var13.writeBytes(var26.array, 0, var26.offset); // L: 916 + var13.writeByte(var9.offset); // L: 917 + var13.writeBytes(var9.array, 0, var9.offset); // L: 918 + var13.writeShort(var12.offset); // L: 919 + var13.writeBytes(var12.array, 0, var12.offset); // L: 920 + byte[] var15 = var13.array; // L: 922 + String var14 = class299.method5418(var15, 0, var15.length); // L: 924 + String var16 = var14; // L: 926 + + byte var27; + try { + URL var17 = new URL(NPC.method2157("services", false) + "m=accountappeal/login.ws"); // L: 928 + URLConnection var18 = var17.openConnection(); // L: 929 + var18.setDoInput(true); // L: 930 + var18.setDoOutput(true); // L: 931 + var18.setConnectTimeout(5000); // L: 932 + OutputStreamWriter var19 = new OutputStreamWriter(var18.getOutputStream()); // L: 933 + var19.write("data2=" + class204.method3829(var16) + "&dest=" + class204.method3829("passwordchoice.ws")); // L: 934 + var19.flush(); // L: 935 + InputStream var20 = var18.getInputStream(); // L: 936 + var13 = new Buffer(new byte[1000]); // L: 937 + + while (true) { + int var21 = var20.read(var13.array, var13.offset, 1000 - var13.offset); // L: 939 + if (var21 == -1) { // L: 940 + var19.close(); // L: 947 + var20.close(); // L: 948 + String var28 = new String(var13.array); // L: 949 + if (var28.startsWith("OFFLINE")) { // L: 950 + var27 = 4; // L: 951 + } else if (var28.startsWith("WRONG")) { // L: 954 + var27 = 7; // L: 955 + } else if (var28.startsWith("RELOAD")) { // L: 958 + var27 = 3; // L: 959 + } else if (var28.startsWith("Not permitted for social network accounts.")) { // L: 962 + var27 = 6; // L: 963 } else { - var6 = var0.readBits(1); // L: 150 - if (var6 == 0) { // L: 151 - var3 = Tiles.method1186(var0); // L: 152 - var10000 = Players.field1285; // L: 153 - var10000[var7] = (byte)(var10000[var7] | 2); - } else if (FileSystem.updateExternalPlayer(var0, var7)) { // L: 156 - var10000 = Players.field1285; - var10000[var7] = (byte)(var10000[var7] | 2); + var13.xteaDecryptAll(var10); // L: 966 + + while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { // L: 967 + --var13.offset; // L: 968 + } + + var28 = new String(var13.array, 0, var13.offset); // L: 970 + if (HealthBarUpdate.method1870(var28)) { // L: 971 + Skeleton.openURL(var28, true, false); // L: 972 + var27 = 2; // L: 973 + } else { + var27 = 5; // L: 975 } } + break; + } + + var13.offset += var21; // L: 941 + if (var13.offset >= 1000) { // L: 942 + var27 = 5; // L: 943 + break; } } - - var0.exportIndex(); // L: 159 - if (var3 != 0) { // L: 160 - throw new RuntimeException(); // L: 161 - } else { - Players.Players_count = 0; // L: 163 - Players.Players_emptyIdxCount = 0; // L: 164 - - for (var4 = 1; var4 < 2048; ++var4) { // L: 165 - var10000 = Players.field1285; // L: 166 - var10000[var4] = (byte)(var10000[var4] >> 1); - Player var5 = Client.players[var4]; // L: 167 - if (var5 != null) { // L: 168 - Players.Players_indices[++Players.Players_count - 1] = var4; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169 - } - } - - GrandExchangeOfferAgeComparator.method234(var0); // L: 172 - if (var0.offset - var2 != var1) { // L: 173 - throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 174 - } - } + } catch (Throwable var29) { // L: 977 + var29.printStackTrace(); // L: 978 + var27 = 5; // L: 979 } - } - } - } // L: 176 - @ObfuscatedName("o") + var0 = var27; // L: 982 + } + + switch(var0) { // L: 984 + case 2: + GrandExchangeOfferNameComparator.setLoginResponseString(Strings.field3054, Strings.field3055, Strings.field3056); // L: 1001 + Login.loginIndex = 6; // L: 1002 + break; + case 3: + GrandExchangeOfferNameComparator.setLoginResponseString("", "Error connecting to server.", ""); // L: 989 + break; // L: 990 + case 4: + GrandExchangeOfferNameComparator.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 998 + break; // L: 999 + case 5: + GrandExchangeOfferNameComparator.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 995 + break; // L: 996 + case 6: + GrandExchangeOfferNameComparator.setLoginResponseString("", "Error connecting to server.", ""); // L: 986 + break; // L: 987 + case 7: + GrandExchangeOfferNameComparator.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."); // L: 992 + } + + } + } // L: 838 1005 + + @ObfuscatedName("fb") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1849126177" + garbageValue = "1215217092" ) - public static void method41() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 94 - } // L: 95 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lct;Lct;IZI)I", - garbageValue = "-1471350049" - ) - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { // L: 211 - int var4 = var0.population; // L: 212 - int var5 = var1.population; // L: 213 - if (!var3) { // L: 214 - if (var4 == -1) { // L: 215 - var4 = 2001; - } - - if (var5 == -1) { // L: 216 - var5 = 2001; - } + static final void method30() { + if (ClientPacket.ClanChat_inClanChat) { // L: 3612 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 3613 + DevicePcmPlayerProvider.clanChat.sort(); // L: 3614 } - return var4 - var5; // L: 218 - } else if (var2 == 2) { // L: 220 - return var0.location - var1.location; - } else if (var2 == 3) { // L: 221 - if (var0.activity.equals("-")) { // L: 222 - if (var1.activity.equals("-")) { // L: 223 - return 0; - } else { - return var3 ? -1 : 1; // L: 224 - } - } else if (var1.activity.equals("-")) { // L: 226 - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); // L: 227 + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3617 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3618 + var1.clearIsInClanChat(); // L: 3619 } - } else if (var2 == 4) { // L: 229 - return var0.method1823() ? (var1.method1823() ? 0 : 1) : (var1.method1823() ? -1 : 0); - } else if (var2 == 5) { // L: 230 - return var0.method1821() ? (var1.method1821() ? 0 : 1) : (var1.method1821() ? -1 : 0); - } else if (var2 == 6) { // L: 231 - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { // L: 232 - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; // L: 233 + + ClientPacket.ClanChat_inClanChat = false; // L: 3622 } + + } // L: 3624 + + @ObfuscatedName("fd") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1276683355" + ) + static final void method41() { + int var0 = Players.Players_count; // L: 3893 + int[] var1 = Players.Players_indices; // L: 3894 + + for (int var2 = 0; var2 < var0; ++var2) { // L: 3895 + Player var3 = Client.players[var1[var2]]; // L: 3896 + if (var3 != null) { // L: 3897 + class13.updateActorSequence(var3, 1); // L: 3898 + } + } + + } // L: 3901 + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1946760208" + ) + static boolean method28() { + return (Client.drawPlayerNames & 1) != 0; // L: 4918 } - @ObfuscatedName("b") + @ObfuscatedName("iz") @ObfuscatedSignature( - descriptor = "(IZII)V", - garbageValue = "94812799" + descriptor = "(Ljava/lang/String;Lht;I)Ljava/lang/String;", + garbageValue = "1452658207" ) - public static final void method37(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { // L: 45 - PcmPlayer.field1447 = var0; // L: 46 - PcmPlayer.PcmPlayer_stereo = var1; // L: 47 - Decimator.field1491 = var2; // L: 48 - } else { - throw new IllegalArgumentException(); - } - } // L: 49 - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(Lcf;III)V", - garbageValue = "-1026866669" - ) - static final void method39(MenuAction var0, int var1, int var2) { - SecureRandomCallable.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 7250 - } // L: 7251 - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-22039586" - ) - static void method24() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 8258 - if (LoginScreenAnimation.method1905(Client.menuOpcodes[var0])) { // L: 8259 - if (var0 < Client.menuOptionsCount - 1) { // L: 8260 - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8261 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8262 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8263 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8264 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8265 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8266 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8267 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8268 + static String method39(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 9832 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 9833 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 9835 + if (var3 == -1) { // L: 9836 + break; } - } - --var0; // L: 8271 - --Client.menuOptionsCount; // L: 8272 + var0 = var0.substring(0, var3) + HorizontalAlignment.method4880(WorldMapID.method663(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 9837 + } } } - GrandExchangeOfferTotalQuantityComparator.method164(); // L: 8275 - } // L: 8276 + return var0; // L: 9841 + } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(IIIZB)V", + garbageValue = "-2" + ) + public static void method42(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = class4.getPacketBufferNode(ClientPacket.field2309, Client.packetWriter.isaacCipher); // L: 11647 + var4.packetBuffer.writeShort(var1); // L: 11648 + var4.packetBuffer.writeByte(var2); // L: 11649 + var4.packetBuffer.method5674(var0); // L: 11650 + var4.packetBuffer.method5684(var3 ? Client.field763 * -2027491329 * 1473843199 : 0); // L: 11651 + Client.packetWriter.addNode(var4); // L: 11652 + } // L: 11653 } diff --git a/runescape-client/src/main/java/class200.java b/runescape-client/src/main/java/class200.java index 5e54ca23ff..3780e32ea2 100644 --- a/runescape-client/src/main/java/class200.java +++ b/runescape-client/src/main/java/class200.java @@ -1,41 +1,53 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gj") public class class200 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lgj;" ) - static final class200 field2402; - @ObfuscatedName("k") + static final class200 field2391; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lgj;" ) - static final class200 field2399; - @ObfuscatedName("s") + static final class200 field2390; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lgj;" ) - static final class200 field2401; - @ObfuscatedName("bw") - static String field2403; + static final class200 field2392; static { - field2402 = new class200(); // L: 4 - field2399 = new class200(); // L: 5 - field2401 = new class200(); // L: 6 + field2391 = new class200(); // L: 4 + field2390 = new class200(); // L: 5 + field2392 = new class200(); // L: 6 } class200() { } // L: 8 - @ObfuscatedName("n") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1315253613" + descriptor = "(B)V", + garbageValue = "96" ) - static final boolean method3760() { - return ViewportMouse.ViewportMouse_isInViewport; // L: 103 - } + public static void method3803() { + ItemDefinition.ItemDefinition_cached.clear(); // L: 543 + ItemDefinition.ItemDefinition_cachedModels.clear(); // L: 544 + ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 545 + } // L: 546 + + @ObfuscatedName("gp") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1508888429" + ) + static void method3804() { + if (PlayerType.localPlayer.x >> 7 == Client.destinationX && PlayerType.localPlayer.y >> 7 == Client.destinationY) { // L: 4809 + Client.destinationX = 0; // L: 4810 + } + + } // L: 4812 } diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 53f700fe5d..aa1020c1a3 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -1,129 +1,57 @@ import java.util.HashMap; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("gl") public class class204 { - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = 326799997 - ) - static int foundItemIdCount; - @ObfuscatedName("o") + @ObfuscatedName("cu") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lbh;" ) - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("q") - static int[][][] field2421; + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; static { new HashMap(); } // L: 9 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)Lir;", - garbageValue = "57" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-50568110" ) - public static HealthBarDefinition method3780(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32 - if (var1 != null) { // L: 33 - return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34 - var1 = new HealthBarDefinition(); // L: 35 - if (var2 != null) { // L: 36 - var1.decode(new Buffer(var2)); - } + public static String method3829(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; // L: 38 - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIIB)Lcy;", - garbageValue = "-39" - ) - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = class13.method129(var1, var0); // L: 37 - Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 40 - Script var4; - if (var5 != null) { // L: 41 - var4 = var5; // L: 42 - } else { - String var6 = String.valueOf(var3); // L: 45 - int var7 = ApproximateRouteStrategy.archive12.getGroupId(var6); // L: 46 - if (var7 == -1) { // L: 47 - var4 = null; // L: 48 - } else { - label59: { - byte[] var8 = ApproximateRouteStrategy.archive12.takeFileFlat(var7); // L: 51 - if (var8 != null) { // L: 52 - if (var8.length <= 1) { // L: 53 - var4 = null; // L: 54 - break label59; // L: 55 - } - - var5 = UserComparator7.newScript(var8); // L: 57 - if (var5 != null) { // L: 58 - Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 59 - var4 = var5; // L: 60 - break label59; // L: 61 - } - } - - var4 = null; // L: 64 - } - } - } - - if (var4 != null) { // L: 67 - return var4; // L: 68 - } else { - int var12 = (var2 + 40000 << 8) + var0; // L: 72 - Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); // L: 77 - Script var13; - if (var14 != null) { // L: 78 - var13 = var14; // L: 79 - } else { - String var9 = String.valueOf(var12); // L: 82 - int var10 = ApproximateRouteStrategy.archive12.getGroupId(var9); // L: 83 - if (var10 == -1) { // L: 84 - var13 = null; // L: 85 + for (int var3 = 0; var3 < var1; ++var3) { // L: 13 + char var4 = var0.charAt(var3); // L: 14 + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 + if (var4 == ' ') { // L: 16 + var2.append('+'); } else { - byte[] var11 = ApproximateRouteStrategy.archive12.takeFileFlat(var10); // L: 88 - if (var11 != null) { // L: 89 - if (var11.length <= 1) { // L: 90 - var13 = null; // L: 91 - return var13 != null ? var13 : null; // L: 104 107 - } - - var14 = UserComparator7.newScript(var11); // L: 94 - if (var14 != null) { // L: 95 - Script.Script_cached.put(var14, (long)(var12 << 16)); // L: 96 - var13 = var14; // L: 97 - return var13 != null ? var13 : null; - } + byte var5 = class219.charToByteCp1252(var4); // L: 18 + var2.append('%'); // L: 19 + int var6 = var5 >> 4 & 15; // L: 20 + if (var6 >= 10) { // L: 21 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); // L: 22 } - var13 = null; // L: 101 + var6 = var5 & 15; // L: 23 + if (var6 >= 10) { // L: 24 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); // L: 25 + } } + } else { + var2.append(var4); } - - return var13 != null ? var13 : null; } - } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-2091339129" - ) - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 150 + return var2.toString(); // L: 28 } } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index 324610b86f..e435779364 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -1,43 +1,103 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gx") public class class206 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("musicPatchesArchive") static AbstractArchive musicPatchesArchive; - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) + @Export("musicSamplesArchive") static AbstractArchive musicSamplesArchive; - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Liw;" ) - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("i") + @Export("soundEffectsArchive") + static AbstractArchive soundEffectsArchive; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1660292459 + intValue = 60389351 ) + @Export("musicPlayerStatus") public static int musicPlayerStatus; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1418179019 + intValue = 2127739397 ) + @Export("musicTrackFileId") public static int musicTrackFileId; - @ObfuscatedName("n") - public static boolean musicTrackBoolean; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhj;" + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -2078097639 ) - static MusicTrack musicTrack; + @Export("musicTrackVolume") + public static int musicTrackVolume; static { musicPlayerStatus = 0; // L: 11 } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1369090733" + ) + public static boolean method3851() { + ReflectionCheck var0 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 24 + return var0 != null; // L: 25 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(I)Lgk;", + garbageValue = "-1404653901" + ) + public static PacketBufferNode method3853() { + PacketBufferNode var0 = ChatChannel.method2363(); // L: 42 + var0.clientPacket = null; // L: 43 + var0.clientPacketLength = 0; // L: 44 + var0.packetBuffer = new PacketBuffer(5000); // L: 45 + return var0; // L: 46 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2122026664" + ) + public static void method3852(int var0) { + if (var0 != -1) { // L: 236 + if (Widget.Widget_loadedInterfaces[var0]) { // L: 237 + Decimator.Widget_archive.clearFilesGroup(var0); // L: 238 + if (Widget.Widget_interfaceComponents[var0] != null) { // L: 239 + boolean var1 = true; // L: 240 + + for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 241 + if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 242 + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 243 + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; // L: 244 + } + } + } + + if (var1) { + Widget.Widget_interfaceComponents[var0] = null; // L: 247 + } + + Widget.Widget_loadedInterfaces[var0] = false; // L: 248 + } + } + } + } // L: 249 } diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java index 07a3ebf811..89a8708850 100644 --- a/runescape-client/src/main/java/class217.java +++ b/runescape-client/src/main/java/class217.java @@ -1,16 +1,250 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hp") +@ObfuscatedName("hq") public class class217 { - @ObfuscatedName("k") - @ObfuscatedGetter( - longValue = -8867725133040190249L + @ObfuscatedName("b") + @Export("localPlayerName") + public static String localPlayerName; + @ObfuscatedName("h") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "Lht;" ) - static long field2536; + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 596928763 + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "1671015223" ) - static int field2537; + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 260 + var1.offset = var0.length - 2; // L: 261 + class336.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 262 + class336.SpriteBuffer_xOffsets = new int[class336.SpriteBuffer_spriteCount]; // L: 263 + class225.SpriteBuffer_yOffsets = new int[class336.SpriteBuffer_spriteCount]; // L: 264 + class336.SpriteBuffer_spriteWidths = new int[class336.SpriteBuffer_spriteCount]; // L: 265 + class336.SpriteBuffer_spriteHeights = new int[class336.SpriteBuffer_spriteCount]; // L: 266 + class13.SpriteBuffer_pixels = new byte[class336.SpriteBuffer_spriteCount][]; // L: 267 + var1.offset = var0.length - 7 - class336.SpriteBuffer_spriteCount * 8; // L: 268 + class336.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 269 + class336.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 270 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 271 + + int var3; + for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 272 + class336.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 273 + class225.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 274 + class336.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 275 + class336.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class336.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 276 + WorldMapID.SpriteBuffer_spritePalette = new int[var2]; // L: 277 + + for (var3 = 1; var3 < var2; ++var3) { // L: 278 + WorldMapID.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 279 + if (WorldMapID.SpriteBuffer_spritePalette[var3] == 0) { // L: 280 + WorldMapID.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 282 + + for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 283 + int var4 = class336.SpriteBuffer_spriteWidths[var3]; // L: 284 + int var5 = class336.SpriteBuffer_spriteHeights[var3]; // L: 285 + int var6 = var5 * var4; // L: 286 + byte[] var7 = new byte[var6]; // L: 287 + class13.SpriteBuffer_pixels[var3] = var7; // L: 288 + int var8 = var1.readUnsignedByte(); // L: 289 + int var9; + if (var8 == 0) { // L: 290 + for (var9 = 0; var9 < var6; ++var9) { // L: 291 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 293 + for (var9 = 0; var9 < var4; ++var9) { // L: 294 + for (int var10 = 0; var10 < var5; ++var10) { // L: 295 + var7[var9 + var10 * var4] = var1.readByte(); // L: 296 + } + } + } + } + + } // L: 301 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1102921575" + ) + static final void method4098(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your ignore list").toString(); // L: 188 + DevicePcmPlayerProvider.addGameMessage(30, "", var1); // L: 190 + } // L: 192 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "1928769933" + ) + static int method4099(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2269 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2270 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2271 + return 1; // L: 2272 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2274 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2275 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2276 + return 1; // L: 2277 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2279 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2280 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2281 + return 1; // L: 2282 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2284 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2285 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2286 + return 1; // L: 2287 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2289 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2290 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2291 + return 1; // L: 2292 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2294 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2295 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2296 + return 1; // L: 2297 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2299 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2300 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2301 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2302 + return 1; // L: 2303 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2305 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2306 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2307 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2308 + return 1; // L: 2309 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2311 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2312 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2313 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2314 + return 1; // L: 2315 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2317 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2318 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2319 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2320 + return 1; // L: 2321 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2323 + var12 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2324 + if (WorldMapDecoration.grandExchangeEvents != null) { // L: 2325 + WorldMapDecoration.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2326 + } + + return 1; // L: 2328 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2330 + var12 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2331 + if (WorldMapDecoration.grandExchangeEvents != null) { // L: 2332 + WorldMapDecoration.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2333 + } + + return 1; // L: 2335 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2337 + MilliClock.Interpreter_intStackSize -= 2; // L: 2338 + var12 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] == 1; // L: 2339 + boolean var11 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1] == 1; // L: 2340 + if (WorldMapDecoration.grandExchangeEvents != null) { // L: 2341 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2342 + WorldMapDecoration.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2343 + } + + return 1; // L: 2345 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2347 + var12 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2348 + if (WorldMapDecoration.grandExchangeEvents != null) { // L: 2349 + WorldMapDecoration.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2350 + } + + return 1; // L: 2352 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2354 + var12 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize] == 1; // L: 2355 + if (WorldMapDecoration.grandExchangeEvents != null) { // L: 2356 + WorldMapDecoration.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2357 + } + + return 1; // L: 2359 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2361 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = WorldMapDecoration.grandExchangeEvents == null ? 0 : WorldMapDecoration.grandExchangeEvents.events.size(); // L: 2362 + return 1; // L: 2363 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2365 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2366 + var4 = (GrandExchangeEvent)WorldMapDecoration.grandExchangeEvents.events.get(var3); // L: 2367 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.world; // L: 2368 + return 1; // L: 2369 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2371 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2372 + var4 = (GrandExchangeEvent)WorldMapDecoration.grandExchangeEvents.events.get(var3); // L: 2373 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2374 + return 1; // L: 2375 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2377 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2378 + var4 = (GrandExchangeEvent)WorldMapDecoration.grandExchangeEvents.events.get(var3); // L: 2379 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2380 + return 1; // L: 2381 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2383 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2384 + var4 = (GrandExchangeEvent)WorldMapDecoration.grandExchangeEvents.events.get(var3); // L: 2385 + long var5 = User.currentTimeMillis() - class58.field444 - var4.age; // L: 2386 + int var7 = (int)(var5 / 3600000L); // L: 2387 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2388 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2389 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2390 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var10; // L: 2391 + return 1; // L: 2392 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2394 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2395 + var4 = (GrandExchangeEvent)WorldMapDecoration.grandExchangeEvents.events.get(var3); // L: 2396 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2397 + return 1; // L: 2398 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2400 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2401 + var4 = (GrandExchangeEvent)WorldMapDecoration.grandExchangeEvents.events.get(var3); // L: 2402 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2403 + return 1; // L: 2404 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2406 + var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 2407 + var4 = (GrandExchangeEvent)WorldMapDecoration.grandExchangeEvents.events.get(var3); // L: 2408 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2409 + return 1; // L: 2410 + } else { + return 2; // L: 2412 + } + } + } + } + } } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index 51620c1e04..aa15f80de1 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -1,26 +1,90 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hp") public class class219 { - @ObfuscatedName("ns") - @ObfuscatedGetter( - intValue = -437484721 - ) - static int field2547; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lht;" + descriptor = "Lhi;" ) - public static Huffman huffman; + @Export("huffman") + static Huffman huffman; + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1168903600" + descriptor = "(CI)B", + garbageValue = "-1341366570" ) - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 + var1 = (byte)var0; + } else if (var0 == 8364) { // L: 13 + var1 = -128; + } else if (var0 == 8218) { // L: 14 + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { // L: 16 + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { // L: 18 + var1 = -122; + } else if (var0 == 8225) { // L: 19 + var1 = -121; + } else if (var0 == 710) { // L: 20 + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { // L: 22 + var1 = -118; + } else if (var0 == 8249) { // L: 23 + var1 = -117; + } else if (var0 == 338) { // L: 24 + var1 = -116; + } else if (var0 == 381) { // L: 25 + var1 = -114; + } else if (var0 == 8216) { // L: 26 + var1 = -111; + } else if (var0 == 8217) { // L: 27 + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { // L: 29 + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { // L: 31 + var1 = -106; + } else if (var0 == 8212) { // L: 32 + var1 = -105; + } else if (var0 == 732) { // L: 33 + var1 = -104; + } else if (var0 == 8482) { // L: 34 + var1 = -103; + } else if (var0 == 353) { // L: 35 + var1 = -102; + } else if (var0 == 8250) { // L: 36 + var1 = -101; + } else if (var0 == 339) { // L: 37 + var1 = -100; + } else if (var0 == 382) { // L: 38 + var1 = -98; + } else if (var0 == 376) { // L: 39 + var1 = -97; + } else { + var1 = 63; // L: 40 + } + + return var1; // L: 41 } } diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 32833cd35b..49947b6655 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -1,66 +1,172 @@ -import java.util.LinkedHashMap; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("p") +@ObfuscatedName("a") public class class22 { - @ObfuscatedName("w") - static byte[][][] field122; - - @ObfuscatedName("fj") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-680563104" + descriptor = "Lly;" ) - static final void method245(boolean var0) { - if (var0) { // L: 2596 - Client.field710 = Login.field1223 ? class169.field2046 : class169.field2044; // L: 2597 - } else { - LinkedHashMap var1 = Tile.clientPreferences.parameters; // L: 2600 - String var3 = Login.Login_username; // L: 2602 - int var4 = var3.length(); // L: 2604 - int var5 = 0; // L: 2605 + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("gz") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; - for (int var6 = 0; var6 < var4; ++var6) { // L: 2606 - var5 = (var5 << 5) - var5 + var3.charAt(var6); + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILco;ZB)I", + garbageValue = "-46" + ) + static int method244(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3201 + MilliClock.Interpreter_intStackSize -= 2; // L: 3202 + Client.field873 = (short)FontName.method5455(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]); // L: 3203 + if (Client.field873 <= 0) { // L: 3204 + Client.field873 = 256; } - Client.field710 = var1.containsKey(var5) ? class169.field2045 : class169.field2043; // L: 2609 - } + Client.field932 = (short)FontName.method5455(Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]); // L: 3205 + if (Client.field932 <= 0) { // L: 3206 + Client.field932 = 256; + } - } // L: 2611 + return 1; // L: 3207 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3209 + MilliClock.Interpreter_intStackSize -= 2; // L: 3210 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3211 + if (Client.zoomHeight <= 0) { // L: 3212 + Client.zoomHeight = 256; + } - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-916071017" - ) - static final int method244() { - if (Tile.clientPreferences.roofsHidden) { // L: 4394 - return Huffman.Client_plane; + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 3213 + if (Client.zoomWidth <= 0) { // L: 3214 + Client.zoomWidth = 320; + } + + return 1; // L: 3215 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3217 + MilliClock.Interpreter_intStackSize -= 4; // L: 3218 + Client.field865 = (short)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 3219 + if (Client.field865 <= 0) { // L: 3220 + Client.field865 = 1; + } + + Client.field753 = (short)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 3221 + if (Client.field753 <= 0) { // L: 3222 + Client.field753 = 32767; + } else if (Client.field753 < Client.field865) { // L: 3223 + Client.field753 = Client.field865; + } + + Client.field937 = (short)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 2]; // L: 3224 + if (Client.field937 <= 0) { // L: 3225 + Client.field937 = 1; + } + + Client.field935 = (short)Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 3]; // L: 3226 + if (Client.field935 <= 0) { // L: 3227 + Client.field935 = 32767; + } else if (Client.field935 < Client.field937) { // L: 3228 + Client.field935 = Client.field937; + } + + return 1; // L: 3229 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3231 + if (Client.viewportWidget != null) { // L: 3232 + Coord.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3233 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3234 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3235 + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3238 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = -1; // L: 3239 + } + + return 1; // L: 3241 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3243 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3244 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3245 + return 1; // L: 3246 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3248 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = InterfaceParent.method1271(Client.field873); // L: 3249 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = InterfaceParent.method1271(Client.field932); // L: 3250 + return 1; // L: 3251 + } else if (var0 == 6220) { // L: 3253 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3254 + return 1; // L: 3255 + } else if (var0 == 6221) { // L: 3257 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 3258 + return 1; // L: 3259 + } else if (var0 == 6222) { // L: 3261 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ItemContainer.canvasWidth; // L: 3262 + return 1; // L: 3263 + } else if (var0 == 6223) { // L: 3265 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = HealthBar.canvasHeight; // L: 3266 + return 1; // L: 3267 } else { - int var0 = ArchiveLoader.getTileHeight(VertexNormal.cameraX, AbstractWorldMapData.cameraZ, Huffman.Client_plane); // L: 4395 - return var0 - FaceNormal.cameraY < 800 && (Tiles.Tiles_renderFlags[Huffman.Client_plane][VertexNormal.cameraX >> 7][AbstractWorldMapData.cameraZ >> 7] & 4) != 0 ? Huffman.Client_plane : 3; // L: 4396 4397 + return 2; // L: 3269 } } - @ObfuscatedName("hq") + @ObfuscatedName("ki") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "31538" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-649676839" ) - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 8116 - Widget var0 = SecureRandomCallable.getWidgetChild(class232.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8117 - if (var0 != null && var0.onTargetLeave != null) { // L: 8118 - ScriptEvent var1 = new ScriptEvent(); // L: 8119 - var1.widget = var0; // L: 8120 - var1.args = var0.onTargetLeave; // L: 8121 - Script.runScriptEvent(var1); // L: 8122 - } + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 11591 + short[] var2 = new short[16]; // L: 11592 + int var3 = 0; // L: 11593 - Client.isSpellSelected = false; // L: 8124 - class52.invalidateWidget(var0); // L: 8125 + for (int var4 = 0; var4 < HealthBar.ItemDefinition_fileCount; ++var4) { // L: 11594 + ItemDefinition var9 = AbstractWorldMapData.ItemDefinition_get(var4); // L: 11595 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11596 11597 11598 + if (var3 >= 250) { // L: 11599 + PendingSpawn.foundItemIdCount = -1; // L: 11600 + Message.foundItemIds = null; // L: 11601 + return; // L: 11602 + } + + if (var3 >= var2.length) { // L: 11604 + short[] var6 = new short[var2.length * 2]; // L: 11605 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 11606 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 11607 + } + + var2[var3++] = (short)var4; // L: 11609 + } } - } // L: 8126 + + Message.foundItemIds = var2; // L: 11611 + AbstractWorldMapIcon.foundItemIndex = 0; // L: 11612 + PendingSpawn.foundItemIdCount = var3; // L: 11613 + String[] var8 = new String[PendingSpawn.foundItemIdCount]; // L: 11614 + + for (int var5 = 0; var5 < PendingSpawn.foundItemIdCount; ++var5) { // L: 11615 + var8[var5] = AbstractWorldMapData.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = Message.foundItemIds; // L: 11616 + Projectile.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11618 + } // L: 11620 + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "([BII)V", + garbageValue = "594289847" + ) + static void method246(byte[] var0, int var1) { + if (Client.randomDatData == null) { // L: 11623 + Client.randomDatData = new byte[24]; + } + + class311.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11624 + } // L: 11625 } diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java index fe3b383669..7ecc790210 100644 --- a/runescape-client/src/main/java/class224.java +++ b/runescape-client/src/main/java/class224.java @@ -1,84 +1,20 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hx") public class class224 { - @ObfuscatedName("z") - public static final short[] field2587; - @ObfuscatedName("k") - public static final short[][] field2589; - @ObfuscatedName("s") - public static final short[] field2584; - @ObfuscatedName("t") - public static final short[][] field2586; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lkf;" - ) - static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("f") + public static final short[] field2570; + @ObfuscatedName("b") + public static final short[][] field2573; + @ObfuscatedName("l") + public static final short[] field2571; + @ObfuscatedName("m") + public static final short[][] field2572; static { - field2587 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field2589 = 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}}; // L: 5 - field2584 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field2586 = 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]}; // L: 13 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([BIIB)Z", - garbageValue = "61" - ) - static final boolean method4117(byte[] var0, int var1, int var2) { - boolean var3 = true; // L: 165 - Buffer var4 = new Buffer(var0); // L: 166 - int var5 = -1; // L: 167 - - label70: - while (true) { - int var6 = var4.method5632(); // L: 169 - if (var6 == 0) { // L: 170 - return var3; // L: 201 - } - - var5 += var6; // L: 171 - int var7 = 0; // L: 172 - boolean var8 = false; // L: 173 - - while (true) { - int var9; - while (!var8) { // L: 175 - var9 = var4.readUShortSmart(); // L: 181 - if (var9 == 0) { // L: 182 - continue label70; - } - - var7 += var9 - 1; // L: 183 - int var10 = var7 & 63; // L: 184 - int var11 = var7 >> 6 & 63; // L: 185 - int var12 = var4.readUnsignedByte() >> 2; // L: 186 - int var13 = var11 + var1; // L: 187 - int var14 = var10 + var2; // L: 188 - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 189 - ObjectDefinition var15 = MidiPcmStream.getObjectDefinition(var5); // L: 190 - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 191 - if (!var15.needsModelFiles()) { // L: 192 - ++Client.field895; // L: 193 - var3 = false; // L: 194 - } - - var8 = true; // L: 196 - } - } - } - - var9 = var4.readUShortSmart(); // L: 176 - if (var9 == 0) { // L: 177 - break; - } - - var4.readUnsignedByte(); // L: 178 - } - } + field2570 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field2573 = 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}}; // L: 5 + field2571 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field2572 = 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]}; // L: 13 } } diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index 6e9bf39483..f931d78912 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,227 +1,15 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("hr") public class class225 { - @ObfuscatedName("rs") - @ObfuscatedGetter( - intValue = -1663268255 - ) - static int field2592; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lic;B)V", - garbageValue = "-88" + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = -1708302407 ) - public static void method4129(AbstractArchive var0) { - EnumDefinition.EnumDefinition_archive = var0; // L: 25 - } // L: 26 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(Lky;II)V", - garbageValue = "2025973106" - ) - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; // L: 189 - if (var2) { // L: 190 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); // L: 191 - Player var4 = Client.players[var1]; // L: 192 - if (var3 == 0) { // L: 193 - if (var2) { // L: 194 - var4.field660 = false; // L: 195 - } else if (Client.localPlayerIndex == var1) { // L: 198 - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (WorldMapManager.baseX + var4.pathX[0] >> 13 << 14) + (WorldMapLabel.baseY + var4.pathY[0] >> 13); // L: 199 - if (var4.field1000 != -1) { // L: 200 - Players.Players_orientations[var1] = var4.field1000; - } else { - Players.Players_orientations[var1] = var4.orientation; // L: 201 - } - - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 202 - Client.players[var1] = null; // L: 203 - if (var0.readBits(1) != 0) { // L: 204 - FileSystem.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { // L: 207 - var5 = var0.readBits(3); // L: 208 - var6 = var4.pathX[0]; // L: 209 - var7 = var4.pathY[0]; // L: 210 - if (var5 == 0) { // L: 211 - --var6; // L: 212 - --var7; // L: 213 - } else if (var5 == 1) { // L: 215 - --var7; - } else if (var5 == 2) { // L: 216 - ++var6; // L: 217 - --var7; // L: 218 - } else if (var5 == 3) { // L: 220 - --var6; - } else if (var5 == 4) { // L: 221 - ++var6; - } else if (var5 == 5) { // L: 222 - --var6; // L: 223 - ++var7; // L: 224 - } else if (var5 == 6) { // L: 226 - ++var7; - } else if (var5 == 7) { // L: 227 - ++var6; // L: 228 - ++var7; // L: 229 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 231 - var4.resetPath(var6, var7); // L: 232 - var4.field660 = false; // L: 233 - } else if (var2) { // L: 235 - var4.field660 = true; // L: 236 - var4.tileX = var6; // L: 237 - var4.tileY = var7; // L: 238 - } else { - var4.field660 = false; // L: 241 - var4.method1286(var6, var7, Players.field1284[var1]); // L: 242 - } - - } else if (var3 == 2) { // L: 246 - var5 = var0.readBits(4); // L: 247 - var6 = var4.pathX[0]; // L: 248 - var7 = var4.pathY[0]; // L: 249 - if (var5 == 0) { // L: 250 - var6 -= 2; // L: 251 - var7 -= 2; // L: 252 - } else if (var5 == 1) { // L: 254 - --var6; // L: 255 - var7 -= 2; // L: 256 - } else if (var5 == 2) { // L: 258 - var7 -= 2; - } else if (var5 == 3) { // L: 259 - ++var6; // L: 260 - var7 -= 2; // L: 261 - } else if (var5 == 4) { // L: 263 - var6 += 2; // L: 264 - var7 -= 2; // L: 265 - } else if (var5 == 5) { // L: 267 - var6 -= 2; // L: 268 - --var7; // L: 269 - } else if (var5 == 6) { // L: 271 - var6 += 2; // L: 272 - --var7; // L: 273 - } else if (var5 == 7) { // L: 275 - var6 -= 2; - } else if (var5 == 8) { // L: 276 - var6 += 2; - } else if (var5 == 9) { // L: 277 - var6 -= 2; // L: 278 - ++var7; // L: 279 - } else if (var5 == 10) { // L: 281 - var6 += 2; // L: 282 - ++var7; // L: 283 - } else if (var5 == 11) { // L: 285 - var6 -= 2; // L: 286 - var7 += 2; // L: 287 - } else if (var5 == 12) { // L: 289 - --var6; // L: 290 - var7 += 2; // L: 291 - } else if (var5 == 13) { // L: 293 - var7 += 2; - } else if (var5 == 14) { // L: 294 - ++var6; // L: 295 - var7 += 2; // L: 296 - } else if (var5 == 15) { // L: 298 - var6 += 2; // L: 299 - var7 += 2; // L: 300 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 302 - var4.resetPath(var6, var7); // L: 303 - var4.field660 = false; // L: 304 - } else if (var2) { // L: 306 - var4.field660 = true; // L: 307 - var4.tileX = var6; // L: 308 - var4.tileY = var7; // L: 309 - } else { - var4.field660 = false; // L: 312 - var4.method1286(var6, var7, Players.field1284[var1]); // L: 313 - } - - } else { - var5 = var0.readBits(1); // L: 317 - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { // L: 318 - var6 = var0.readBits(12); // L: 319 - var7 = var6 >> 10; // L: 320 - var8 = var6 >> 5 & 31; // L: 321 - if (var8 > 15) { // L: 322 - var8 -= 32; - } - - var9 = var6 & 31; // L: 323 - if (var9 > 15) { // L: 324 - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; // L: 325 - var11 = var9 + var4.pathY[0]; // L: 326 - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 327 - if (var2) { // L: 331 - var4.field660 = true; // L: 332 - var4.tileX = var10; // L: 333 - var4.tileY = var11; // L: 334 - } else { - var4.field660 = false; // L: 337 - var4.method1286(var10, var11, Players.field1284[var1]); // L: 338 - } - } else { - var4.resetPath(var10, var11); // L: 328 - var4.field660 = false; // L: 329 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 340 - if (Client.localPlayerIndex == var1) { // L: 341 - Huffman.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); // L: 344 - var7 = var6 >> 28; // L: 345 - var8 = var6 >> 14 & 16383; // L: 346 - var9 = var6 & 16383; // L: 347 - var10 = (var8 + WorldMapManager.baseX + var4.pathX[0] & 16383) - WorldMapManager.baseX; // L: 348 - var11 = (var9 + WorldMapLabel.baseY + var4.pathY[0] & 16383) - WorldMapLabel.baseY; // L: 349 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 350 - var4.resetPath(var10, var11); // L: 351 - var4.field660 = false; // L: 352 - } else if (var2) { // L: 354 - var4.field660 = true; // L: 355 - var4.tileX = var10; // L: 356 - var4.tileY = var11; // L: 357 - } else { - var4.field660 = false; // L: 360 - var4.method1286(var10, var11, Players.field1284[var1]); // L: 361 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 363 - if (Client.localPlayerIndex == var1) { // L: 364 - Huffman.Client_plane = var4.plane; - } - - } - } - } - } // L: 196 205 244 315 342 365 + static int field2576; } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java deleted file mode 100644 index 33eb66604d..0000000000 --- a/runescape-client/src/main/java/class227.java +++ /dev/null @@ -1,171 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hs") -public class class227 { - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 775643589 - ) - public static int ItemDefinition_fileCount; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - static IndexedSprite options_buttons_0Sprite; - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "-636086719" - ) - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 - var1 = (byte)var0; - } else if (var0 == 8364) { // L: 13 - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { // L: 15 - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { // L: 17 - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { // L: 21 - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { // L: 23 - var1 = -117; - } else if (var0 == 338) { // L: 24 - var1 = -116; - } else if (var0 == 381) { // L: 25 - var1 = -114; - } else if (var0 == 8216) { // L: 26 - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { // L: 28 - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { // L: 30 - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { // L: 32 - var1 = -105; - } else if (var0 == 732) { // L: 33 - var1 = -104; - } else if (var0 == 8482) { // L: 34 - var1 = -103; - } else if (var0 == 353) { // L: 35 - var1 = -102; - } else if (var0 == 8250) { // L: 36 - var1 = -101; - } else if (var0 == 339) { // L: 37 - var1 = -100; - } else if (var0 == 382) { // L: 38 - var1 = -98; - } else if (var0 == 376) { // L: 39 - var1 = -97; - } else { - var1 = 63; // L: 40 - } - - return var1; // L: 41 - } - - @ObfuscatedName("z") - public static final void sleepExact(long var0) { - if (var0 > 0L) { // L: 9 - if (0L == var0 % 10L) { // L: 10 - long var2 = var0 - 1L; // L: 11 - - try { - Thread.sleep(var2); // L: 14 - } catch (InterruptedException var8) { // L: 16 - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var7) { // L: 22 - } - } else { - try { - Thread.sleep(var0); // L: 27 - } catch (InterruptedException var6) { // L: 29 - } - } - - } - } // L: 31 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "-330609994" - ) - public static void method4185(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; // L: 18 - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 - } // L: 20 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIZII)J", - garbageValue = "-1245700740" - ) - 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; // L: 80 - if (var3) { // L: 81 - var5 |= 65536L; - } - - return var5; // L: 82 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ler;IIII)Z", - garbageValue = "-319500223" - ) - static final boolean method4186(Model var0, int var1, int var2, int var3) { - if (!class200.method3760()) { // L: 143 - return false; - } else { - PlatformInfo.method6411(); // L: 144 - int var4 = var0.xMid + var1; // L: 145 - int var5 = var2 + var0.yMid; // L: 146 - int var6 = var3 + var0.zMid; // L: 147 - int var7 = var0.xMidOffset; // L: 148 - int var8 = var0.yMidOffset; // L: 149 - int var9 = var0.zMidOffset; // L: 150 - int var10 = ViewportMouse.field1768 - var4; // L: 151 - int var11 = class217.field2537 - var5; // L: 152 - int var12 = ViewportMouse.field1769 - var6; // L: 153 - if (Math.abs(var10) > var7 + class3.field25) { // L: 154 - return false; // L: 155 - } else if (Math.abs(var11) > var8 + class234.field3100) { // L: 157 - return false; // L: 158 - } else if (Math.abs(var12) > var9 + ViewportMouse.field1771) { // L: 160 - return false; // L: 161 - } else if (Math.abs(var12 * WorldMapSectionType.field178 - var11 * ViewportMouse.field1770) > var9 * class234.field3100 + var8 * ViewportMouse.field1771) { // L: 163 - return false; // L: 164 - } else if (Math.abs(var10 * ViewportMouse.field1770 - var12 * SpriteMask.field2552) > var7 * ViewportMouse.field1771 + var9 * class3.field25) { // L: 166 - return false; // L: 167 - } else { - return Math.abs(var11 * SpriteMask.field2552 - var10 * WorldMapSectionType.field178) <= var8 * class3.field25 + var7 * class234.field3100; // L: 169 - } - } - } -} diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java index 6427762404..5e4b33086b 100644 --- a/runescape-client/src/main/java/class228.java +++ b/runescape-client/src/main/java/class228.java @@ -1,23 +1,105 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hc") public class class228 { - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II)I", - garbageValue = "-541975328" + descriptor = "(II)V", + garbageValue = "-1970011251" ) - public static int method4190(CharSequence var0, int var1) { - return UserComparator7.parseIntCustomRadix(var0, var1, true); // L: 71 - } + public static void method4246(int var0) { + MouseHandler.MouseHandler_idleCycles = var0; // L: 51 + } // L: 52 - @ObfuscatedName("bj") + @ObfuscatedName("jy") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1840634740" + descriptor = "(Lht;III)V", + garbageValue = "-615693889" ) - public static int method4189(String var0) { - return var0.length() + 2; // L: 130 - } + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10844 + if (var0 != null) { // L: 10846 + Widget var5 = var0; // L: 10850 + int var7 = WorldMapData_0.getWidgetFlags(var0); // L: 10853 + int var6 = var7 >> 17 & 7; // L: 10855 + int var8 = var6; // L: 10857 + Widget var4; + int var9; + if (var6 == 0) { // L: 10858 + var4 = null; // L: 10859 + } else { + var9 = 0; + + while (true) { + if (var9 >= var8) { + var4 = var5; // L: 10869 + break; + } + + var5 = UserComparator4.getWidget(var5.parentId); // L: 10863 + if (var5 == null) { // L: 10864 + var4 = null; // L: 10865 + break; // L: 10866 + } + + ++var9; // L: 10862 + } + } + + Widget var10 = var4; // L: 10871 + if (var4 == null) { // L: 10872 + var10 = var0.parent; + } + + if (var10 != null) { // L: 10875 + Client.clickedWidget = var0; // L: 10879 + var5 = var0; // L: 10883 + var7 = WorldMapData_0.getWidgetFlags(var0); // L: 10886 + var6 = var7 >> 17 & 7; // L: 10888 + var8 = var6; // L: 10890 + if (var6 == 0) { // L: 10891 + var4 = null; // L: 10892 + } else { + var9 = 0; + + while (true) { + if (var9 >= var8) { + var4 = var5; // L: 10902 + break; + } + + var5 = UserComparator4.getWidget(var5.parentId); // L: 10896 + if (var5 == null) { // L: 10897 + var4 = null; // L: 10898 + break; // L: 10899 + } + + ++var9; // L: 10895 + } + } + + var10 = var4; // L: 10904 + if (var4 == null) { // L: 10905 + var10 = var0.parent; + } + + Client.clickedWidgetParent = var10; // L: 10908 + Client.widgetClickX = var1; // L: 10909 + Client.widgetClickY = var2; // L: 10910 + GrandExchangeEvent.widgetDragDuration = 0; // L: 10911 + Client.isDraggingWidget = false; // L: 10912 + int var11 = FileSystem.method3638(); // L: 10913 + if (var11 != -1) { // L: 10914 + AbstractByteArrayCopier.method4087(var11); + } + + return; // L: 10915 + } + } + + } + } // L: 10877 } diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index e68c849144..c48529f410 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -1,11 +1,256 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("b") +@ObfuscatedName("g") public class class23 { - @ObfuscatedName("ez") - @ObfuscatedGetter( - intValue = 121218585 + @ObfuscatedName("qi") + @ObfuscatedSignature( + descriptor = "Ldh;" ) - static int port2; + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive17") + static Archive archive17; + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "2075504300" + ) + static boolean method251(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { // L: 807 + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { // L: 808 + return true; + } + } + + return false; // L: 810 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "38" + ) + public static final void method252() { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 78 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 79 + } // L: 80 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-504519930" + ) + static int method249(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1259 + var5 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 1260 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var5.itemId; // L: 1261 + return 1; // L: 1262 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1264 + var5 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 1265 + if (var5.itemId != -1) { // L: 1266 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1267 + } + + return 1; // L: 1268 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1270 + int var3 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 1271 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1272 + if (var4 != null) { // L: 1273 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = 0; // L: 1274 + } + + return 1; // L: 1275 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1277 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1278 + return 1; // L: 1279 + } else { + return 2; // L: 1281 + } + } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1423787338" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + ItemDefinition.method4874(); // L: 11119 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11121 + if (var1.obj != null) { // L: 11122 + var1.set(); + } + } + + int var4 = PendingSpawn.VarpDefinition_get(var0).type; // L: 11125 + if (var4 != 0) { // L: 11126 + int var2 = Varps.Varps_main[var0]; // L: 11127 + if (var4 == 1) { // L: 11128 + if (var2 == 1) { // L: 11129 + Rasterizer3D.Rasterizer3D_setBrightness(0.9D); // L: 11130 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); // L: 11131 + } + + if (var2 == 2) { // L: 11133 + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 11134 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); // L: 11135 + } + + if (var2 == 3) { // L: 11137 + Rasterizer3D.Rasterizer3D_setBrightness(0.7D); // L: 11138 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); // L: 11139 + } + + if (var2 == 4) { // L: 11141 + Rasterizer3D.Rasterizer3D_setBrightness(0.6D); // L: 11142 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); // L: 11143 + } + + ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 11146 + } + + if (var4 == 3) { // L: 11149 + short var3 = 0; // L: 11150 + if (var2 == 0) { // L: 11151 + var3 = 255; + } + + if (var2 == 1) { // L: 11152 + var3 = 192; + } + + if (var2 == 2) { // L: 11153 + var3 = 128; + } + + if (var2 == 3) { // L: 11154 + var3 = 64; + } + + if (var2 == 4) { // L: 11155 + var3 = 0; + } + + if (var3 != Client.musicVolume) { // L: 11156 + if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11157 + Canvas.method952(ApproximateRouteStrategy.archive6, Client.currentTrackGroupId, 0, var3, false); // L: 11158 + Client.field916 = false; // L: 11159 + } else if (var3 == 0) { // L: 11161 + class13.midiPcmStream.clear(); // L: 11163 + class206.musicPlayerStatus = 1; // L: 11164 + musicTrackArchive = null; // L: 11165 + Client.field916 = false; // L: 11167 + } else { + FontName.method5459(var3); // L: 11169 + } + + Client.musicVolume = var3; // L: 11170 + } + } + + if (var4 == 4) { // L: 11173 + if (var2 == 0) { // L: 11174 + Client.soundEffectVolume = 127; + } + + if (var2 == 1) { // L: 11175 + Client.soundEffectVolume = 96; + } + + if (var2 == 2) { // L: 11176 + Client.soundEffectVolume = 64; + } + + if (var2 == 3) { // L: 11177 + Client.soundEffectVolume = 32; + } + + if (var2 == 4) { // L: 11178 + Client.soundEffectVolume = 0; + } + } + + if (var4 == 5) { // L: 11180 + Client.leftClickOpensMenu = var2; + } + + if (var4 == 6) { // L: 11181 + Client.chatEffects = var2; + } + + if (var4 == 9) { // L: 11182 + Client.field846 = var2; + } + + if (var4 == 10) { // L: 11183 + if (var2 == 0) { // L: 11184 + Client.areaSoundEffectVolume = 127; + } + + if (var2 == 1) { // L: 11185 + Client.areaSoundEffectVolume = 96; + } + + if (var2 == 2) { // L: 11186 + Client.areaSoundEffectVolume = 64; + } + + if (var2 == 3) { // L: 11187 + Client.areaSoundEffectVolume = 32; + } + + if (var2 == 4) { // L: 11188 + Client.areaSoundEffectVolume = 0; + } + } + + if (var4 == 17) { // L: 11190 + Client.followerIndex = var2 & 65535; // L: 11191 + } + + if (var4 == 18) { // L: 11193 + Client.playerAttackOption = (AttackOption)class195.findEnumerated(SoundSystem.method2631(), var2); // L: 11194 + if (Client.playerAttackOption == null) { // L: 11195 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var4 == 19) { // L: 11197 + if (var2 == -1) { // L: 11198 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 11199 + } + } + + if (var4 == 22) { // L: 11201 + AttackOption[] var5 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; // L: 11204 + Client.npcAttackOption = (AttackOption)class195.findEnumerated(var5, var2); // L: 11206 + if (Client.npcAttackOption == null) { // L: 11207 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 11209 } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index 703ea7af61..15a113e800 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,102 +1,8 @@ +import java.awt.Image; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hd") public class class231 { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - static AbstractArchive ItemDefinition_archive; - - @ObfuscatedName("ft") - @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "1537075351" - ) - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 4175 - var2 = 1; - } - - if (var3 < 1) { // L: 4176 - var3 = 1; - } - - int var5 = var3 - 334; // L: 4177 - int var6; - if (var5 < 0) { // L: 4179 - var6 = Client.field769; - } else if (var5 >= 100) { // L: 4180 - var6 = Client.field928; - } else { - var6 = (Client.field928 - Client.field769) * var5 / 100 + Client.field769; // L: 4181 - } - - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4182 - int var8; - int var9; - short var18; - if (var7 < Client.field938) { // L: 4183 - var18 = Client.field938; // L: 4184 - var6 = var18 * var2 * 334 / (var3 * 512); // L: 4185 - if (var6 > Client.field932) { // L: 4186 - var6 = Client.field932; // L: 4187 - var8 = var3 * var6 * 512 / (var18 * 334); // L: 4188 - var9 = (var2 - var8) / 2; // L: 4189 - if (var4) { // L: 4190 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4191 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4192 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4193 - } - - var0 += var9; // L: 4195 - var2 -= var9 * 2; // L: 4196 - } - } else if (var7 > Client.field934) { // L: 4199 - var18 = Client.field934; // L: 4200 - var6 = var18 * var2 * 334 / (var3 * 512); // L: 4201 - if (var6 < Client.field931) { // L: 4202 - var6 = Client.field931; // L: 4203 - var8 = var18 * var2 * 334 / (var6 * 512); // L: 4204 - var9 = (var3 - var8) / 2; // L: 4205 - if (var4) { // L: 4206 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4207 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4208 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4209 - } - - var1 += var9; // L: 4211 - var3 -= var9 * 2; // L: 4212 - } - } - - Client.viewportZoom = var3 * var6 / 334; // L: 4215 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4216 - int[] var17 = new int[9]; // L: 4218 - - for (var9 = 0; var9 < var17.length; ++var9) { // L: 4219 - int var10 = var9 * 32 + 15 + 128; // L: 4220 - int var11 = var10 * 3 + 600; // L: 4223 - int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4226 - int var15 = var3 - 334; // L: 4229 - if (var15 < 0) { // L: 4230 - var15 = 0; - } else if (var15 > 100) { // L: 4231 - var15 = 100; - } - - int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight; // L: 4232 - int var14 = var11 * var16 / 256; // L: 4233 - var17[var9] = var13 * var14 >> 16; // L: 4236 - } - - Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334); // L: 4238 - } - - Client.viewportOffsetX = var0; // L: 4241 - Client.viewportOffsetY = var1; // L: 4242 - Client.viewportWidth = var2; // L: 4243 - Client.viewportHeight = var3; // L: 4244 - } // L: 4245 + @ObfuscatedName("az") + static Image field2779; } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 98b3513597..a26f5f3a78 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -1,11 +1,29 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("hw") +@ObfuscatedName("hg") public class class232 { - @ObfuscatedName("mx") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -149215753 + intValue = -11600427 ) - static int selectedSpellWidget; + static int field2780; + + static { + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class238[] var2 = class8.method116(); // L: 12 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 + class238 var4 = var2[var3]; // L: 14 + if (var4.field3112 > var0) { + var0 = var4.field3112; // L: 16 + } + + if (var4.field3117 > var1) { // L: 17 + var1 = var4.field3117; + } + } + + } // L: 21 } diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 781271d46f..2d480455cf 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -1,23 +1,53 @@ -import net.runelite.mapping.ObfuscatedGetter; +import java.util.Iterator; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("is") public class class234 { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 710753405 - ) - static int field3100; - - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;I)Lls;", - garbageValue = "246084812" + descriptor = "(IS)Lia;", + garbageValue = "-3621" ) - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 142 - int var4 = var0.getFileId(var3, var2); // L: 143 - return WorldMapRegion.method611(var0, var3, var4); // L: 144 + public static FloorUnderlayDefinition method4260(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 27 + var1 = new FloorUnderlayDefinition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); // L: 30 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 31 + return var1; // L: 32 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "4" + ) + public static void method4261() { + VarbitDefinition.VarbitDefinition_cached.clear(); // L: 34 + } // L: 35 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "969326800" + ) + static String method4262() { + String var0 = ""; // L: 84 + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { // L: 85 88 + var2 = (Message)var1.next(); // L: 86 + } + + return var0; // L: 91 } } diff --git a/runescape-client/src/main/java/class235.java b/runescape-client/src/main/java/class235.java deleted file mode 100644 index 49740914a4..0000000000 --- a/runescape-client/src/main/java/class235.java +++ /dev/null @@ -1,35 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iz") -public class class235 { - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "[Llp;" - ) - static Sprite[] mapDotSprites; - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" - ) - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 3836 - if (WorldMapSprite.loadInterface(var0)) { // L: 3837 - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 3838 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 3839 - Widget var3 = var1[var2]; // L: 3840 - if (var3.onLoad != null) { // L: 3841 - ScriptEvent var4 = new ScriptEvent(); // L: 3842 - var4.widget = var3; // L: 3843 - var4.args = var3.onLoad; // L: 3844 - class280.runScript(var4, 5000000); // L: 3845 - } - } - - } - } - } // L: 3848 -} diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java new file mode 100644 index 0000000000..c30faa6cea --- /dev/null +++ b/runescape-client/src/main/java/class236.java @@ -0,0 +1,54 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ip") +public final class class236 { + @ObfuscatedName("dt") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive7") + static Archive archive7; + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lid;II)V", + garbageValue = "-237601579" + ) + static void method4263(Archive var0, int var1) { + if (class90.NetCache_reference != null) { // L: 211 + class90.NetCache_reference.offset = var1 * 8 + 5; // L: 212 + int var2 = class90.NetCache_reference.readInt(); // L: 213 + int var3 = class90.NetCache_reference.readInt(); // L: 214 + var0.loadIndex(var2, var3); // L: 215 + } else { + VarcInt.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 218 + NetCache.NetCache_archives[var1] = var0; // L: 219 + } + } // L: 216 220 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1381808682" + ) + public static int method4264() { + return KeyHandler.KeyHandler_idleCycles; // L: 193 + } + + @ObfuscatedName("fx") + @ObfuscatedSignature( + descriptor = "(Lcs;B)V", + garbageValue = "-118" + ) + static final void method4265(Actor var0) { + int var1 = Math.max(1, var0.field1009 - Client.cycle); // L: 4094 + int var2 = var0.field1011 * 64 + var0.field1017 * 128; // L: 4095 + int var3 = var0.field1011 * 64 + var0.field1019 * 128; // L: 4096 + var0.x += (var2 - var0.x) / var1; // L: 4097 + var0.y += (var3 - var0.y) / var1; // L: 4098 + var0.field978 = 0; // L: 4099 + var0.orientation = var0.field1023; // L: 4100 + } // L: 4101 +} diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java index c52d53ed3d..d79f316025 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class237.java @@ -1,6 +1,6 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("if") +@ObfuscatedName("im") public class class237 { static { Math.sqrt(8192.0D); // L: 9 diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java new file mode 100644 index 0000000000..489bc18237 --- /dev/null +++ b/runescape-client/src/main/java/class238.java @@ -0,0 +1,343 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ih") +public class class238 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lih;" + ) + static final class238 field3116; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lih;" + ) + static final class238 field3113; + @ObfuscatedName("e") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -537874473 + ) + final int field3112; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 397493923 + ) + final int field3117; + + static { + field3116 = new class238(51, 27, 800, 0, 16, 16); // L: 29 + field3113 = new class238(25, 28, 800, 656, 40, 40); // L: 30 + } + + class238(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field3112 = var5; // L: 39 + this.field3117 = var6; // L: 40 + } // L: 41 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1821590309" + ) + static final void method4271() { + if (!ViewportMouse.ViewportMouse_false0) { // L: 95 + int var0 = Scene.Scene_cameraPitchSine; // L: 96 + int var1 = Scene.Scene_cameraPitchCosine; // L: 97 + int var2 = Scene.Scene_cameraYawSine; // L: 98 + int var3 = Scene.Scene_cameraYawCosine; // L: 99 + byte var4 = 50; // L: 100 + short var5 = 3500; // L: 101 + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 102 + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 103 + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 104 + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 105 + int var10 = Rasterizer3D.method3196(var7, var4, var1, var0); // L: 107 + int var11 = Rasterizer3D.method3161(var7, var4, var1, var0); // L: 108 + var7 = var10; // L: 109 + var10 = Rasterizer3D.method3196(var9, var5, var1, var0); // L: 110 + int var12 = Rasterizer3D.method3161(var9, var5, var1, var0); // L: 111 + var9 = var10; // L: 112 + var10 = Rasterizer3D.method3158(var6, var11, var3, var2); // L: 113 + var11 = Rasterizer3D.method3159(var6, var11, var3, var2); // L: 114 + var6 = var10; // L: 115 + var10 = Rasterizer3D.method3158(var8, var12, var3, var2); // L: 116 + var12 = Rasterizer3D.method3159(var8, var12, var3, var2); // L: 117 + ViewportMouse.field1770 = (var6 + var10) / 2; // L: 119 + WorldMapEvent.field377 = (var9 + var7) / 2; // L: 120 + ViewportMouse.field1768 = (var12 + var11) / 2; // L: 121 + ViewportMouse.field1771 = (var10 - var6) / 2; // L: 122 + GrandExchangeOfferTotalQuantityComparator.field81 = (var9 - var7) / 2; // L: 123 + SecureRandomCallable.field553 = (var12 - var11) / 2; // L: 124 + class1.field3 = Math.abs(ViewportMouse.field1771); // L: 125 + ItemContainer.field570 = Math.abs(GrandExchangeOfferTotalQuantityComparator.field81); // L: 126 + ViewportMouse.field1772 = Math.abs(SecureRandomCallable.field553); // L: 127 + } + } // L: 128 + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1256117842" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 550 + if (WorldMapSection2.garbageCollector == null || !WorldMapSection2.garbageCollector.isValid()) { // L: 551 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 553 + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 554 + if (var2.isValid()) { // L: 556 + WorldMapSection2.garbageCollector = var2; // L: 557 + GameShell.garbageCollectorLastCheckTimeMs = -1L; // L: 558 + GameShell.garbageCollectorLastCollectionTime = -1L; // L: 559 + } + } + } catch (Throwable var11) { // L: 564 + } + } + + if (WorldMapSection2.garbageCollector != null) { // L: 566 + long var9 = User.currentTimeMillis(); // L: 567 + long var3 = WorldMapSection2.garbageCollector.getCollectionTime(); // L: 568 + if (-1L != GameShell.garbageCollectorLastCollectionTime) { // L: 569 + long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; // L: 570 + long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; // L: 571 + if (0L != var7) { // L: 572 + var0 = (int)(var5 * 100L / var7); + } + } + + GameShell.garbageCollectorLastCollectionTime = var3; // L: 574 + GameShell.garbageCollectorLastCheckTimeMs = var9; // L: 575 + } + + return var0; // L: 577 + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(Lht;IIB)V", + garbageValue = "-13" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 10117 + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10118 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10121 + var3 = PendingSpawn.Widget_getSpellActionName(var0); // L: 10122 + if (var3 != null) { // L: 10123 + ModelData0.insertMenuItemNoShift(var3, Client.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10124 + } + } + + if (var0.buttonType == 3) { // L: 10128 + ModelData0.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10129 + } + + if (var0.buttonType == 4) { // L: 10132 + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10133 + } + + if (var0.buttonType == 5) { // L: 10136 + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10137 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10140 + ModelData0.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10141 + } + + int var4; + int var6; + int var7; + int var19; + if (var0.type == 2) { // L: 10144 + var19 = 0; // L: 10145 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 10146 + for (int var21 = 0; var21 < var0.width; ++var21) { // L: 10147 + var6 = (var0.paddingX + 32) * var21; // L: 10148 + var7 = (var0.paddingY + 32) * var4; // L: 10149 + if (var19 < 20) { // L: 10150 + var6 += var0.inventoryXOffsets[var19]; // L: 10151 + var7 += var0.inventoryYOffsets[var19]; // L: 10152 + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 10154 + Client.dragItemSlotDestination = var19; // L: 10155 + class217.hoveredItemContainer = var0; // L: 10156 + if (var0.itemIds[var19] > 0) { // L: 10157 + label386: { + ItemDefinition var8 = AbstractWorldMapData.ItemDefinition_get(var0.itemIds[var19] - 1); // L: 10158 + boolean var9; + int var10; + if (Client.isItemSelected == 1) { // L: 10160 + var10 = WorldMapData_0.getWidgetFlags(var0); // L: 10162 + var9 = (var10 >> 30 & 1) != 0; // L: 10164 + if (var9) { // L: 10166 + if (var0.id != SpotAnimationDefinition.selectedItemWidget || var19 != InvDefinition.selectedItemSlot) { // L: 10167 + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + Client.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); // L: 10168 + } + break label386; + } + } + + if (Client.isSpellSelected) { // L: 10175 + var10 = WorldMapData_0.getWidgetFlags(var0); // L: 10177 + var9 = (var10 >> 30 & 1) != 0; // L: 10179 + if (var9) { // L: 10181 + if ((class105.selectedSpellFlags & 16) == 16) { // L: 10182 + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + Client.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); // L: 10183 + } + break label386; + } + } + + String[] var23 = var8.inventoryActions; // L: 10189 + var10 = -1; // L: 10190 + boolean var11; + if (Client.shiftClickDrop) { // L: 10191 + var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10194 + if (var11) { // L: 10196 + var10 = var8.getShiftClickIndex(); // L: 10197 + } + } + + int var12 = WorldMapData_0.getWidgetFlags(var0); // L: 10201 + var11 = (var12 >> 30 & 1) != 0; // L: 10203 + if (var11) { // L: 10205 + for (int var13 = 4; var13 >= 3; --var13) { // L: 10206 + if (var13 != var10) { // L: 10207 + SecureRandomCallable.addWidgetItemMenuItem(var0, var8, var19, var13, false); // L: 10208 + } + } + } + + int var14 = WorldMapData_0.getWidgetFlags(var0); // L: 10212 + boolean var25 = (var14 >> 31 & 1) != 0; // L: 10214 + if (var25) { // L: 10216 + ModelData0.insertMenuItemNoShift("Use", Client.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); // L: 10217 + } + + int var16 = WorldMapData_0.getWidgetFlags(var0); // L: 10221 + boolean var15 = (var16 >> 30 & 1) != 0; // L: 10223 + int var17; + if (var15) { // L: 10225 + for (var17 = 2; var17 >= 0; --var17) { // L: 10226 + if (var10 != var17) { // L: 10227 + SecureRandomCallable.addWidgetItemMenuItem(var0, var8, var19, var17, false); // L: 10228 + } + } + + if (var10 >= 0) { // L: 10230 + SecureRandomCallable.addWidgetItemMenuItem(var0, var8, var19, var10, true); // L: 10231 + } + } + + var23 = var0.itemActions; // L: 10234 + if (var23 != null) { // L: 10235 + for (var17 = 4; var17 >= 0; --var17) { // L: 10236 + if (var23[var17] != null) { // L: 10237 + byte var18 = 0; // L: 10238 + if (var17 == 0) { // L: 10239 + var18 = 39; + } + + if (var17 == 1) { // L: 10240 + var18 = 40; + } + + if (var17 == 2) { // L: 10241 + var18 = 41; + } + + if (var17 == 3) { // L: 10242 + var18 = 42; + } + + if (var17 == 4) { // L: 10243 + var18 = 43; + } + + ModelData0.insertMenuItemNoShift(var23[var17], Client.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); // L: 10244 + } + } + } + + ModelData0.insertMenuItemNoShift("Examine", Client.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); // L: 10249 + } + } + } + + ++var19; // L: 10255 + } + } + } + + if (var0.isIf3) { // L: 10259 + if (Client.isSpellSelected) { // L: 10260 + var4 = WorldMapData_0.getWidgetFlags(var0); // L: 10262 + boolean var26 = (var4 >> 21 & 1) != 0; // L: 10264 + if (var26 && (class105.selectedSpellFlags & 32) == 32) { // L: 10266 + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10267 + } + } else { + for (var19 = 9; var19 >= 5; --var19) { // L: 10272 + var6 = WorldMapData_0.getWidgetFlags(var0); // L: 10276 + boolean var27 = (var6 >> var19 + 1 & 1) != 0; // L: 10278 + String var22; + if (!var27 && var0.onOp == null) { // L: 10280 + var22 = null; // L: 10281 + } else if (var0.actions != null && var0.actions.length > var19 && var0.actions[var19] != null && var0.actions[var19].trim().length() != 0) { // L: 10284 + var22 = var0.actions[var19]; // L: 10288 + } else { + var22 = null; // L: 10285 + } + + if (var22 != null) { // L: 10291 + ModelData0.insertMenuItemNoShift(var22, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); // L: 10292 + } + } + + var3 = PendingSpawn.Widget_getSpellActionName(var0); // L: 10296 + if (var3 != null) { // L: 10297 + ModelData0.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10298 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 10301 + var7 = WorldMapData_0.getWidgetFlags(var0); // L: 10305 + boolean var24 = (var7 >> var4 + 1 & 1) != 0; // L: 10307 + String var5; + if (!var24 && var0.onOp == null) { // L: 10309 + var5 = null; // L: 10310 + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10313 + var5 = var0.actions[var4]; // L: 10317 + } else { + var5 = null; // L: 10314 + } + + if (var5 != null) { // L: 10320 + KeyHandler.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10321 + } + } + + if (class195.Widget_hasContinueOption(WorldMapData_0.getWidgetFlags(var0))) { // L: 10325 + ModelData0.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10326 + } + } + } + + } // L: 10331 +} diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java deleted file mode 100644 index 9f36539318..0000000000 --- a/runescape-client/src/main/java/class247.java +++ /dev/null @@ -1,232 +0,0 @@ -import java.util.HashMap; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("id") -public class class247 { - @ObfuscatedName("z") - final HashMap spriteMap; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Llr;" - ) - Bounds bounds; - @ObfuscatedName("s") - int[] field3214; - @ObfuscatedName("t") - int[] field3213; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1401897115 - ) - int field3216; - - public class247() { - this.spriteMap = new HashMap(); // L: 10 - this.bounds = new Bounds(0, 0); // L: 11 - this.field3214 = new int[2048]; // L: 12 - this.field3213 = new int[2048]; // L: 13 - this.field3216 = 0; // L: 14 - class7.field39 = new int[2000]; // L: 22 - int var1 = 0; // L: 23 - int var2 = 240; // L: 24 - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25 - var4 = Frames.method3395((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var1 / 16.0F)); // L: 27 - class7.field39[var1] = var4; // L: 28 - ++var1; // L: 26 - } - - var2 = 48; // L: 30 - - for (int var6 = var2 / 6; var1 < class7.field39.length; var2 -= var6) { // L: 31 32 38 - var4 = var1 * 2; // L: 33 - - for (int var5 = Frames.method3395((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class7.field39.length; ++var1) { // L: 34 35 - class7.field39[var1] = var5; // L: 36 - } - } - - } // L: 41 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" - ) - void method4415(int var1) { - int var2 = var1 * 2 + 1; // L: 44 - double[] var3 = Client.method1378(0.0D, (double)((float)var1 / 3.0F), var1); // L: 45 - double var4 = var3[var1] * var3[var1]; // L: 46 - int[] var6 = new int[var2 * var2]; // L: 47 - boolean var7 = false; // L: 48 - - for (int var8 = 0; var8 < var2; ++var8) { // L: 49 - for (int var9 = 0; var9 < var2; ++var9) { // L: 50 - int var10 = var6[var9 + var8 * var2] = (int)(256.0D * (var3[var9] * var3[var8] / var4)); // L: 51 - if (!var7 && var10 > 0) { // L: 52 - var7 = true; // L: 53 - } - } - } - - Sprite var11 = new Sprite(var6, var2, var2); // L: 57 - this.spriteMap.put(var1, var11); // L: 58 - } // L: 59 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)Llp;", - garbageValue = "1281699730" - ) - Sprite method4412(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 62 - this.method4415(var1); // L: 63 - } - - return (Sprite)this.spriteMap.get(var1); // L: 65 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-58" - ) - public final void method4423(int var1, int var2) { - if (this.field3216 < this.field3214.length) { // L: 69 - this.field3214[this.field3216] = var1; // L: 70 - this.field3213[this.field3216] = var2; // L: 71 - ++this.field3216; // L: 72 - } - } // L: 73 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1013360647" - ) - public final void method4414() { - this.field3216 = 0; // L: 76 - } // L: 77 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IILlp;FB)V", - garbageValue = "3" - ) - public final void method4410(int var1, int var2, Sprite var3, float var4) { - int var5 = (int)(18.0F * var4); // L: 80 - Sprite var6 = this.method4412(var5); // L: 81 - int var7 = var5 * 2 + 1; // L: 82 - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 83 - Bounds var9 = new Bounds(0, 0); // L: 84 - this.bounds.setHigh(var7, var7); // L: 85 - System.nanoTime(); // L: 86 - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3216; ++var10) { // L: 87 - var11 = this.field3214[var10]; // L: 88 - var12 = this.field3213[var10]; // L: 89 - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 90 - int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 91 - this.bounds.setLow(var13, var14); // L: 92 - this.bounds.method6089(var8, var9); // L: 93 - this.method4416(var6, var3, var9); // L: 94 - } - - System.nanoTime(); // L: 96 - System.nanoTime(); // L: 97 - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 98 - if (var3.pixels[var10] == 0) { // L: 99 - var3.pixels[var10] = -16777216; // L: 100 - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 103 - if (var11 <= 0) { // L: 104 - var3.pixels[var10] = -16777216; // L: 105 - } else { - if (var11 > class7.field39.length) { // L: 108 - var11 = class7.field39.length; - } - - var12 = class7.field39[var11 - 1]; // L: 109 - var3.pixels[var10] = -16777216 | var12; // L: 110 - } - } - } - - System.nanoTime(); // L: 112 - } // L: 113 - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Llp;Llp;Llr;B)V", - garbageValue = "-42" - ) - void method4416(Sprite var1, Sprite var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 116 - int var4 = 0; // L: 117 - int var5 = 0; // L: 118 - if (var3.lowX == 0) { // L: 119 - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { // L: 120 - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; // L: 121 - int var7 = var3.lowX + var2.subWidth * var3.lowY; // L: 122 - - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 123 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 124 - int[] var10000 = var2.pixels; // L: 125 - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; // L: 127 - var7 += var2.subWidth - var3.highX; // L: 128 - } - - } - } // L: 130 - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(Lhq;Ljq;IIZB)V", - garbageValue = "0" - ) - static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 9431 - byte var6 = -1; // L: 9432 - String var7 = null; // L: 9433 - if (var5 != null && var5[var3] != null) { // L: 9434 - if (var3 == 0) { // L: 9435 - var6 = 33; - } else if (var3 == 1) { // L: 9436 - var6 = 34; - } else if (var3 == 2) { // L: 9437 - var6 = 35; - } else if (var3 == 3) { // L: 9438 - var6 = 36; - } else { - var6 = 37; // L: 9439 - } - - var7 = var5[var3]; // L: 9440 - } else if (var3 == 4) { // L: 9443 - var6 = 37; // L: 9444 - var7 = "Drop"; // L: 9445 - } - - if (var6 != -1 && var7 != null) { // L: 9448 - Tiles.insertMenuItem(var7, WorldMapAreaData.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 9449 - } - - } // L: 9451 -} diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java new file mode 100644 index 0000000000..43975f0ae5 --- /dev/null +++ b/runescape-client/src/main/java/class248.java @@ -0,0 +1,192 @@ +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("iq") +public class class248 { + @ObfuscatedName("u") + static int[] field3216; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Leg;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("n") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("f") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("l") + int[] field3210; + @ObfuscatedName("m") + int[] field3212; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1614329319 + ) + int field3214; + + public class248() { + this.spriteMap = new HashMap(); // L: 10 + this.bounds = new Bounds(0, 0); // L: 11 + this.field3210 = new int[2048]; // L: 12 + this.field3212 = new int[2048]; // L: 13 + this.field3214 = 0; // L: 14 + PacketBufferNode.method3768(); // L: 21 + } // L: 22 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-960390847" + ) + void method4472(int var1) { + int var2 = var1 * 2 + 1; // L: 46 + double[] var3 = Archive.method4445(0.0D, (double)((float)var1 / 3.0F), var1); // L: 47 + double var4 = var3[var1] * var3[var1]; // L: 48 + int[] var6 = new int[var2 * var2]; // L: 49 + boolean var7 = false; // L: 50 + + for (int var8 = 0; var8 < var2; ++var8) { // L: 51 + for (int var9 = 0; var9 < var2; ++var9) { // L: 52 + int var10 = var6[var9 + var8 * var2] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); // L: 53 + if (!var7 && var10 > 0) { // L: 54 + var7 = true; // L: 55 + } + } + } + + Sprite var11 = new Sprite(var6, var2, var2); // L: 59 + this.spriteMap.put(var1, var11); // L: 60 + } // L: 61 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(II)Llc;", + garbageValue = "1266385077" + ) + Sprite method4462(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 64 + this.method4472(var1); // L: 65 + } + + return (Sprite)this.spriteMap.get(var1); // L: 67 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1246145688" + ) + public final void method4465(int var1, int var2) { + if (this.field3214 < this.field3210.length) { // L: 71 + this.field3210[this.field3214] = var1; // L: 72 + this.field3212[this.field3214] = var2; // L: 73 + ++this.field3214; // L: 74 + } + } // L: 75 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-996206995" + ) + public final void method4466() { + this.field3214 = 0; // L: 78 + } // L: 79 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IILlc;FB)V", + garbageValue = "-60" + ) + public final void method4475(int var1, int var2, Sprite var3, float var4) { + int var5 = (int)(18.0F * var4); // L: 82 + Sprite var6 = this.method4462(var5); // L: 83 + int var7 = var5 * 2 + 1; // L: 84 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 85 + Bounds var9 = new Bounds(0, 0); // L: 86 + this.bounds.setHigh(var7, var7); // L: 87 + System.nanoTime(); // L: 88 + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3214; ++var10) { // L: 89 + var11 = this.field3210[var10]; // L: 90 + var12 = this.field3212[var10]; // L: 91 + int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 92 + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 93 + this.bounds.setLow(var13, var14); // L: 94 + this.bounds.method6129(var8, var9); // L: 95 + this.method4468(var6, var3, var9); // L: 96 + } + + System.nanoTime(); // L: 98 + System.nanoTime(); // L: 99 + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 100 + if (var3.pixels[var10] == 0) { // L: 101 + var3.pixels[var10] = -16777216; // L: 102 + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 105 + if (var11 <= 0) { // L: 106 + var3.pixels[var10] = -16777216; // L: 107 + } else { + if (var11 > field3216.length) { // L: 110 + var11 = field3216.length; + } + + var12 = field3216[var11 - 1]; // L: 111 + var3.pixels[var10] = -16777216 | var12; // L: 112 + } + } + } + + System.nanoTime(); // L: 114 + } // L: 115 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Llc;Llc;Llw;I)V", + garbageValue = "258819118" + ) + void method4468(Sprite var1, Sprite var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 118 + int var4 = 0; // L: 119 + int var5 = 0; // L: 120 + if (var3.lowX == 0) { // L: 121 + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { // L: 122 + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; // L: 123 + int var7 = var3.lowX + var2.subWidth * var3.lowY; // L: 124 + + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 125 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 126 + int[] var10000 = var2.pixels; // L: 127 + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; // L: 129 + var7 += var2.subWidth - var3.highX; // L: 130 + } + + } + } // L: 132 +} diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index a058c2c8be..889a2a3bf4 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -1,30 +1,195 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("i") public class class25 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)[Llm;", - garbageValue = "742415234" + descriptor = "Liw;" ) - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.GRADIENT, FillMode.SOLID, FillMode.GRADIENT_ALPHA}; // L: 15 - } + @Export("VarpDefinition_archive") + static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("ih") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lme;" + descriptor = "(Ljn;IIII)V", + garbageValue = "456036327" ) - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { // L: 99 - var2 = (RunException)var0; // L: 100 - var2.message = var2.message + ' ' + var1; // L: 101 - } else { - var2 = new RunException(var0, var1); // L: 103 + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { // L: 9127 + if (var0.transforms != null) { // L: 9128 + var0 = var0.transform(); + } + + if (var0 != null) { // L: 9129 + if (var0.isInteractable) { // L: 9130 + if (!var0.isFollower || Client.followerIndex == var1) { // L: 9131 + String var4 = var0.name; // L: 9132 + int var7; + int var8; + if (var0.combatLevel != 0) { // L: 9133 + var7 = var0.combatLevel; // L: 9136 + var8 = PlayerType.localPlayer.combatLevel; // L: 9137 + int var9 = var8 - var7; // L: 9139 + String var6; + if (var9 < -9) { // L: 9140 + var6 = Client.colorStartTag(16711680); // L: 9141 + } else if (var9 < -6) { // L: 9144 + var6 = Client.colorStartTag(16723968); // L: 9145 + } else if (var9 < -3) { // L: 9148 + var6 = Client.colorStartTag(16740352); // L: 9149 + } else if (var9 < 0) { // L: 9152 + var6 = Client.colorStartTag(16756736); // L: 9153 + } else if (var9 > 9) { // L: 9156 + var6 = Client.colorStartTag(65280); // L: 9157 + } else if (var9 > 6) { // L: 9160 + var6 = Client.colorStartTag(4259584); // L: 9161 + } else if (var9 > 3) { // L: 9164 + var6 = Client.colorStartTag(8453888); // L: 9165 + } else if (var9 > 0) { // L: 9168 + var6 = Client.colorStartTag(12648192); // L: 9169 + } else { + var6 = Client.colorStartTag(16776960); // L: 9172 + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9174 + } + + if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9176 + ModelData0.insertMenuItemNoShift("Examine", Client.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9177 + } + + if (Client.isItemSelected == 1) { // L: 9180 + ModelData0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + Client.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9181 + } else if (Client.isSpellSelected) { // L: 9184 + if ((class105.selectedSpellFlags & 2) == 2) { // L: 9185 + ModelData0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + Client.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9186 + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9191 + String[] var11 = var0.actions; // L: 9192 + if (var11 != null) { // L: 9193 + for (var7 = 4; var7 >= 0; --var7) { // L: 9194 + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9195 + var8 = 0; // L: 9196 + if (var7 == 0) { // L: 9197 + var8 = var10 + 9; + } + + if (var7 == 1) { // L: 9198 + var8 = var10 + 10; + } + + if (var7 == 2) { // L: 9199 + var8 = var10 + 11; + } + + if (var7 == 3) { // L: 9200 + var8 = var10 + 12; + } + + if (var7 == 4) { // L: 9201 + var8 = var10 + 13; + } + + ModelData0.insertMenuItemNoShift(var11[var7], Client.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9202 + } + } + } + + if (var11 != null) { // L: 9207 + for (var7 = 4; var7 >= 0; --var7) { // L: 9208 + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9209 + short var12 = 0; // L: 9210 + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 9211 + if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > PlayerType.localPlayer.combatLevel) { // L: 9212 + var12 = 2000; // L: 9213 + } + + var8 = 0; // L: 9215 + if (var7 == 0) { // L: 9216 + var8 = var12 + 9; + } + + if (var7 == 1) { // L: 9217 + var8 = var12 + 10; + } + + if (var7 == 2) { // L: 9218 + var8 = var12 + 11; + } + + if (var7 == 3) { // L: 9219 + var8 = var12 + 12; + } + + if (var7 == 4) { // L: 9220 + var8 = var12 + 13; + } + + ModelData0.insertMenuItemNoShift(var11[var7], Client.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9221 + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9226 + ModelData0.insertMenuItemNoShift("Examine", Client.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9227 + } + } + + } + } + } + } + } // L: 9231 + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "([Lht;IB)V", + garbageValue = "-44" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10814 + Widget var3 = var0[var2]; // L: 10815 + if (var3 != null) { // L: 10816 + if (var3.type == 0) { // L: 10817 + if (var3.children != null) { // L: 10818 + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10819 + if (var4 != null) { // L: 10820 + WorldMapAreaData.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 10822 + var5 = new ScriptEvent(); // L: 10823 + var5.widget = var3; // L: 10824 + var5.args = var3.onDialogAbort; // L: 10825 + Entity.runScriptEvent(var5); // L: 10826 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 10828 + if (var3.childIndex >= 0) { // L: 10829 + Widget var6 = UserComparator4.getWidget(var3.id); // L: 10830 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10831 + continue; + } + } + + var5 = new ScriptEvent(); // L: 10835 + var5.widget = var3; // L: 10836 + var5.args = var3.onSubChange; // L: 10837 + Entity.runScriptEvent(var5); // L: 10838 + } + } } - return var2; // L: 104 - } + } // L: 10841 } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java new file mode 100644 index 0000000000..810d817188 --- /dev/null +++ b/runescape-client/src/main/java/class258.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iu") +public class class258 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Ljx;", + garbageValue = "1729073016" + ) + public static HitSplatDefinition method4654(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46 + if (var1 != null) { // L: 47 + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 48 + var1 = new HitSplatDefinition(); // L: 49 + if (var2 != null) { // L: 50 + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51 + return var1; // L: 52 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIZB)Ljava/lang/String;", + garbageValue = "72" + ) + static String method4655(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 115 + if (var2 && var0 >= 0) { // L: 116 + int var3 = 2; // L: 117 + + for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 118 119 121 + var4 /= var1; // L: 120 + } + + char[] var5 = new char[var3]; // L: 123 + var5[0] = '+'; // L: 124 + + for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 125 + int var7 = var0; // L: 126 + var0 /= var1; // L: 127 + int var8 = var7 - var0 * var1; // L: 128 + if (var8 >= 10) { // L: 129 + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); // L: 130 + } + } + + return new String(var5); // L: 132 + } else { + return Integer.toString(var0, var1); + } + } else { + throw new IllegalArgumentException("" + var1); + } + } +} diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java index 4a2a999a10..752c5f589b 100644 --- a/runescape-client/src/main/java/class277.java +++ b/runescape-client/src/main/java/class277.java @@ -1,27 +1,37 @@ +import java.io.File; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("ji") public class class277 { - @ObfuscatedName("z") + @ObfuscatedName("m") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; + + @ObfuscatedName("fq") @ObfuscatedSignature( - descriptor = "([I[II)V", - garbageValue = "-592561993" + descriptor = "(II)V", + garbageValue = "-1799040781" ) - public static void method5089(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { // L: 19 - ByteArrayPool.ByteArrayPool_alternativeSizes = var0; // L: 25 - ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 - ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 - - for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 - ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 - } - + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field879 = 0L; // L: 4204 + if (var0 >= 2) { // L: 4205 + Client.isResizable = true; } else { - ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 20 - ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; // L: 21 - ByteArrayPool.ByteArrayPool_arrays = null; // L: 22 + Client.isResizable = false; // L: 4206 } - } // L: 23 31 + + if (UrlRequester.getWindowedMode() == 1) { // L: 4207 + ByteArrayPool.client.setMaxCanvasSize(765, 503); // L: 4208 + } else { + ByteArrayPool.client.setMaxCanvasSize(7680, 2160); // L: 4211 + } + + if (Client.gameState >= 25) { // L: 4213 + Actor.method1855(); + } + + } // L: 4214 } diff --git a/runescape-client/src/main/java/class278.java b/runescape-client/src/main/java/class278.java index cbf67da038..c22d58eeb5 100644 --- a/runescape-client/src/main/java/class278.java +++ b/runescape-client/src/main/java/class278.java @@ -1,14 +1,19 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jq") public class class278 { - @ObfuscatedName("ae") - static java.awt.Font fontHelvetica13; - - @ObfuscatedName("z") - static double method5090(double var0, double var2, double var4) { - double var8 = (var0 - var2) / var4; // L: 10 - double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12 - return var6 / var4; // L: 14 - } + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "[Lle;" + ) + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "Ldu;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; } diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java deleted file mode 100644 index 6d41adb2b5..0000000000 --- a/runescape-client/src/main/java/class279.java +++ /dev/null @@ -1,34 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jk") -public class class279 { - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "[Llp;" - ) - static Sprite[] headIconPkSprites; - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)V", - garbageValue = "71" - ) - static final void method5092(String var0, int var1) { - PacketBufferNode var2 = Client.getPacketBufferNode(ClientPacket.field2345, Client.packetWriter.isaacCipher); // L: 248 - var2.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 249 - var2.packetBuffer.writeByte(var1); // L: 250 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 251 - Client.packetWriter.addNode(var2); // L: 252 - } // L: 253 - - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1031149310" - ) - static void method5091() { - Client.menuOptionsCount = 0; // L: 7004 - Client.isMenuOpen = false; // L: 7005 - } // L: 7006 -} diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java index 14f78e6a0b..550ba90c02 100644 --- a/runescape-client/src/main/java/class280.java +++ b/runescape-client/src/main/java/class280.java @@ -1,367 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jy") +@ObfuscatedName("jl") public class class280 { - @ObfuscatedName("k") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(Lby;II)V", - garbageValue = "1050583706" + descriptor = "Lle;" ) - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; // L: 101 - Script var3; - int var17; - if (class219.isWorldMapEvent(var0.type)) { // L: 103 - Frames.worldMapEvent = (WorldMapEvent)var2[0]; // L: 104 - WorldMapElement var4 = WorldMapSection0.WorldMapElement_get(Frames.worldMapEvent.mapElement); // L: 105 - var3 = class204.getWorldMapScript(var0.type, var4.objectId, var4.category); // L: 106 - } else { - var17 = (Integer)var2[0]; // L: 109 - var3 = WorldMapRectangle.getScript(var17); // L: 110 - } - - if (var3 != null) { // L: 112 - Interpreter.Interpreter_intStackSize = 0; // L: 115 - Varps.Interpreter_stringStackSize = 0; // L: 116 - var17 = -1; // L: 117 - int[] var5 = var3.opcodes; // L: 118 - int[] var6 = var3.intOperands; // L: 119 - byte var7 = -1; // L: 120 - Interpreter.Interpreter_frameDepth = 0; // L: 121 - Interpreter.field1131 = false; // L: 122 - - try { - int var10; - try { - Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; // L: 124 - int var8 = 0; // L: 125 - WorldMapID.Interpreter_stringLocals = new String[var3.localStringCount]; // L: 126 - int var9 = 0; // L: 127 - - int var11; - String var18; - for (var10 = 1; var10 < var2.length; ++var10) { // L: 128 - if (var2[var10] instanceof Integer) { // L: 129 - var11 = (Integer)var2[var10]; // L: 130 - if (var11 == -2147483647) { // L: 131 - var11 = var0.mouseX; - } - - if (var11 == -2147483646) { // L: 132 - var11 = var0.mouseY; - } - - if (var11 == -2147483645) { // L: 133 - var11 = var0.widget != null ? var0.widget.id * 1163691799 * 1189552295 : -1; - } - - if (var11 == -2147483644) { // L: 134 - var11 = var0.opIndex; - } - - if (var11 == -2147483643) { // L: 135 - var11 = var0.widget != null ? var0.widget.childIndex * -1997993253 * 2095440211 : -1; - } - - if (var11 == -2147483642) { // L: 136 - var11 = var0.dragTarget != null ? var0.dragTarget.id * 1163691799 * 1189552295 : -1; - } - - if (var11 == -2147483641) { // L: 137 - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1997993253 * 2095440211 : -1; - } - - if (var11 == -2147483640) { // L: 138 - var11 = var0.keyTyped; - } - - if (var11 == -2147483639) { // L: 139 - var11 = var0.keyPressed; - } - - Interpreter.Interpreter_intLocals[var8++] = var11; // L: 140 - } else if (var2[var10] instanceof String) { // L: 142 - var18 = (String)var2[var10]; // L: 143 - if (var18.equals("event_opbase")) { // L: 144 - var18 = var0.targetName; - } - - WorldMapID.Interpreter_stringLocals[var9++] = var18; // L: 145 - } - } - - var10 = 0; // L: 149 - Interpreter.field1135 = var0.field593; // L: 150 - - while (true) { - ++var10; // L: 152 - if (var10 > var1) { // L: 153 - throw new RuntimeException(); - } - - ++var17; // L: 154 - int var29 = var5[var17]; - int var20; - if (var29 >= 100) { // L: 155 - boolean var32; - if (var3.intOperands[var17] == 1) { // L: 353 - var32 = true; - } else { - var32 = false; // L: 354 - } - - var20 = WorldMapEvent.method830(var29, var3, var32); // L: 355 - switch(var20) { // L: 356 - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); // L: 363 - } - } else if (var29 == 0) { // L: 156 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6[var17]; // L: 157 - } else if (var29 == ScriptOpcodes.GET_VARP) { // L: 160 - var11 = var6[var17]; // L: 161 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; // L: 162 - } else if (var29 == ScriptOpcodes.SET_VARP) { // L: 165 - var11 = var6[var17]; // L: 166 - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 167 - Clock.changeGameOptions(var11); // L: 168 - } else if (var29 == ScriptOpcodes.SCONST) { // L: 171 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; // L: 172 - } else if (var29 == ScriptOpcodes.JUMP) { // L: 175 - var17 += var6[var17]; // L: 176 - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { // L: 179 - Interpreter.Interpreter_intStackSize -= 2; // L: 180 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 181 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { // L: 184 - Interpreter.Interpreter_intStackSize -= 2; // L: 185 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 186 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { // L: 189 - Interpreter.Interpreter_intStackSize -= 2; // L: 190 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 191 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { // L: 194 - Interpreter.Interpreter_intStackSize -= 2; // L: 195 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 196 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.RETURN) { // L: 199 - if (Interpreter.Interpreter_frameDepth == 0) { // L: 200 - return; - } - - ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 201 - var3 = var34.script; // L: 202 - var5 = var3.opcodes; // L: 203 - var6 = var3.intOperands; // L: 204 - var17 = var34.pc; // L: 205 - Interpreter.Interpreter_intLocals = var34.intLocals; // L: 206 - WorldMapID.Interpreter_stringLocals = var34.stringLocals; // L: 207 - } else if (var29 == ScriptOpcodes.GET_VARBIT) { // L: 210 - var11 = var6[var17]; // L: 211 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection1.getVarbit(var11); // L: 212 - } else if (var29 == ScriptOpcodes.SET_VARBIT) { // L: 215 - var11 = var6[var17]; // L: 216 - Huffman.method4047(var11, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 217 - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { // L: 220 - Interpreter.Interpreter_intStackSize -= 2; // L: 221 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 222 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { // L: 225 - Interpreter.Interpreter_intStackSize -= 2; // L: 226 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 227 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { // L: 230 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; // L: 231 - } else if (var29 == ScriptOpcodes.ISTORE) { // L: 234 - Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 235 - } else if (var29 == ScriptOpcodes.SLOAD) { // L: 238 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = WorldMapID.Interpreter_stringLocals[var6[var17]]; // L: 239 - } else if (var29 == ScriptOpcodes.SSTORE) { // L: 242 - WorldMapID.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 243 - } else if (var29 == ScriptOpcodes.JOIN_STRING) { // L: 246 - var11 = var6[var17]; // L: 247 - Varps.Interpreter_stringStackSize -= var11; // L: 248 - String var31 = UserComparator6.method3535(Interpreter.Interpreter_stringStack, Varps.Interpreter_stringStackSize, var11); // L: 249 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var31; // L: 250 - } else if (var29 == ScriptOpcodes.POP_INT) { // L: 253 - --Interpreter.Interpreter_intStackSize; // L: 254 - } else if (var29 == ScriptOpcodes.POP_STRING) { // L: 257 - --Varps.Interpreter_stringStackSize; // L: 258 - } else { - int var15; - if (var29 != ScriptOpcodes.INVOKE) { // L: 261 - if (var29 == ScriptOpcodes.GET_VARC_INT) { // L: 284 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPreferences.varcs.getInt(var6[var17]); // L: 285 - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { // L: 288 - ClientPreferences.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 289 - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { // L: 292 - var11 = var6[var17] >> 16; // L: 293 - var20 = var6[var17] & 65535; // L: 294 - int var21 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 295 - if (var21 < 0 || var21 > 5000) { // L: 296 - throw new RuntimeException(); // L: 297 - } - - Interpreter.Interpreter_arrayLengths[var11] = var21; // L: 299 - byte var22 = -1; // L: 300 - if (var20 == 105) { // L: 301 - var22 = 0; - } - - for (var15 = 0; var15 < var21; ++var15) { // L: 302 - Interpreter.Interpreter_arrays[var11][var15] = var22; - } - } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { // L: 305 - var11 = var6[var17]; // L: 306 - var20 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 307 - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 308 - throw new RuntimeException(); // L: 309 - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; // L: 311 - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { // L: 314 - var11 = var6[var17]; // L: 315 - Interpreter.Interpreter_intStackSize -= 2; // L: 316 - var20 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 317 - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 318 - throw new RuntimeException(); // L: 319 - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 321 - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 324 - var18 = ClientPreferences.varcs.getStringOld(var6[var17]); // L: 325 - if (var18 == null) { // L: 326 - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var18; // L: 327 - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 330 - ClientPreferences.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]); // L: 331 - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { // L: 334 - var18 = ClientPreferences.varcs.getString(var6[var17]); // L: 335 - Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var18; // L: 336 - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { // L: 339 - ClientPreferences.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]); // L: 340 - } else { - if (var29 != ScriptOpcodes.SWITCH) { // L: 343 - throw new IllegalStateException(); // L: 349 - } - - IterableNodeHashTable var33 = var3.switches[var6[var17]]; // L: 344 - IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 345 - if (var30 != null) { // L: 346 - var17 += var30.integer; - } - } - } else { - var11 = var6[var17]; // L: 262 - Script var12 = WorldMapRectangle.getScript(var11); // L: 263 - int[] var13 = new int[var12.localIntCount]; // L: 264 - String[] var14 = new String[var12.localStringCount]; // L: 265 - - for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { // L: 266 - var13[var15] = Interpreter.Interpreter_intStack[var15 + (Interpreter.Interpreter_intStackSize - var12.intArgumentCount)]; - } - - for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { // L: 267 - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Varps.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - Interpreter.Interpreter_intStackSize -= var12.intArgumentCount; // L: 268 - Varps.Interpreter_stringStackSize -= var12.stringArgumentCount; // L: 269 - ScriptFrame var19 = new ScriptFrame(); // L: 270 - var19.script = var3; // L: 271 - var19.pc = var17; // L: 272 - var19.intLocals = Interpreter.Interpreter_intLocals; // L: 273 - var19.stringLocals = WorldMapID.Interpreter_stringLocals; // L: 274 - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; // L: 275 - var3 = var12; // L: 276 - var5 = var12.opcodes; // L: 277 - var6 = var12.intOperands; // L: 278 - var17 = -1; // L: 279 - Interpreter.Interpreter_intLocals = var13; // L: 280 - WorldMapID.Interpreter_stringLocals = var14; // L: 281 - } - } - } - } catch (Exception var27) { // L: 369 - StringBuilder var24 = new StringBuilder(30); // L: 371 - var24.append("").append(var3.key).append(" "); // L: 372 - - for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { // L: 373 - var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); - } - - var24.append("").append(var7); // L: 374 - Decimator.RunException_sendStackTrace(var24.toString(), var27); // L: 375 - } - } finally { - if (Interpreter.field1131) { // L: 379 - Interpreter.field1132 = true; // L: 380 - ItemContainer.method1213(); // L: 381 - Interpreter.field1132 = false; // L: 382 - Interpreter.field1131 = false; // L: 383 - } - - } - } - } // L: 113 386 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "-1343804215" - ) - public static void openURL(String var0, boolean var1, boolean var2) { - WorldMapData_0.method255(var0, var1, "openjs", var2); // L: 27 - } // L: 28 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIILjg;II)V", - garbageValue = "1627824934" - ) - static void method5093(int var0, int var1, int var2, ObjectDefinition var3, int var4) { - ObjectSound var5 = new ObjectSound(); // L: 67 - var5.plane = var0; // L: 68 - var5.x = var1 * 128; // L: 69 - var5.y = var2 * 128; // L: 70 - int var6 = var3.sizeX; // L: 71 - int var7 = var3.sizeY; // L: 72 - if (var4 == 1 || var4 == 3) { // L: 73 - var6 = var3.sizeY; // L: 74 - var7 = var3.sizeX; // L: 75 - } - - var5.field1106 = (var6 + var1) * 128; // L: 77 - var5.field1117 = (var7 + var2) * 128; // L: 78 - var5.soundEffectId = var3.ambientSoundId; // L: 79 - var5.field1108 = var3.int4 * 128; // L: 80 - var5.field1109 = var3.int5; // L: 81 - var5.field1115 = var3.int6; // L: 82 - var5.soundEffectIds = var3.soundEffectIds; // L: 83 - if (var3.transforms != null) { // L: 84 - var5.obj = var3; // L: 85 - var5.set(); // L: 86 - } - - ObjectSound.objectSounds.addFirst(var5); // L: 88 - if (var5.soundEffectIds != null) { // L: 89 - var5.field1118 = var5.field1109 + (int)(Math.random() * (double)(var5.field1115 - var5.field1109)); - } - - } // L: 90 + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; } diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java new file mode 100644 index 0000000000..7382ca1a1c --- /dev/null +++ b/runescape-client/src/main/java/class281.java @@ -0,0 +1,71 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jw") +public class class281 { + @ObfuscatedName("dk") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive10") + static Archive archive10; + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Llc;", + garbageValue = "1924580283" + ) + static Sprite method5132() { + Sprite var0 = new Sprite(); // L: 216 + var0.width = class336.SpriteBuffer_spriteWidth; // L: 217 + var0.height = class336.SpriteBuffer_spriteHeight; // L: 218 + var0.xOffset = class336.SpriteBuffer_xOffsets[0]; // L: 219 + var0.yOffset = class225.SpriteBuffer_yOffsets[0]; // L: 220 + var0.subWidth = class336.SpriteBuffer_spriteWidths[0]; // L: 221 + var0.subHeight = class336.SpriteBuffer_spriteHeights[0]; // L: 222 + int var1 = var0.subHeight * var0.subWidth; // L: 223 + byte[] var2 = class13.SpriteBuffer_pixels[0]; // L: 224 + var0.pixels = new int[var1]; // L: 225 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 226 + var0.pixels[var3] = WorldMapID.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + class336.SpriteBuffer_xOffsets = null; // L: 228 + class225.SpriteBuffer_yOffsets = null; // L: 229 + class336.SpriteBuffer_spriteWidths = null; // L: 230 + class336.SpriteBuffer_spriteHeights = null; // L: 231 + WorldMapID.SpriteBuffer_spritePalette = null; // L: 232 + class13.SpriteBuffer_pixels = null; // L: 233 + return var0; // L: 235 + } + + @ObfuscatedName("hq") + @ObfuscatedSignature( + descriptor = "(Lbi;IIBB)V", + garbageValue = "1" + ) + static final void method5133(Player var0, int var1, int var2, byte var3) { + int var4 = var0.pathX[0]; // L: 7707 + int var5 = var0.pathY[0]; // L: 7708 + int var6 = var0.transformedSize(); // L: 7709 + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 7710 + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 7711 + int var9 = var0.transformedSize(); // L: 7714 + Client.field877.approxDestinationX = var1; // L: 7717 + Client.field877.approxDestinationY = var2; // L: 7718 + Client.field877.approxDestinationSizeX = 1; // L: 7719 + Client.field877.approxDestinationSizeY = 1; // L: 7720 + ApproximateRouteStrategy var10 = Client.field877; // L: 7721 + int var11 = ApproximateRouteStrategy.method1321(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.field695, Client.field956); // L: 7723 + if (var11 >= 1) { // L: 7724 + for (int var12 = 0; var12 < var11 - 1; ++var12) { // L: 7725 + var0.method1337(Client.field695[var12], Client.field956[var12], var3); + } + + } + } + } + } // L: 7726 +} diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java deleted file mode 100644 index 8ca4b1d100..0000000000 --- a/runescape-client/src/main/java/class296.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kh") -public class class296 { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - static IndexedSprite titleboxSprite; -} diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java index 5017cd6eb0..81c7e37f2a 100644 --- a/runescape-client/src/main/java/class297.java +++ b/runescape-client/src/main/java/class297.java @@ -1,48 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("kx") public class class297 { - @ObfuscatedName("z") - public static final char[] cp1252AsciiExtension; - @ObfuscatedName("o") - static byte[][][] field3668; - - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-486597081" + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -278592989 ) - public static int method5378(int var0) { - --var0; // L: 44 - var0 |= var0 >>> 1; // L: 45 - var0 |= var0 >>> 2; // L: 46 - var0 |= var0 >>> 4; // L: 47 - var0 |= var0 >>> 8; // L: 48 - var0 |= var0 >>> 16; // L: 49 - return var0 + 1; // L: 50 - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "115" - ) - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 9175 - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9176 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9177 - } - - if (var1.length() > 9) { // L: 9179 - return " " + WorldMapAreaData.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + WorldMapAreaData.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + WorldMapAreaData.colorStartTag(16776960) + var1 + ""; // L: 9180 9181 - } - } + @Export("idxCount") + static int idxCount; } diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java index 541f37d1e6..ef28bc5150 100644 --- a/runescape-client/src/main/java/class298.java +++ b/runescape-client/src/main/java/class298.java @@ -1,81 +1,42 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") -public final class class298 { - @ObfuscatedName("z") - static final char[] base37Table; - @ObfuscatedName("k") - static long[] field3673; +@ObfuscatedName("kg") +public class class298 { + @ObfuscatedName("f") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4 - field3673 = new long[12]; // L: 5 - - for (int var0 = 0; var0 < field3673.length; ++var0) { // L: 8 - field3673[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } // L: 9 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-2086382894" - ) - public static String method5386(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 13 - char var4 = var0.charAt(var3); // L: 14 - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 - if (var4 == ' ') { // L: 16 - var2.append('+'); - } else { - byte var5 = class227.charToByteCp1252(var4); // L: 18 - var2.append('%'); // L: 19 - int var6 = var5 >> 4 & 15; // L: 20 - if (var6 >= 10) { // L: 21 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); // L: 22 - } - - var6 = var5 & 15; // L: 23 - if (var6 >= 10) { // L: 24 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); // L: 25 - } - } - - return var2.toString(); // L: 28 + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "1967636466" + descriptor = "(Liw;II)Lle;", + garbageValue = "852535134" ) - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 - } - - @ObfuscatedName("fb") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "108" - ) - static void playSoundJingle(int var0, int var1) { - if (Client.musicVolume != 0 && var0 != -1) { // L: 3312 - Script.method2322(GrandExchangeEvent.archive11, var0, 0, Client.musicVolume, false); // L: 3313 - Client.field704 = true; // L: 3314 + public static IndexedSprite method5411(AbstractArchive var0, int var1) { + if (!WorldMapAreaData.method787(var0, var1)) { // L: 190 + return null; + } else { + IndexedSprite var3 = new IndexedSprite(); // L: 193 + var3.width = class336.SpriteBuffer_spriteWidth; // L: 194 + var3.height = class336.SpriteBuffer_spriteHeight; // L: 195 + var3.xOffset = class336.SpriteBuffer_xOffsets[0]; // L: 196 + var3.yOffset = class225.SpriteBuffer_yOffsets[0]; // L: 197 + var3.subWidth = class336.SpriteBuffer_spriteWidths[0]; // L: 198 + var3.subHeight = class336.SpriteBuffer_spriteHeights[0]; // L: 199 + var3.palette = WorldMapID.SpriteBuffer_spritePalette; // L: 200 + var3.pixels = class13.SpriteBuffer_pixels[0]; // L: 201 + class336.SpriteBuffer_xOffsets = null; // L: 203 + class225.SpriteBuffer_yOffsets = null; // L: 204 + class336.SpriteBuffer_spriteWidths = null; // L: 205 + class336.SpriteBuffer_spriteHeights = null; // L: 206 + WorldMapID.SpriteBuffer_spritePalette = null; // L: 207 + class13.SpriteBuffer_pixels = null; // L: 208 + return var3; // L: 212 } - - } // L: 3316 + } } diff --git a/runescape-client/src/main/java/class299.java b/runescape-client/src/main/java/class299.java index e15ae921c9..447e99dcce 100644 --- a/runescape-client/src/main/java/class299.java +++ b/runescape-client/src/main/java/class299.java @@ -1,103 +1,52 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") -public class class299 { - @ObfuscatedName("z") - static char[] field3676; - @ObfuscatedName("k") - static char[] field3675; - @ObfuscatedName("s") - static char[] field3674; - @ObfuscatedName("t") - static int[] field3677; +@ObfuscatedName("kf") +public final class class299 { + @ObfuscatedName("f") + @Export("base37Table") + public static final char[] base37Table; + @ObfuscatedName("b") + static long[] field3678; + @ObfuscatedName("c") + static byte[][][] field3679; static { - field3676 = new char[64]; // L: 7 + 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'}; // L: 4 + field3678 = new long[12]; // L: 5 - int var0; - for (var0 = 0; var0 < 26; ++var0) { // L: 8 - field3676[var0] = (char)(var0 + 65); + for (int var0 = 0; var0 < field3678.length; ++var0) { // L: 8 + field3678[var0] = (long)Math.pow(37.0D, (double)var0); } - for (var0 = 26; var0 < 52; ++var0) { // L: 9 - field3676[var0] = (char)(var0 + 97 - 26); - } + } // L: 9 - for (var0 = 52; var0 < 62; ++var0) { // L: 10 - field3676[var0] = (char)(var0 + 48 - 52); - } - - field3676[62] = '+'; // L: 11 - field3676[63] = '/'; // L: 12 - field3675 = new char[64]; // L: 18 - - for (var0 = 0; var0 < 26; ++var0) { // L: 19 - field3675[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 20 - field3675[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 21 - field3675[var0] = (char)(var0 + 48 - 52); - } - - field3675[62] = '*'; // L: 22 - field3675[63] = '-'; // L: 23 - field3674 = new char[64]; // L: 29 - - for (var0 = 0; var0 < 26; ++var0) { // L: 30 - field3674[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 31 - field3674[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 32 - field3674[var0] = (char)(var0 + 48 - 52); - } - - field3674[62] = '-'; // L: 33 - field3674[63] = '_'; // L: 34 - field3677 = new int[128]; // L: 40 - - for (var0 = 0; var0 < field3677.length; ++var0) { // L: 41 - field3677[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { // L: 42 - field3677[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { // L: 43 - field3677[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { // L: 44 - field3677[var0] = var0 - 48 + 52; - } - - int[] var2 = field3677; // L: 45 - field3677[43] = 62; // L: 46 - var2[42] = 62; // L: 47 - int[] var1 = field3677; // L: 48 - field3677[47] = 63; // L: 49 - var1[45] = 63; // L: 50 - } // L: 51 - - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-48" + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "1354932272" ) - public static final void method5393(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; // L: 86 - ViewportMouse.ViewportMouse_y = var1; // L: 87 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 88 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 89 - ViewportMouse.ViewportMouse_false0 = false; // L: 90 - } // L: 91 + public static String method5418(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); // L: 58 + + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 59 + int var5 = var0[var4] & 255; // L: 60 + var3.append(class300.field3686[var5 >>> 2]); // L: 61 + if (var4 < var2 - 1) { // L: 62 + int var6 = var0[var4 + 1] & 255; // L: 63 + var3.append(class300.field3686[(var5 & 3) << 4 | var6 >>> 4]); // L: 64 + if (var4 < var2 - 2) { // L: 65 + int var7 = var0[var4 + 2] & 255; // L: 66 + var3.append(class300.field3686[(var6 & 15) << 2 | var7 >>> 6]).append(class300.field3686[var7 & 63]); // L: 67 + } else { + var3.append(class300.field3686[(var6 & 15) << 2]).append("="); // L: 69 + } + } else { + var3.append(class300.field3686[(var5 & 3) << 4]).append("=="); // L: 71 + } + } + + return var3.toString(); // L: 73 + } } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 376dace1e2..8e62861e45 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,1488 +1,195 @@ -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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("m") public class class3 implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lt;" + descriptor = "Lm;" ) - static final class3 field23; + static final class3 field11; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lm;" + ) + static final class3 field9; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lm;" + ) + static final class3 field10; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 914942415 + ) + final int field14; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1840148541 + ) + public final int field12; + @ObfuscatedName("q") + public final Class field13; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lt;" + descriptor = "Lf;" ) - static final class3 field13; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lt;" - ) - static final class3 field24; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1676805267 - ) - static int field25; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhq;" - ) - static Widget field12; - @ObfuscatedName("es") - @ObfuscatedSignature( - descriptor = "Liw;" - ) - static Archive archive17; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1942324961 - ) - final int field15; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -83927061 - ) - public final int field16; - @ObfuscatedName("o") - public final Class field17; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lz;" - ) - final class0 field18; + final class0 field16; static { - field23 = new class3(0, 0, Integer.class, new class1()); // L: 10 - field13 = new class3(1, 1, Long.class, new class2()); // L: 23 - field24 = new class3(2, 2, String.class, new class4()); // L: 36 + field11 = new class3(0, 0, Integer.class, new class1()); // L: 10 + field9 = new class3(1, 1, Long.class, new class2()); // L: 23 + field10 = new class3(2, 2, String.class, new class4()); } @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lz;)V" + descriptor = "(IILjava/lang/Class;Lf;)V" ) class3(int var1, int var2, Class var3, class0 var4) { - this.field15 = var1; // L: 59 - this.field16 = var2; // L: 60 - this.field17 = var3; // L: 61 - this.field18 = var4; // L: 62 - } // L: 63 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" - ) - public int rsOrdinal() { - return this.field16; // L: 94 + this.field14 = var1; // L: 59 + this.field12 = var2; // L: 60 + this.field13 = var3; // L: 61 + this.field16 = var4; // L: 62 } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "101023804" + descriptor = "(B)I", + garbageValue = "23" ) - public Object method46(Buffer var1) { - return this.field18.vmethod61(var1); // L: 98 + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field12; // L: 93 } @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)[Lt;", - garbageValue = "-127122137" + descriptor = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1763369505" ) - public static class3[] method47() { - return new class3[]{field23, field13, field24}; // L: 55 + public Object method47(Buffer var1) { + return this.field16.vmethod72(var1); // L: 97 } - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkf;B)V", - garbageValue = "69" + descriptor = "(B)[Lm;", + garbageValue = "-100" ) - public static void method43(Object var0, Buffer var1) { - Class var3 = var0.getClass(); // L: 67 - class3[] var5 = method47(); // L: 72 - int var6 = 0; + public static class3[] method43() { + return new class3[]{field10, field11, field9}; // L: 55 + } - class3 var4; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lkb;I)V", + garbageValue = "1153774479" + ) + public static void method57(Object var0, Buffer var1) { + class0 var2 = method45(var0.getClass()); + var2.vmethod69(var0, var1); + } // L: 68 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-2079467882" + ) + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 27 + if (var4 == null) { // L: 28 + var4 = new ChatChannel(); // L: 29 + Messages.Messages_channels.put(var0, var4); // L: 30 + } + + Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 32 + Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 33 + Messages.Messages_queue.add(var5); // L: 34 + Client.chatCycle = Client.cycleCntr; // L: 35 + } // L: 36 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;I)Lf;", + garbageValue = "-1368179689" + ) + static class0 method45(Class var0) { + class3[] var2 = method43(); // L: 74 + int var3 = 0; + + class3 var1; while (true) { - if (var6 >= var5.length) { - var4 = null; // L: 83 + if (var3 >= var2.length) { + var1 = null; // L: 85 break; } - class3 var7 = var5[var6]; // L: 74 - if (var3 == var7.field17) { // L: 76 - var4 = var7; // L: 77 + class3 var4 = var2[var3]; // L: 76 + if (var4.field13 == var0) { // L: 78 + var1 = var4; // L: 79 break; } - ++var6; // L: 73 + ++var3; // L: 75 } - if (var4 == null) { - throw new IllegalArgumentException(); // L: 86 + if (var1 == null) { // L: 88 + throw new IllegalArgumentException(); } else { - class0 var2 = var4.field18; // L: 87 - var2.vmethod70(var0, var1); // L: 90 + return var1.field16; // L: 89 } - } // L: 91 + } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lbw;I)V", - garbageValue = "823083332" + descriptor = "(II)V", + garbageValue = "-268310381" ) - static void doCycleTitle(GameShell var0) { - if (Login.worldSelectOpen) { // L: 264 - GameBuild.method4217(var0); // L: 265 - } else { - int var3; - if ((MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 268 - Tile.clientPreferences.titleMusicDisabled = !Tile.clientPreferences.titleMusicDisabled; // L: 269 - WorldMapData_1.savePreferences(); // L: 270 - if (!Tile.clientPreferences.titleMusicDisabled) { // L: 271 - Archive var1 = CollisionMap.archive6; // L: 272 - int var2 = var1.getGroupId("scape main"); // L: 274 - var3 = var1.getFileId(var2, ""); // L: 275 - Script.method2322(var1, var2, var3, 255, false); // L: 276 - } else { - class206.midiPcmStream.clear(); // L: 280 - class206.musicPlayerStatus = 1; // L: 281 - class204.musicTrackArchive = null; // L: 282 - } + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 + if (var1 != null) { // L: 64 + for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 + var1.ids[var2] = -1; // L: 66 + var1.quantities[var2] = 0; // L: 67 } - if (Client.gameState != 5) { // L: 285 - if (-1L == Login.field1232) { // L: 286 - Login.field1232 = PacketWriter.currentTimeMillis() + 1000L; // L: 287 - } - - long var30 = PacketWriter.currentTimeMillis(); // L: 289 - if (GrandExchangeOffer.method207() && -1L == Login.field1233) { // L: 290 291 - Login.field1233 = var30; // L: 292 - if (Login.field1233 > Login.field1232) { // L: 293 - Login.field1232 = Login.field1233; // L: 294 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 298 - if (Language.Language_EN == class58.clientLanguage) { // L: 299 - if (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 300 - var3 = Login.xPadding + 5; // L: 301 - short var4 = 463; // L: 302 - byte var5 = 100; // L: 303 - byte var6 = 35; // L: 304 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var4 + var6) { // L: 305 - if (ScriptFrame.loadWorlds()) { // L: 307 - Login.worldSelectOpen = true; // L: 308 - Login.worldSelectPage = 0; // L: 309 - Login.worldSelectPagesCount = 0; // L: 310 - } - - return; // L: 313 - } - } - - if (WorldMapScaleHandler.World_request != null && ScriptFrame.loadWorlds()) { // L: 316 317 - Login.worldSelectOpen = true; // L: 318 - Login.worldSelectPage = 0; // L: 319 - Login.worldSelectPagesCount = 0; // L: 320 - } - } - - var3 = MouseHandler.MouseHandler_lastButton; // L: 324 - int var54 = MouseHandler.MouseHandler_lastPressedX; // L: 325 - int var55 = MouseHandler.MouseHandler_lastPressedY; // L: 326 - if (var3 == 0) { // L: 327 - var54 = MouseHandler.MouseHandler_x; // L: 328 - var55 = MouseHandler.MouseHandler_y; // L: 329 - } - - if (!ScriptEvent.mouseCam && var3 == 4) { // L: 331 - var3 = 1; - } - - short var58; - int var59; - if (Login.loginIndex == 0) { // L: 332 - boolean var65 = false; // L: 333 - - while (class60.isKeyDown()) { // L: 334 - if (PlayerAppearance.field2581 == 84) { // L: 335 - var65 = true; // L: 336 - } - } - - var59 = IsaacCipher.loginBoxCenter - 80; // L: 339 - var58 = 291; // L: 340 - if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 341 - class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 342 - } - - var59 = IsaacCipher.loginBoxCenter + 80; // L: 344 - if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20 || var65) { // L: 345 - if ((Client.worldProperties & 33554432) != 0) { // L: 346 - Login.Login_response0 = ""; // L: 347 - Login.Login_response1 = "This is a Beta world."; // L: 348 - Login.Login_response2 = "Your normal account will not be affected."; // L: 349 - Login.Login_response3 = ""; // L: 350 - Login.loginIndex = 1; // L: 351 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 353 - Login.currentLoginField = 1; // L: 354 - } else { - Login.currentLoginField = 0; // L: 357 - } - } else if ((Client.worldProperties & 4) != 0) { // L: 361 - if ((Client.worldProperties & 1024) != 0) { // L: 362 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 363 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 364 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 365 - } else { - Login.Login_response1 = "This is a PvP world."; // L: 368 - Login.Login_response2 = "Players can attack each other"; // L: 369 - Login.Login_response3 = "almost everywhere."; // L: 370 - } - - Login.Login_response0 = "Warning!"; // L: 372 - Login.loginIndex = 1; // L: 373 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 375 - Login.currentLoginField = 1; // L: 376 - } else { - Login.currentLoginField = 0; // L: 379 - } - } else if ((Client.worldProperties & 1024) != 0) { // L: 383 - Login.Login_response1 = "This is a High Risk world."; // L: 384 - Login.Login_response2 = "The Protect Item prayer will"; // L: 385 - Login.Login_response3 = "not work on this world."; // L: 386 - Login.Login_response0 = "Warning!"; // L: 387 - Login.loginIndex = 1; // L: 388 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 390 - Login.currentLoginField = 1; // L: 391 - } else { - Login.currentLoginField = 0; // L: 394 - } - } else { - class41.Login_promptCredentials(false); // L: 399 - } - } - } else { - short var7; - int var56; - if (Login.loginIndex == 1) { // L: 403 - while (true) { - if (!class60.isKeyDown()) { // L: 404 - var56 = IsaacCipher.loginBoxCenter - 80; // L: 412 - var7 = 321; // L: 413 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 414 - class41.Login_promptCredentials(false); // L: 415 - } - - var56 = IsaacCipher.loginBoxCenter + 80; // L: 417 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 418 - Login.loginIndex = 0; // L: 419 - } - break; - } - - if (PlayerAppearance.field2581 == 84) { // L: 405 - class41.Login_promptCredentials(false); // L: 406 - } else if (PlayerAppearance.field2581 == 13) { // L: 408 - Login.loginIndex = 0; // L: 409 - } - } - } else { - int var10; - String var12; - short var57; - boolean var61; - if (Login.loginIndex == 2) { // L: 422 - var57 = 201; // L: 423 - var56 = var57 + 52; // L: 424 - if (var3 == 1 && var55 >= var56 - 12 && var55 < var56 + 2) { // L: 425 - Login.currentLoginField = 0; - } - - var56 += 15; // L: 426 - if (var3 == 1 && var55 >= var56 - 12 && var55 < var56 + 2) { // L: 427 - Login.currentLoginField = 1; - } - - var56 += 15; // L: 428 - var57 = 361; // L: 429 - if (GrandExchangeOfferNameComparator.field112 != null) { // L: 430 - var59 = GrandExchangeOfferNameComparator.field112.highX / 2; // L: 431 - if (var3 == 1 && var54 >= GrandExchangeOfferNameComparator.field112.lowX - var59 && var54 <= var59 + GrandExchangeOfferNameComparator.field112.lowX && var55 >= var57 - 15 && var55 < var57) { // L: 432 - switch(Login.field1213) { // L: 433 - case 1: - UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 436 - Login.loginIndex = 5; // L: 437 - return; // L: 438 - case 2: - class280.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 442 - } - } - } - - var59 = IsaacCipher.loginBoxCenter - 80; // L: 448 - var58 = 321; // L: 449 - if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 450 - Login.Login_username = Login.Login_username.trim(); // L: 451 - if (Login.Login_username.length() == 0) { // L: 452 - UrlRequester.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 453 - return; // L: 454 - } - - if (Login.Login_password.length() == 0) { // L: 456 - UrlRequester.setLoginResponseString("", "Please enter your password.", ""); // L: 457 - return; // L: 458 - } - - UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 460 - class22.method245(false); // L: 461 - CollisionMap.updateGameState(20); // L: 462 - return; // L: 463 - } - - var59 = Login.loginBoxX + 180 + 80; // L: 465 - if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 466 - Login.loginIndex = 0; // L: 467 - Login.Login_username = ""; // L: 468 - Login.Login_password = ""; // L: 469 - LoginScreenAnimation.field1070 = 0; // L: 470 - WorldMapLabelSize.otp = ""; // L: 471 - Login.field1223 = true; // L: 472 - } - - var59 = IsaacCipher.loginBoxCenter + -117; // L: 474 - var58 = 277; // L: 475 - Login.field1224 = var54 >= var59 && var54 < var59 + GrandExchangeOfferNameComparator.field114 && var55 >= var58 && var55 < var58 + ReflectionCheck.field1364; // L: 476 - if (var3 == 1 && Login.field1224) { // L: 477 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 478 - if (!Client.Login_isUsernameRemembered && Tile.clientPreferences.rememberedUsername != null) { // L: 479 - Tile.clientPreferences.rememberedUsername = null; // L: 480 - WorldMapData_1.savePreferences(); // L: 481 - } - } - - var59 = IsaacCipher.loginBoxCenter + 24; // L: 484 - var58 = 277; // L: 485 - Login.field1201 = var54 >= var59 && var54 < var59 + GrandExchangeOfferNameComparator.field114 && var55 >= var58 && var55 < var58 + ReflectionCheck.field1364; // L: 486 - if (var3 == 1 && Login.field1201) { // L: 487 - Tile.clientPreferences.hideUsername = !Tile.clientPreferences.hideUsername; // L: 488 - if (!Tile.clientPreferences.hideUsername) { // L: 489 - Login.Login_username = ""; // L: 490 - Tile.clientPreferences.rememberedUsername = null; // L: 491 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 493 - Login.currentLoginField = 1; // L: 494 - } else { - Login.currentLoginField = 0; // L: 497 - } - } - - WorldMapData_1.savePreferences(); // L: 501 - } - - label1256: - while (true) { - Transferable var33; - int var68; - do { - while (true) { - label1220: - do { - while (true) { - while (class60.isKeyDown()) { // L: 503 - if (PlayerAppearance.field2581 != 13) { // L: 504 - if (Login.currentLoginField != 0) { // L: 513 - continue label1220; - } - - char var63 = PacketWriter.field1350; // L: 514 - - for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var63 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10); ++var10) { // L: 516 517 - } - - if (PlayerAppearance.field2581 == 85 && Login.Login_username.length() > 0) { // L: 520 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (PlayerAppearance.field2581 == 84 || PlayerAppearance.field2581 == 80) { // L: 521 - Login.currentLoginField = 1; - } - - char var67 = PacketWriter.field1350; // L: 523 - boolean var64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var67) != -1; // L: 525 - if (var64 && Login.Login_username.length() < 320) { // L: 527 - Login.Login_username = Login.Login_username + PacketWriter.field1350; - } - } else { - Login.loginIndex = 0; // L: 505 - Login.Login_username = ""; // L: 506 - Login.Login_password = ""; // L: 507 - LoginScreenAnimation.field1070 = 0; // L: 508 - WorldMapLabelSize.otp = ""; // L: 509 - Login.field1223 = true; // L: 510 - } - } - - return; // L: 1085 - } - } while(Login.currentLoginField != 1); // L: 529 - - if (PlayerAppearance.field2581 == 85 && Login.Login_password.length() > 0) { // L: 530 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 531 - } else if (PlayerAppearance.field2581 == 84 || PlayerAppearance.field2581 == 80) { // L: 533 - Login.currentLoginField = 0; // L: 534 - if (PlayerAppearance.field2581 == 84) { // L: 535 - Login.Login_username = Login.Login_username.trim(); // L: 536 - if (Login.Login_username.length() == 0) { // L: 537 - UrlRequester.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 538 - return; // L: 539 - } - - if (Login.Login_password.length() == 0) { // L: 541 - UrlRequester.setLoginResponseString("", "Please enter your password.", ""); // L: 542 - return; // L: 543 - } - - UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 545 - class22.method245(false); // L: 546 - CollisionMap.updateGameState(20); // L: 547 - return; // L: 548 - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && PlayerAppearance.field2581 == 67) { // L: 551 - Clipboard var32 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 552 - var33 = var32.getContents(class2.client); // L: 553 - var68 = 20 - Login.Login_password.length(); // L: 554 - break; - } - - if (Tiles.method1187(PacketWriter.field1350)) { // L: 579 - char var66 = PacketWriter.field1350; // L: 581 - var61 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var66) != -1; // L: 583 - if (var61 && Login.Login_password.length() < 20) { // L: 585 586 - Login.Login_password = Login.Login_password + PacketWriter.field1350; // L: 587 - } - } - } - } while(var68 <= 0); // L: 555 - - try { - var12 = (String)var33.getTransferData(DataFlavor.stringFlavor); // L: 557 - int var69 = Math.min(var68, var12.length()); // L: 558 - int var14 = 0; - - while (true) { - if (var14 >= var69) { - Login.Login_password = Login.Login_password + var12.substring(0, var69); // L: 573 - continue label1256; - } - - if (!Tiles.method1187(var12.charAt(var14))) { // L: 561 - break; - } - - char var16 = var12.charAt(var14); // L: 563 - boolean var15 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var16) != -1; // L: 565 - if (!var15) { // L: 567 - break; - } - - ++var14; // L: 559 - } - - Login.loginIndex = 3; // L: 569 - return; // L: 570 - } catch (UnsupportedFlavorException var52) { // L: 575 - } catch (IOException var53) { // L: 576 - } - } - } else if (Login.loginIndex == 3) { // L: 595 - var56 = Login.loginBoxX + 180; // L: 596 - var7 = 276; // L: 597 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 598 - class41.Login_promptCredentials(false); // L: 599 - } - - var56 = Login.loginBoxX + 180; // L: 601 - var7 = 326; // L: 602 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 603 - UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 604 - Login.loginIndex = 5; // L: 605 - return; // L: 606 - } - } else { - int var9; - if (Login.loginIndex == 4) { // L: 609 - var56 = Login.loginBoxX + 180 - 80; // L: 610 - var7 = 321; // L: 611 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 612 - WorldMapLabelSize.otp.trim(); // L: 613 - if (WorldMapLabelSize.otp.length() != 6) { // L: 614 - UrlRequester.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 615 - return; // L: 616 - } - - LoginScreenAnimation.field1070 = Integer.parseInt(WorldMapLabelSize.otp); // L: 618 - WorldMapLabelSize.otp = ""; // L: 619 - class22.method245(true); // L: 620 - UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 621 - CollisionMap.updateGameState(20); // L: 622 - return; // L: 623 - } - - if (var3 == 1 && var54 >= Login.loginBoxX + 180 - 9 && var54 <= Login.loginBoxX + 180 + 130 && var55 >= 263 && var55 <= 296) { // L: 625 - Login.field1223 = !Login.field1223; // L: 626 - } - - if (var3 == 1 && var54 >= Login.loginBoxX + 180 - 34 && var54 <= Login.loginBoxX + 34 + 180 && var55 >= 351 && var55 <= 363) { // L: 628 - class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 629 - } - - var56 = Login.loginBoxX + 180 + 80; // L: 631 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 632 - Login.loginIndex = 0; // L: 633 - Login.Login_username = ""; // L: 634 - Login.Login_password = ""; // L: 635 - LoginScreenAnimation.field1070 = 0; // L: 636 - WorldMapLabelSize.otp = ""; // L: 637 - } - - while (class60.isKeyDown()) { // L: 639 - boolean var8 = false; // L: 640 - - for (var9 = 0; var9 < "1234567890".length(); ++var9) { // L: 641 - if (PacketWriter.field1350 == "1234567890".charAt(var9)) { // L: 642 - var8 = true; // L: 643 - break; // L: 644 - } - } - - if (PlayerAppearance.field2581 == 13) { // L: 647 - Login.loginIndex = 0; // L: 648 - Login.Login_username = ""; // L: 649 - Login.Login_password = ""; // L: 650 - LoginScreenAnimation.field1070 = 0; // L: 651 - WorldMapLabelSize.otp = ""; // L: 652 - } else { - if (PlayerAppearance.field2581 == 85 && WorldMapLabelSize.otp.length() > 0) { // L: 655 - WorldMapLabelSize.otp = WorldMapLabelSize.otp.substring(0, WorldMapLabelSize.otp.length() - 1); - } - - if (PlayerAppearance.field2581 == 84) { // L: 656 - WorldMapLabelSize.otp.trim(); // L: 657 - if (WorldMapLabelSize.otp.length() != 6) { // L: 658 - UrlRequester.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 659 - return; // L: 660 - } - - LoginScreenAnimation.field1070 = Integer.parseInt(WorldMapLabelSize.otp); // L: 662 - WorldMapLabelSize.otp = ""; // L: 663 - class22.method245(true); // L: 664 - UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 665 - CollisionMap.updateGameState(20); // L: 666 - return; // L: 667 - } - - if (var8 && WorldMapLabelSize.otp.length() < 6) { // L: 669 - WorldMapLabelSize.otp = WorldMapLabelSize.otp + PacketWriter.field1350; - } - } - } - } else if (Login.loginIndex == 5) { // L: 673 - var56 = Login.loginBoxX + 180 - 80; // L: 674 - var7 = 321; // L: 675 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 676 - Login.Login_username = Login.Login_username.trim(); // L: 678 - if (Login.Login_username.length() == 0) { // L: 679 - UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 680 - } else { - long var34 = class13.method134(); // L: 684 - byte var60; - if (0L == var34) { // L: 685 - var60 = 5; - } else { - var12 = Login.Login_username; // L: 688 - Random var36 = new Random(); // L: 690 - Buffer var76 = new Buffer(128); // L: 691 - Buffer var77 = new Buffer(128); // L: 692 - int[] var78 = new int[]{var36.nextInt(), var36.nextInt(), (int)(var34 >> 32), (int)var34}; // L: 693 694 695 696 697 - var76.writeByte(10); // L: 698 - - int var17; - for (var17 = 0; var17 < 4; ++var17) { // L: 699 - var76.writeInt(var36.nextInt()); // L: 700 - } - - var76.writeInt(var78[0]); // L: 702 - var76.writeInt(var78[1]); // L: 703 - var76.writeLong(var34); // L: 704 - var76.writeLong(0L); // L: 705 - - for (var17 = 0; var17 < 4; ++var17) { // L: 706 - var76.writeInt(var36.nextInt()); // L: 707 - } - - var76.encryptRsa(class89.field1161, class89.field1164); // L: 709 - var77.writeByte(10); // L: 710 - - for (var17 = 0; var17 < 3; ++var17) { // L: 711 - var77.writeInt(var36.nextInt()); // L: 712 - } - - var77.writeLong(var36.nextLong()); // L: 714 - var77.writeLongMedium(var36.nextLong()); // L: 715 - WorldMapData_1.method783(var77); // L: 716 - var77.writeLong(var36.nextLong()); // L: 717 - var77.encryptRsa(class89.field1161, class89.field1164); // L: 718 - var17 = Decimator.stringCp1252NullTerminatedByteSize(var12); // L: 719 - if (var17 % 8 != 0) { // L: 720 - var17 += 8 - var17 % 8; - } - - Buffer var70 = new Buffer(var17); // L: 721 - var70.writeStringCp1252NullTerminated(var12); // L: 722 - var70.offset = var17; // L: 723 - var70.xteaEncryptAll(var78); // L: 724 - Buffer var19 = new Buffer(var70.offset + var76.offset + var77.offset + 5); // L: 725 - var19.writeByte(2); // L: 726 - var19.writeByte(var76.offset); // L: 727 - var19.writeBytes(var76.array, 0, var76.offset); // L: 728 - var19.writeByte(var77.offset); // L: 729 - var19.writeBytes(var77.array, 0, var77.offset); // L: 730 - var19.writeShort(var70.offset); // L: 731 - var19.writeBytes(var70.array, 0, var70.offset); // L: 732 - String var71 = class2.method40(var19.array); // L: 733 - - byte var11; - try { - URL var72 = new URL(HealthBarDefinition.method4563("services", false) + "m=accountappeal/login.ws"); // L: 735 - URLConnection var73 = var72.openConnection(); // L: 736 - var73.setDoInput(true); // L: 737 - var73.setDoOutput(true); // L: 738 - var73.setConnectTimeout(5000); // L: 739 - OutputStreamWriter var74 = new OutputStreamWriter(var73.getOutputStream()); // L: 740 - var74.write("data2=" + class298.method5386(var71) + "&dest=" + class298.method5386("passwordchoice.ws")); // L: 741 - var74.flush(); // L: 742 - InputStream var75 = var73.getInputStream(); // L: 743 - var19 = new Buffer(new byte[1000]); // L: 744 - - while (true) { - int var25 = var75.read(var19.array, var19.offset, 1000 - var19.offset); // L: 746 - if (var25 == -1) { // L: 747 - var74.close(); // L: 754 - var75.close(); // L: 755 - String var79 = new String(var19.array); // L: 756 - if (var79.startsWith("OFFLINE")) { // L: 757 - var11 = 4; // L: 758 - } else if (var79.startsWith("WRONG")) { // L: 761 - var11 = 7; // L: 762 - } else if (var79.startsWith("RELOAD")) { // L: 765 - var11 = 3; // L: 766 - } else if (var79.startsWith("Not permitted for social network accounts.")) { // L: 769 - var11 = 6; // L: 770 - } else { - var19.xteaDecryptAll(var78); // L: 773 - - while (var19.offset > 0 && var19.array[var19.offset - 1] == 0) { // L: 774 - --var19.offset; // L: 775 - } - - var79 = new String(var19.array, 0, var19.offset); // L: 777 - boolean var26; - if (var79 == null) { // L: 780 - var26 = false; // L: 781 - } else { - label1379: { - try { - new URL(var79); - } catch (MalformedURLException var48) { // L: 787 - var26 = false; // L: 788 - break label1379; // L: 789 - } - - var26 = true; // L: 791 - } - } - - if (var26) { // L: 793 - class280.openURL(var79, true, false); // L: 794 - var11 = 2; // L: 795 - } else { - var11 = 5; // L: 797 - } - } - break; - } - - var19.offset += var25; // L: 748 - if (var19.offset >= 1000) { // L: 749 - var11 = 5; // L: 750 - break; - } - } - } catch (Throwable var49) { // L: 799 - var49.printStackTrace(); // L: 800 - var11 = 5; // L: 801 - } - - var60 = var11; // L: 804 - } - - switch(var60) { // L: 806 - case 2: - UrlRequester.setLoginResponseString(Strings.field3067, Strings.field3015, Strings.field3069); // L: 820 - Login.loginIndex = 6; // L: 821 - break; // L: 822 - case 3: - UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 824 - break; - case 4: - UrlRequester.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 808 - break; // L: 809 - case 5: - UrlRequester.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 811 - break; // L: 812 - case 6: - UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 817 - break; // L: 818 - case 7: - UrlRequester.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."); // L: 814 - } - } - - return; // L: 828 - } - - var56 = Login.loginBoxX + 180 + 80; // L: 830 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 831 - class41.Login_promptCredentials(true); // L: 832 - } - - var58 = 361; // L: 834 - if (MusicPatchPcmStream.field2519 != null) { // L: 835 - var9 = MusicPatchPcmStream.field2519.highX / 2; // L: 836 - if (var3 == 1 && var54 >= MusicPatchPcmStream.field2519.lowX - var9 && var54 <= var9 + MusicPatchPcmStream.field2519.lowX && var55 >= var58 - 15 && var55 < var58) { // L: 837 - class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 838 - } - } - - while (class60.isKeyDown()) { // L: 841 - var61 = false; // L: 842 - - for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { // L: 843 - if (PacketWriter.field1350 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { // L: 844 - var61 = true; // L: 845 - break; // L: 846 - } - } - - if (PlayerAppearance.field2581 == 13) { // L: 849 - class41.Login_promptCredentials(true); // L: 850 - } else { - if (PlayerAppearance.field2581 == 85 && Login.Login_username.length() > 0) { // L: 853 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (PlayerAppearance.field2581 == 84) { // L: 854 - Login.Login_username = Login.Login_username.trim(); // L: 856 - if (Login.Login_username.length() == 0) { // L: 857 - UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 858 - } else { - long var41 = class13.method134(); // L: 862 - byte var62; - if (var41 == 0L) { // L: 863 - var62 = 5; - } else { - String var37 = Login.Login_username; // L: 866 - Random var38 = new Random(); // L: 868 - Buffer var39 = new Buffer(128); // L: 869 - Buffer var43 = new Buffer(128); // L: 870 - int[] var18 = new int[]{var38.nextInt(), var38.nextInt(), (int)(var41 >> 32), (int)var41}; // L: 871 872 873 874 875 - var39.writeByte(10); // L: 876 - - int var44; - for (var44 = 0; var44 < 4; ++var44) { // L: 877 - var39.writeInt(var38.nextInt()); // L: 878 - } - - var39.writeInt(var18[0]); // L: 880 - var39.writeInt(var18[1]); // L: 881 - var39.writeLong(var41); // L: 882 - var39.writeLong(0L); // L: 883 - - for (var44 = 0; var44 < 4; ++var44) { // L: 884 - var39.writeInt(var38.nextInt()); // L: 885 - } - - var39.encryptRsa(class89.field1161, class89.field1164); // L: 887 - var43.writeByte(10); // L: 888 - - for (var44 = 0; var44 < 3; ++var44) { // L: 889 - var43.writeInt(var38.nextInt()); // L: 890 - } - - var43.writeLong(var38.nextLong()); // L: 892 - var43.writeLongMedium(var38.nextLong()); // L: 893 - WorldMapData_1.method783(var43); // L: 894 - var43.writeLong(var38.nextLong()); // L: 895 - var43.encryptRsa(class89.field1161, class89.field1164); // L: 896 - var44 = Decimator.stringCp1252NullTerminatedByteSize(var37); // L: 897 - if (var44 % 8 != 0) { // L: 898 - var44 += 8 - var44 % 8; - } - - Buffer var20 = new Buffer(var44); // L: 899 - var20.writeStringCp1252NullTerminated(var37); // L: 900 - var20.offset = var44; // L: 901 - var20.xteaEncryptAll(var18); // L: 902 - Buffer var21 = new Buffer(var20.offset + var39.offset + var43.offset + 5); // L: 903 - var21.writeByte(2); // L: 904 - var21.writeByte(var39.offset); // L: 905 - var21.writeBytes(var39.array, 0, var39.offset); // L: 906 - var21.writeByte(var43.offset); // L: 907 - var21.writeBytes(var43.array, 0, var43.offset); // L: 908 - var21.writeShort(var20.offset); // L: 909 - var21.writeBytes(var20.array, 0, var20.offset); // L: 910 - String var22 = class2.method40(var21.array); // L: 911 - - byte var13; - try { - URL var23 = new URL(HealthBarDefinition.method4563("services", false) + "m=accountappeal/login.ws"); // L: 913 - URLConnection var24 = var23.openConnection(); // L: 914 - var24.setDoInput(true); // L: 915 - var24.setDoOutput(true); // L: 916 - var24.setConnectTimeout(5000); // L: 917 - OutputStreamWriter var40 = new OutputStreamWriter(var24.getOutputStream()); // L: 918 - var40.write("data2=" + class298.method5386(var22) + "&dest=" + class298.method5386("passwordchoice.ws")); // L: 919 - var40.flush(); // L: 920 - InputStream var45 = var24.getInputStream(); // L: 921 - var21 = new Buffer(new byte[1000]); // L: 922 - - while (true) { - int var46 = var45.read(var21.array, var21.offset, 1000 - var21.offset); // L: 924 - if (var46 == -1) { // L: 925 - var40.close(); // L: 932 - var45.close(); // L: 933 - String var27 = new String(var21.array); // L: 934 - if (var27.startsWith("OFFLINE")) { // L: 935 - var13 = 4; // L: 936 - } else if (var27.startsWith("WRONG")) { // L: 939 - var13 = 7; // L: 940 - } else if (var27.startsWith("RELOAD")) { // L: 943 - var13 = 3; // L: 944 - } else if (var27.startsWith("Not permitted for social network accounts.")) { // L: 947 - var13 = 6; // L: 948 - } else { - var21.xteaDecryptAll(var18); // L: 951 - - while (var21.offset > 0 && var21.array[var21.offset - 1] == 0) { // L: 952 - --var21.offset; // L: 953 - } - - var27 = new String(var21.array, 0, var21.offset); // L: 955 - boolean var28; - if (var27 == null) { // L: 958 - var28 = false; // L: 959 - } else { - label1381: { - try { - new URL(var27); - } catch (MalformedURLException var50) { // L: 965 - var28 = false; // L: 966 - break label1381; // L: 967 - } - - var28 = true; // L: 969 - } - } - - if (var28) { // L: 971 - class280.openURL(var27, true, false); // L: 972 - var13 = 2; // L: 973 - } else { - var13 = 5; // L: 975 - } - } - break; - } - - var21.offset += var46; // L: 926 - if (var21.offset >= 1000) { // L: 927 - var13 = 5; // L: 928 - break; - } - } - } catch (Throwable var51) { // L: 977 - var51.printStackTrace(); // L: 978 - var13 = 5; // L: 979 - } - - var62 = var13; // L: 982 - } - - switch(var62) { // L: 984 - case 2: - UrlRequester.setLoginResponseString(Strings.field3067, Strings.field3015, Strings.field3069); // L: 986 - Login.loginIndex = 6; // L: 987 - break; // L: 988 - case 3: - UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 999 - break; // L: 1000 - case 4: - UrlRequester.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 990 - break; // L: 991 - case 5: - UrlRequester.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 996 - break; // L: 997 - case 6: - UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 993 - break; // L: 994 - case 7: - UrlRequester.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."); // L: 1002 - } - } - - return; // L: 1006 - } - - if (var61 && Login.Login_username.length() < 320) { // L: 1008 - Login.Login_username = Login.Login_username + PacketWriter.field1350; - } - } - } - } else if (Login.loginIndex != 6) { // L: 1012 - if (Login.loginIndex == 7) { // L: 1023 - var56 = Login.loginBoxX + 180 - 80; // L: 1024 - var7 = 321; // L: 1025 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1026 - class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=dob/set_dob.ws", true, false); // L: 1027 - UrlRequester.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1028 - Login.loginIndex = 6; // L: 1029 - return; // L: 1030 - } - - var56 = Login.loginBoxX + 180 + 80; // L: 1032 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1033 - class41.Login_promptCredentials(true); // L: 1034 - } - } else if (Login.loginIndex == 8) { // L: 1037 - var56 = Login.loginBoxX + 180 - 80; // L: 1038 - var7 = 321; // L: 1039 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1040 - class280.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1041 - UrlRequester.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1042 - Login.loginIndex = 6; // L: 1043 - return; // L: 1044 - } - - var56 = Login.loginBoxX + 180 + 80; // L: 1046 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1047 - class41.Login_promptCredentials(true); // L: 1048 - } - } else if (Login.loginIndex == 12) { // L: 1051 - String var47 = ""; // L: 1052 - switch(Login.field1210) { // L: 1053 - case 0: - var47 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1055 - break; // L: 1056 - case 1: - var47 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1058 - break; // L: 1059 - default: - class41.Login_promptCredentials(false); // L: 1061 - } - - var59 = Login.loginBoxX + 180; // L: 1064 - var58 = 276; // L: 1065 - if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 1066 - class280.openURL(var47, true, false); // L: 1067 - UrlRequester.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1068 - Login.loginIndex = 6; // L: 1069 - return; // L: 1070 - } - - var59 = Login.loginBoxX + 180; // L: 1072 - var58 = 326; // L: 1073 - if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 1074 - class41.Login_promptCredentials(false); // L: 1075 - } - } else if (Login.loginIndex == 24) { // L: 1078 - var56 = Login.loginBoxX + 180; // L: 1079 - var7 = 301; // L: 1080 - if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1081 - class41.Login_promptCredentials(false); // L: 1082 - } - } - } else { - while (true) { - do { - if (!class60.isKeyDown()) { // L: 1013 - var57 = 321; // L: 1018 - if (var3 == 1 && var55 >= var57 - 20 && var55 <= var57 + 20) { // L: 1019 - class41.Login_promptCredentials(true); // L: 1020 - } - - return; - } - } while(PlayerAppearance.field2581 != 84 && PlayerAppearance.field2581 != 13); // L: 1014 - - class41.Login_promptCredentials(true); // L: 1015 - } - } - } - } - } - - } - } } - } // L: 266 + } // L: 69 - @ObfuscatedName("ed") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1948911757" + descriptor = "(CI)Z", + garbageValue = "1886603944" ) - static void load() { - int var27; - if (Client.titleLoadingStage == 0) { // L: 1446 - ScriptEvent.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1447 + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 151 + } - for (var27 = 0; var27 < 4; ++var27) { // L: 1448 - Client.collisionMaps[var27] = new CollisionMap(104, 104); - } - - ApproximateRouteStrategy.sceneMinimapSprite = new Sprite(512, 512); // L: 1449 - Login.Login_loadingText = "Starting game engine..."; // L: 1450 - Login.Login_loadingPercent = 5; // L: 1451 - Client.titleLoadingStage = 20; // L: 1452 - } else if (Client.titleLoadingStage == 20) { // L: 1455 - Login.Login_loadingText = "Prepared visibility map"; // L: 1456 - Login.Login_loadingPercent = 10; // L: 1457 - Client.titleLoadingStage = 30; // L: 1458 - } else if (Client.titleLoadingStage == 30) { // L: 1461 - class182.archive0 = WorldMapLabelSize.newArchive(0, false, true, true); // L: 1462 - Client.archive1 = WorldMapLabelSize.newArchive(1, false, true, true); // L: 1463 - NetFileRequest.archive2 = WorldMapLabelSize.newArchive(2, true, false, true); // L: 1464 - WorldMapID.archive3 = WorldMapLabelSize.newArchive(3, false, true, true); // L: 1465 - GrandExchangeOfferUnitPriceComparator.archive4 = WorldMapLabelSize.newArchive(4, false, true, true); // L: 1466 - WorldMapLabel.archive5 = WorldMapLabelSize.newArchive(5, true, true, true); // L: 1467 - CollisionMap.archive6 = WorldMapLabelSize.newArchive(6, true, true, true); // L: 1468 - WorldMapSection1.archive7 = WorldMapLabelSize.newArchive(7, false, true, true); // L: 1469 - Huffman.archive8 = WorldMapLabelSize.newArchive(8, false, true, true); // L: 1470 - UrlRequester.archive9 = WorldMapLabelSize.newArchive(9, false, true, true); // L: 1471 - Occluder.archive10 = WorldMapLabelSize.newArchive(10, false, true, true); // L: 1472 - GrandExchangeEvent.archive11 = WorldMapLabelSize.newArchive(11, false, true, true); // L: 1473 - ApproximateRouteStrategy.archive12 = WorldMapLabelSize.newArchive(12, false, true, true); // L: 1474 - TilePaint.archive13 = WorldMapLabelSize.newArchive(13, true, false, true); // L: 1475 - PlayerAppearance.archive14 = WorldMapLabelSize.newArchive(14, false, true, true); // L: 1476 - PlayerAppearance.archive15 = WorldMapLabelSize.newArchive(15, false, true, true); // L: 1477 - archive17 = WorldMapLabelSize.newArchive(17, true, true, true); // L: 1478 - MouseRecorder.archive18 = WorldMapLabelSize.newArchive(18, false, true, true); // L: 1479 - WorldMapData_1.archive19 = WorldMapLabelSize.newArchive(19, false, true, true); // L: 1480 - FontName.archive20 = WorldMapLabelSize.newArchive(20, false, true, true); // L: 1481 - Login.Login_loadingText = "Connecting to update server"; // L: 1482 - Login.Login_loadingPercent = 20; // L: 1483 - Client.titleLoadingStage = 40; // L: 1484 - } else if (Client.titleLoadingStage == 40) { // L: 1487 - byte var36 = 0; // L: 1488 - var27 = var36 + class182.archive0.percentage() * 4 / 100; // L: 1489 - var27 += Client.archive1.percentage() * 4 / 100; // L: 1490 - var27 += NetFileRequest.archive2.percentage() * 2 / 100; // L: 1491 - var27 += WorldMapID.archive3.percentage() * 2 / 100; // L: 1492 - var27 += GrandExchangeOfferUnitPriceComparator.archive4.percentage() * 6 / 100; // L: 1493 - var27 += WorldMapLabel.archive5.percentage() * 4 / 100; // L: 1494 - var27 += CollisionMap.archive6.percentage() * 2 / 100; // L: 1495 - var27 += WorldMapSection1.archive7.percentage() * 56 / 100; // L: 1496 - var27 += Huffman.archive8.percentage() * 2 / 100; // L: 1497 - var27 += UrlRequester.archive9.percentage() * 2 / 100; // L: 1498 - var27 += Occluder.archive10.percentage() * 2 / 100; // L: 1499 - var27 += GrandExchangeEvent.archive11.percentage() * 2 / 100; // L: 1500 - var27 += ApproximateRouteStrategy.archive12.percentage() * 2 / 100; // L: 1501 - var27 += TilePaint.archive13.percentage() * 2 / 100; // L: 1502 - var27 += PlayerAppearance.archive14.percentage() * 2 / 100; // L: 1503 - var27 += PlayerAppearance.archive15.percentage() * 2 / 100; // L: 1504 - var27 += WorldMapData_1.archive19.percentage() / 100; // L: 1505 - var27 += MouseRecorder.archive18.percentage() / 100; // L: 1506 - var27 += FontName.archive20.percentage() / 100; // L: 1507 - var27 += archive17.method4340() && archive17.isFullyLoaded() ? 1 : 0; // L: 1508 - if (var27 != 100) { // L: 1509 - if (var27 != 0) { // L: 1510 - Login.Login_loadingText = "Checking for updates - " + var27 + "%"; - } - - Login.Login_loadingPercent = 30; // L: 1511 - } else { - ViewportMouse.method3082(class182.archive0, "Animations"); // L: 1514 - ViewportMouse.method3082(Client.archive1, "Skeletons"); // L: 1515 - ViewportMouse.method3082(GrandExchangeOfferUnitPriceComparator.archive4, "Sound FX"); // L: 1516 - ViewportMouse.method3082(WorldMapLabel.archive5, "Maps"); // L: 1517 - ViewportMouse.method3082(CollisionMap.archive6, "Music Tracks"); // L: 1518 - ViewportMouse.method3082(WorldMapSection1.archive7, "Models"); // L: 1519 - ViewportMouse.method3082(Huffman.archive8, "Sprites"); // L: 1520 - ViewportMouse.method3082(GrandExchangeEvent.archive11, "Music Jingles"); // L: 1521 - ViewportMouse.method3082(PlayerAppearance.archive14, "Music Samples"); // L: 1522 - ViewportMouse.method3082(PlayerAppearance.archive15, "Music Patches"); // L: 1523 - ViewportMouse.method3082(WorldMapData_1.archive19, "World Map"); // L: 1524 - ViewportMouse.method3082(MouseRecorder.archive18, "World Map Geography"); // L: 1525 - ViewportMouse.method3082(FontName.archive20, "World Map Ground"); // L: 1526 - NetSocket.spriteIds = new GraphicsDefaults(); // L: 1527 - NetSocket.spriteIds.decode(archive17); // L: 1528 - Login.Login_loadingText = "Loaded update list"; // L: 1529 - Login.Login_loadingPercent = 30; // L: 1530 - Client.titleLoadingStage = 45; // L: 1531 - } - } else if (Client.titleLoadingStage == 45) { // L: 1534 - class2.method37(22050, !Client.isLowDetail, 2); // L: 1535 - MidiPcmStream var33 = new MidiPcmStream(); // L: 1536 - var33.method3813(9, 128); // L: 1537 - WorldMapManager.pcmPlayer0 = TileItem.method2205(GameShell.taskHandler, 0, 22050); // L: 1538 - WorldMapManager.pcmPlayer0.setStream(var33); // L: 1539 - BoundaryObject.method3385(PlayerAppearance.archive15, PlayerAppearance.archive14, GrandExchangeOfferUnitPriceComparator.archive4, var33); // L: 1540 - IntHashTable.pcmPlayer1 = TileItem.method2205(GameShell.taskHandler, 1, 2048); // L: 1541 - Players.pcmStreamMixer = new PcmStreamMixer(); // L: 1542 - IntHashTable.pcmPlayer1.setStream(Players.pcmStreamMixer); // L: 1543 - class9.decimator = new Decimator(22050, PcmPlayer.field1447); // L: 1544 - Login.Login_loadingText = "Prepared sound engine"; // L: 1545 - Login.Login_loadingPercent = 35; // L: 1546 - Client.titleLoadingStage = 50; // L: 1547 - DevicePcmPlayerProvider.WorldMapElement_fonts = new Fonts(Huffman.archive8, TilePaint.archive13); // L: 1548 - } else if (Client.titleLoadingStage == 50) { // L: 1551 - var27 = FontName.method5439().length; // L: 1552 - Client.fontsMap = DevicePcmPlayerProvider.WorldMapElement_fonts.createMap(FontName.method5439()); // L: 1553 - if (Client.fontsMap.size() < var27) { // L: 1554 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var27 + "%"; // L: 1555 - Login.Login_loadingPercent = 40; // L: 1556 - } else { - DynamicObject.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1559 - ItemDefinition.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1560 - class4.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1561 - WorldMapArea.platformInfo = Client.platformInfoProvider.get(); // L: 1562 - Login.Login_loadingText = "Loaded fonts"; // L: 1563 - Login.Login_loadingPercent = 40; // L: 1564 - Client.titleLoadingStage = 60; // L: 1565 - } - } else { - int var3; - Archive var28; - Archive var29; - if (Client.titleLoadingStage == 60) { // L: 1568 - var28 = Occluder.archive10; // L: 1570 - var29 = Huffman.archive8; // L: 1571 - var3 = 0; // L: 1573 - if (var28.tryLoadFileByNames("title.jpg", "")) { // L: 1574 - ++var3; - } - - if (var29.tryLoadFileByNames("logo", "")) { // L: 1575 - ++var3; - } - - if (var29.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1576 - ++var3; - } - - if (var29.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1577 - ++var3; - } - - if (var29.tryLoadFileByNames("titlebox", "")) { // L: 1578 - ++var3; - } - - if (var29.tryLoadFileByNames("titlebutton", "")) { // L: 1579 - ++var3; - } - - if (var29.tryLoadFileByNames("runes", "")) { // L: 1580 - ++var3; - } - - if (var29.tryLoadFileByNames("title_mute", "")) { // L: 1581 - ++var3; - } - - if (var29.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1582 - ++var3; - } - - if (var29.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1583 - ++var3; - } - - if (var29.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1584 - ++var3; - } - - if (var29.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1585 - ++var3; - } - - var29.tryLoadFileByNames("sl_back", ""); // L: 1586 - var29.tryLoadFileByNames("sl_flags", ""); // L: 1587 - var29.tryLoadFileByNames("sl_arrows", ""); // L: 1588 - var29.tryLoadFileByNames("sl_stars", ""); // L: 1589 - var29.tryLoadFileByNames("sl_button", ""); // L: 1590 - byte var35 = 12; // L: 1596 - if (var3 < var35) { // L: 1599 - Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var35 + "%"; // L: 1600 - Login.Login_loadingPercent = 50; // L: 1601 - } else { - Login.Login_loadingText = "Loaded title screen"; // L: 1604 - Login.Login_loadingPercent = 50; // L: 1605 - CollisionMap.updateGameState(5); // L: 1606 - Client.titleLoadingStage = 70; // L: 1607 - } - } else if (Client.titleLoadingStage == 70) { // L: 1610 - if (!NetFileRequest.archive2.isFullyLoaded()) { // L: 1611 - Login.Login_loadingText = "Loading config - " + NetFileRequest.archive2.loadPercent() + "%"; // L: 1612 - Login.Login_loadingPercent = 60; // L: 1613 - } else { - Archive var32 = NetFileRequest.archive2; // L: 1616 - class1.FloorOverlayDefinition_archive = var32; // L: 1618 - Varcs.method2257(NetFileRequest.archive2); // L: 1620 - Entity.method3381(NetFileRequest.archive2, WorldMapSection1.archive7); // L: 1621 - var28 = NetFileRequest.archive2; // L: 1622 - var29 = WorldMapSection1.archive7; // L: 1623 - boolean var34 = Client.isLowDetail; // L: 1624 - ObjectDefinition.ObjectDefinition_archive = var28; // L: 1626 - DirectByteArrayCopier.ObjectDefinition_modelsArchive = var29; // L: 1627 - ObjectDefinition.ObjectDefinition_isLowDetail = var34; // L: 1628 - Archive var30 = NetFileRequest.archive2; // L: 1630 - Archive var5 = WorldMapSection1.archive7; // L: 1631 - NPCDefinition.NpcDefinition_archive = var30; // L: 1633 - NPCDefinition.NpcDefinition_modelArchive = var5; // L: 1634 - Script.method2325(NetFileRequest.archive2); // L: 1636 - UserComparator9.method3487(NetFileRequest.archive2, WorldMapSection1.archive7, Client.isMembersWorld, DynamicObject.fontPlain11); // L: 1637 - Archive var6 = NetFileRequest.archive2; // L: 1638 - Archive var7 = class182.archive0; // L: 1639 - Archive var8 = Client.archive1; // L: 1640 - SequenceDefinition.SequenceDefinition_archive = var6; // L: 1642 - SequenceDefinition.SequenceDefinition_animationsArchive = var7; // L: 1643 - GrandExchangeOfferAgeComparator.SequenceDefinition_skeletonsArchive = var8; // L: 1644 - Archive var9 = NetFileRequest.archive2; // L: 1646 - Archive var10 = WorldMapSection1.archive7; // L: 1647 - SpotAnimationDefinition.SpotAnimationDefinition_archive = var9; // L: 1649 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var10; // L: 1650 - Archive var11 = NetFileRequest.archive2; // L: 1652 - VarbitDefinition.VarbitDefinition_archive = var11; // L: 1654 - class227.method4185(NetFileRequest.archive2); // L: 1656 - Archive var12 = WorldMapID.archive3; // L: 1657 - Archive var13 = WorldMapSection1.archive7; // L: 1658 - Archive var14 = Huffman.archive8; // L: 1659 - Archive var15 = TilePaint.archive13; // L: 1660 - Widget.Widget_archive = var12; // L: 1662 - Widget.Widget_modelsArchive = var13; // L: 1663 - Messages.Widget_spritesArchive = var14; // L: 1664 - HealthBar.Widget_fontsArchive = var15; // L: 1665 - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; // L: 1666 - Bounds.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; // L: 1667 - class4.method73(NetFileRequest.archive2); // L: 1669 - class225.method4129(NetFileRequest.archive2); // L: 1670 - Archive var16 = NetFileRequest.archive2; // L: 1671 - VarcInt.VarcInt_archive = var16; // L: 1673 - Archive var17 = NetFileRequest.archive2; // L: 1675 - ParamDefinition.ParamDefinition_archive = var17; // L: 1677 - ClientPreferences.varcs = new Varcs(); // L: 1679 - Archive var18 = NetFileRequest.archive2; // L: 1680 - Archive var19 = Huffman.archive8; // L: 1681 - Archive var20 = TilePaint.archive13; // L: 1682 - HitSplatDefinition.HitSplatDefinition_archive = var18; // L: 1684 - HitSplatDefinition.field3364 = var19; // L: 1685 - HitSplatDefinition.HitSplatDefinition_fontsArchive = var20; // L: 1686 - Archive var21 = NetFileRequest.archive2; // L: 1688 - Archive var22 = Huffman.archive8; // L: 1689 - HealthBarDefinition.HealthBarDefinition_archive = var21; // L: 1691 - HealthBarDefinition.HitSplatDefinition_spritesArchive = var22; // L: 1692 - Archive var23 = NetFileRequest.archive2; // L: 1694 - Archive var24 = Huffman.archive8; // L: 1695 - WorldMapElement.WorldMapElement_archive = var24; // L: 1697 - if (var23.isFullyLoaded()) { // L: 1698 - WorldMapElement.WorldMapElement_count = var23.getGroupFileCount(35); // L: 1701 - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 1702 - - for (int var25 = 0; var25 < WorldMapElement.WorldMapElement_count; ++var25) { // L: 1703 - byte[] var26 = var23.takeFile(35, var25); // L: 1704 - WorldMapElement.WorldMapElement_cached[var25] = new WorldMapElement(var25); // L: 1705 - if (var26 != null) { // L: 1706 - WorldMapElement.WorldMapElement_cached[var25].decode(new Buffer(var26)); // L: 1707 - WorldMapElement.WorldMapElement_cached[var25].method4469(); // L: 1708 - } - } - } - - Login.Login_loadingText = "Loaded config"; // L: 1712 - Login.Login_loadingPercent = 60; // L: 1713 - Client.titleLoadingStage = 80; // L: 1714 - } - } else if (Client.titleLoadingStage == 80) { // L: 1717 - var27 = 0; // L: 1718 - if (LoginPacket.compass == null) { // L: 1719 - LoginPacket.compass = AbstractUserComparator.SpriteBuffer_getSprite(Huffman.archive8, NetSocket.spriteIds.compass, 0); - } else { - ++var27; // L: 1720 - } - - if (FontName.redHintArrowSprite == null) { // L: 1721 - FontName.redHintArrowSprite = AbstractUserComparator.SpriteBuffer_getSprite(Huffman.archive8, NetSocket.spriteIds.field3831, 0); - } else { - ++var27; // L: 1722 - } - - if (ReflectionCheck.mapSceneSprites == null) { // L: 1723 - ReflectionCheck.mapSceneSprites = UserComparator5.method3515(Huffman.archive8, NetSocket.spriteIds.mapScenes, 0); - } else { - ++var27; // L: 1724 - } - - if (class279.headIconPkSprites == null) { // L: 1725 - class279.headIconPkSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.headIconsPk, 0); - } else { - ++var27; // L: 1726 - } - - if (Client.headIconPrayerSprites == null) { // L: 1727 - Client.headIconPrayerSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3839, 0); - } else { - ++var27; // L: 1728 - } - - if (Varcs.headIconHintSprites == null) { // L: 1729 - Varcs.headIconHintSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3835, 0); - } else { - ++var27; // L: 1730 - } - - if (VarbitDefinition.mapMarkerSprites == null) { // L: 1731 - VarbitDefinition.mapMarkerSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3838, 0); - } else { - ++var27; // L: 1732 - } - - if (ArchiveLoader.crossSprites == null) { // L: 1733 - ArchiveLoader.crossSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3837, 0); - } else { - ++var27; // L: 1734 - } - - if (class235.mapDotSprites == null) { // L: 1735 - class235.mapDotSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3836, 0); - } else { - ++var27; // L: 1736 - } - - if (GrandExchangeEvent.scrollBarSprites == null) { // L: 1737 - GrandExchangeEvent.scrollBarSprites = UserComparator5.method3515(Huffman.archive8, NetSocket.spriteIds.field3834, 0); - } else { - ++var27; // L: 1738 - } - - if (GrandExchangeOfferWorldComparator.modIconSprites == null) { // L: 1739 - GrandExchangeOfferWorldComparator.modIconSprites = UserComparator5.method3515(Huffman.archive8, NetSocket.spriteIds.field3840, 0); - } else { - ++var27; // L: 1740 - } - - if (var27 < 11) { // L: 1741 - Login.Login_loadingText = "Loading sprites - " + var27 * 100 / 12 + "%"; // L: 1742 - Login.Login_loadingPercent = 70; // L: 1743 - } else { - AbstractFont.AbstractFont_modIconSprites = GrandExchangeOfferWorldComparator.modIconSprites; // L: 1746 - FontName.redHintArrowSprite.normalize(); // L: 1747 - int var1 = (int)(Math.random() * 21.0D) - 10; // L: 1748 - int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1749 - var3 = (int)(Math.random() * 21.0D) - 10; // L: 1750 - int var4 = (int)(Math.random() * 41.0D) - 20; // L: 1751 - ReflectionCheck.mapSceneSprites[0].shiftColors(var4 + var1, var2 + var4, var4 + var3); // L: 1752 - Login.Login_loadingText = "Loaded sprites"; // L: 1753 - Login.Login_loadingPercent = 70; // L: 1754 - Client.titleLoadingStage = 90; // L: 1755 - } - } else if (Client.titleLoadingStage == 90) { // L: 1758 - if (!UrlRequester.archive9.isFullyLoaded()) { // L: 1759 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1760 - Login.Login_loadingPercent = 90; // L: 1761 - } else { - class41.textureProvider = new TextureProvider(UrlRequester.archive9, Huffman.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); // L: 1764 - Rasterizer3D.Rasterizer3D_setTextureLoader(class41.textureProvider); // L: 1765 - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 1766 - Client.titleLoadingStage = 100; // L: 1767 - } - } else if (Client.titleLoadingStage == 100) { // L: 1770 - var27 = class41.textureProvider.getLoadedPercentage(); // L: 1771 - if (var27 < 100) { // L: 1772 - Login.Login_loadingText = "Loading textures - " + var27 + "%"; // L: 1773 - Login.Login_loadingPercent = 90; // L: 1774 - } else { - Login.Login_loadingText = "Loaded textures"; // L: 1777 - Login.Login_loadingPercent = 90; // L: 1778 - Client.titleLoadingStage = 110; // L: 1779 - } - } else if (Client.titleLoadingStage == 110) { // L: 1782 - ByteArrayPool.mouseRecorder = new MouseRecorder(); // L: 1783 - GameShell.taskHandler.newThreadTask(ByteArrayPool.mouseRecorder, 10); // L: 1784 - Login.Login_loadingText = "Loaded input handler"; // L: 1785 - Login.Login_loadingPercent = 92; // L: 1786 - Client.titleLoadingStage = 120; // L: 1787 - } else if (Client.titleLoadingStage == 120) { // L: 1790 - if (!Occluder.archive10.tryLoadFileByNames("huffman", "")) { // L: 1791 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1792 - Login.Login_loadingPercent = 94; // L: 1793 - } else { - Huffman var0 = new Huffman(Occluder.archive10.takeFileByNames("huffman", "")); // L: 1796 - class219.huffman = var0; // L: 1798 - Login.Login_loadingText = "Loaded wordpack"; // L: 1800 - Login.Login_loadingPercent = 94; // L: 1801 - Client.titleLoadingStage = 130; // L: 1802 - } - } else if (Client.titleLoadingStage == 130) { // L: 1805 - if (!WorldMapID.archive3.isFullyLoaded()) { // L: 1806 - Login.Login_loadingText = "Loading interfaces - " + WorldMapID.archive3.loadPercent() * 4 / 5 + "%"; // L: 1807 - Login.Login_loadingPercent = 96; // L: 1808 - } else if (!ApproximateRouteStrategy.archive12.isFullyLoaded()) { // L: 1811 - Login.Login_loadingText = "Loading interfaces - " + (80 + ApproximateRouteStrategy.archive12.loadPercent() / 6) + "%"; // L: 1812 - Login.Login_loadingPercent = 96; // L: 1813 - } else if (!TilePaint.archive13.isFullyLoaded()) { // L: 1816 - Login.Login_loadingText = "Loading interfaces - " + (96 + TilePaint.archive13.loadPercent() / 50) + "%"; // L: 1817 - Login.Login_loadingPercent = 96; // L: 1818 - } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 1821 - Login.Login_loadingPercent = 98; // L: 1822 - Client.titleLoadingStage = 140; // L: 1823 - } - } else if (Client.titleLoadingStage == 140) { // L: 1826 - Login.Login_loadingPercent = 100; // L: 1827 - if (!WorldMapData_1.archive19.tryLoadGroupByName(WorldMapCacheName.field322.name)) { // L: 1828 - Login.Login_loadingText = "Loading world map - " + WorldMapData_1.archive19.groupLoadPercentByName(WorldMapCacheName.field322.name) / 10 + "%"; // L: 1829 - } else { - if (Message.worldMap == null) { // L: 1832 - Message.worldMap = new WorldMap(); // L: 1833 - Message.worldMap.init(WorldMapData_1.archive19, MouseRecorder.archive18, FontName.archive20, class4.fontBold12, Client.fontsMap, ReflectionCheck.mapSceneSprites); // L: 1834 - } - - Login.Login_loadingText = "Loaded world map"; // L: 1836 - Client.titleLoadingStage = 150; // L: 1837 - } - } else if (Client.titleLoadingStage == 150) { // L: 1840 - CollisionMap.updateGameState(10); // L: 1841 - } + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "2004525575" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = ItemContainer.getWidgetChild(var0, var1); // L: 8792 + if (var4 != null && var4.onTargetEnter != null) { // L: 8793 + ScriptEvent var5 = new ScriptEvent(); // L: 8794 + var5.widget = var4; // L: 8795 + var5.args = var4.onTargetEnter; // L: 8796 + Entity.runScriptEvent(var5); // L: 8797 } - } // L: 1453 1459 1485 1512 1532 1549 1557 1566 1602 1608 1614 1715 1744 1756 1762 1768 1775 1780 1788 1794 1803 1809 1814 1819 1824 1830 1838 1842 1844 + + Client.field838 = var3; // L: 8799 + Client.isSpellSelected = true; // L: 8800 + class307.selectedSpellWidget = var0; // L: 8801 + Client.selectedSpellChildIndex = var1; // L: 8802 + class105.selectedSpellFlags = var2; // L: 8803 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var4); // L: 8804 + } // L: 8805 } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index b4bc042be5..b2594dea1b 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -1,11 +1,135 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") -public final class class300 { - @ObfuscatedName("h") +@ObfuscatedName("kw") +public class class300 { + @ObfuscatedName("f") + static char[] field3686; + @ObfuscatedName("b") + static char[] field3682; + @ObfuscatedName("l") + static char[] field3684; + @ObfuscatedName("m") + static int[] field3685; + + static { + field3686 = new char[64]; // L: 7 + + int var0; + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field3686[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field3686[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field3686[var0] = (char)(var0 + 48 - 52); + } + + field3686[62] = '+'; // L: 11 + field3686[63] = '/'; // L: 12 + field3682 = new char[64]; // L: 18 + + for (var0 = 0; var0 < 26; ++var0) { // L: 19 + field3682[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 20 + field3682[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 21 + field3682[var0] = (char)(var0 + 48 - 52); + } + + field3682[62] = '*'; // L: 22 + field3682[63] = '-'; // L: 23 + field3684 = new char[64]; // L: 29 + + for (var0 = 0; var0 < 26; ++var0) { // L: 30 + field3684[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 31 + field3684[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field3684[var0] = (char)(var0 + 48 - 52); + } + + field3684[62] = '-'; // L: 33 + field3684[63] = '_'; // L: 34 + field3685 = new int[128]; // L: 40 + + for (var0 = 0; var0 < field3685.length; ++var0) { // L: 41 + field3685[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field3685[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field3685[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field3685[var0] = var0 - 48 + 52; + } + + int[] var2 = field3685; // L: 45 + field3685[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field3685; // L: 48 + field3685[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("iv") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "(IIIIIII)V", + garbageValue = "-364565462" ) - public static PlayerProvider pcmPlayerProvider; + static final void method5419(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 9800 + int var7 = var3 - var1; // L: 9801 + int var8 = var6 >= 0 ? var6 : -var6; // L: 9802 + int var9 = var7 >= 0 ? var7 : -var7; // L: 9803 + int var10 = var8; // L: 9804 + if (var8 < var9) { // L: 9805 + var10 = var9; + } + + if (var10 != 0) { // L: 9806 + int var11 = (var6 << 16) / var10; // L: 9807 + int var12 = (var7 << 16) / var10; // L: 9808 + if (var12 <= var11) { // L: 9809 + var11 = -var11; + } else { + var12 = -var12; // L: 9810 + } + + int var13 = var5 * var12 >> 17; // L: 9811 + int var14 = var5 * var12 + 1 >> 17; // L: 9812 + int var15 = var5 * var11 >> 17; // L: 9813 + int var16 = var5 * var11 + 1 >> 17; // L: 9814 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9815 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9816 + int var17 = var0 + var13; // L: 9817 + int var18 = var0 - var14; // L: 9818 + int var19 = var0 + var6 - var14; // L: 9819 + int var20 = var0 + var13 + var6; // L: 9820 + int var21 = var15 + var1; // L: 9821 + int var22 = var1 - var16; // L: 9822 + int var23 = var7 + var1 - var16; // L: 9823 + int var24 = var7 + var15 + var1; // L: 9824 + Rasterizer3D.method3137(var17, var18, var19); // L: 9825 + Rasterizer3D.method3149(var21, var22, var23, var17, var18, var19, var4); // L: 9826 + Rasterizer3D.method3137(var17, var19, var20); // L: 9827 + Rasterizer3D.method3149(var21, var23, var24, var17, var19, var20, var4); // L: 9828 + } + } // L: 9829 } diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java new file mode 100644 index 0000000000..8810c2c941 --- /dev/null +++ b/runescape-client/src/main/java/class301.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kr") +public final class class301 { + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "[Lle;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; +} diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java deleted file mode 100644 index a3ca29d163..0000000000 --- a/runescape-client/src/main/java/class303.java +++ /dev/null @@ -1,150 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("kv") -public class class303 { - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILcy;ZI)I", - garbageValue = "-723609398" - ) - static int method5451(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.ADD) { // L: 2416 - Interpreter.Interpreter_intStackSize -= 2; // L: 2417 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2418 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2419 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var9; // L: 2420 - return 1; // L: 2421 - } else if (var0 == ScriptOpcodes.SUB) { // L: 2423 - Interpreter.Interpreter_intStackSize -= 2; // L: 2424 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2425 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2426 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 - var4; // L: 2427 - return 1; // L: 2428 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2430 - Interpreter.Interpreter_intStackSize -= 2; // L: 2431 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2432 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2433 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 * var9; // L: 2434 - return 1; // L: 2435 - } else if (var0 == ScriptOpcodes.DIV) { // L: 2437 - Interpreter.Interpreter_intStackSize -= 2; // L: 2438 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2439 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2440 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 / var4; // L: 2441 - return 1; // L: 2442 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2444 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2445 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var9); // L: 2446 - return 1; // L: 2447 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2449 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2450 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var9 + 1)); // L: 2451 - return 1; // L: 2452 - } else if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2454 - Interpreter.Interpreter_intStackSize -= 5; // L: 2455 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2456 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2457 - int var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2458 - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2459 - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 2460 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 + (var11 - var10) * (var4 - var9) / (var6 - var10); // L: 2461 - return 1; // L: 2462 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2464 - Interpreter.Interpreter_intStackSize -= 2; // L: 2465 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2466 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2467 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 + var9 * var4 / 100; // L: 2468 - return 1; // L: 2469 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2471 - Interpreter.Interpreter_intStackSize -= 2; // L: 2472 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2473 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2474 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 | 1 << var4; // L: 2475 - return 1; // L: 2476 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2478 - Interpreter.Interpreter_intStackSize -= 2; // L: 2479 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2480 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2481 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 & -1 - (1 << var4); // L: 2482 - return 1; // L: 2483 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2485 - Interpreter.Interpreter_intStackSize -= 2; // L: 2486 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2487 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2488 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var9 & 1 << var4) != 0 ? 1 : 0; // L: 2489 - return 1; // L: 2490 - } else if (var0 == ScriptOpcodes.MOD) { // L: 2492 - Interpreter.Interpreter_intStackSize -= 2; // L: 2493 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2494 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2495 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 % var4; // L: 2496 - return 1; // L: 2497 - } else if (var0 == ScriptOpcodes.POW) { // L: 2499 - Interpreter.Interpreter_intStackSize -= 2; // L: 2500 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2501 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2502 - if (var9 == 0) { // L: 2503 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, (double)var4); // L: 2504 - } - - return 1; // L: 2505 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2507 - Interpreter.Interpreter_intStackSize -= 2; // L: 2508 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2509 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2510 - if (var9 == 0) { // L: 2511 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2512 - return 1; // L: 2513 - } else { - switch(var4) { // L: 2515 - case 0: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2538 - break; // L: 2539 - case 1: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9; // L: 2528 - break; // L: 2529 - case 2: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var9); // L: 2523 - break; // L: 2524 - case 3: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var9); // L: 2518 - break; - case 4: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var9)); // L: 2533 - break; // L: 2534 - default: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, 1.0D / (double)var4); // L: 2543 - } - - return 1; // L: 2547 - } - } else if (var0 == ScriptOpcodes.AND) { // L: 2549 - Interpreter.Interpreter_intStackSize -= 2; // L: 2550 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2551 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2552 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 & var4; // L: 2553 - return 1; // L: 2554 - } else if (var0 == ScriptOpcodes.OR) { // L: 2556 - Interpreter.Interpreter_intStackSize -= 2; // L: 2557 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2558 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2559 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 | var4; // L: 2560 - return 1; // L: 2561 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 2563 - Interpreter.Interpreter_intStackSize -= 3; // L: 2564 - long var3 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2565 - long var5 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2566 - long var7 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2567 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var7 * var3 / var5); // L: 2568 - return 1; // L: 2569 - } else { - return 2; // L: 2571 - } - } -} diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java deleted file mode 100644 index 30eb43bbc6..0000000000 --- a/runescape-client/src/main/java/class306.java +++ /dev/null @@ -1,11 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ki") -public final class class306 { - @ObfuscatedName("z") - @ObfuscatedGetter( - longValue = 4608600077918488349L - ) - static long field3723; -} diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java index 9db7efca3b..7a2453b896 100644 --- a/runescape-client/src/main/java/class307.java +++ b/runescape-client/src/main/java/class307.java @@ -1,113 +1,18 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") -public class class307 { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-2104430234" +@ObfuscatedName("kp") +public final class class307 { + @ObfuscatedName("b") + @ObfuscatedGetter( + longValue = -7604974747731258625L ) - public static char method5555(char var0) { - switch(var0) { // L: 48 - case ' ': - case '-': - case '_': - case ' ': - return '_'; // L: 62 - case '#': - case '[': - case ']': - return var0; // L: 92 - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; // L: 117 - case 'Ç': - case 'ç': - return 'c'; // L: 79 - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; // L: 88 - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - return 'i'; // L: 57 - case 'Ñ': - case 'ñ': - return 'n'; // L: 95 - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; // L: 106 - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; // L: 74 - case 'ß': - return 'b'; // L: 50 - case 'ÿ': - case 'Ÿ': - return 'y'; // L: 65 - default: - return Character.toLowerCase(var0); // L: 76 - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(B)[Lls;", - garbageValue = "1" + static long field3731; + @ObfuscatedName("mi") + @ObfuscatedGetter( + intValue = 542480531 ) - static IndexedSprite[] method5558() { - IndexedSprite[] var0 = new IndexedSprite[class335.SpriteBuffer_spriteCount]; // L: 154 - - for (int var1 = 0; var1 < class335.SpriteBuffer_spriteCount; ++var1) { // L: 155 - IndexedSprite var2 = var0[var1] = new IndexedSprite(); // L: 156 - var2.width = class335.SpriteBuffer_spriteWidth; // L: 157 - var2.height = class335.SpriteBuffer_spriteHeight; // L: 158 - var2.xOffset = Username.SpriteBuffer_xOffsets[var1]; // L: 159 - var2.yOffset = class335.SpriteBuffer_yOffsets[var1]; // L: 160 - var2.subWidth = class335.SpriteBuffer_spriteWidths[var1]; // L: 161 - var2.subHeight = class335.SpriteBuffer_spriteHeights[var1]; // L: 162 - var2.palette = TaskHandler.SpriteBuffer_spritePalette; // L: 163 - var2.pixels = class92.SpriteBuffer_pixels[var1]; // L: 164 - } - - Username.SpriteBuffer_xOffsets = null; // L: 167 - class335.SpriteBuffer_yOffsets = null; // L: 168 - class335.SpriteBuffer_spriteWidths = null; // L: 169 - class335.SpriteBuffer_spriteHeights = null; // L: 170 - TaskHandler.SpriteBuffer_spritePalette = null; // L: 171 - class92.SpriteBuffer_pixels = null; // L: 172 - return var0; // L: 174 - } + @Export("selectedSpellWidget") + static int selectedSpellWidget; } diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class308.java new file mode 100644 index 0000000000..b0cba3189e --- /dev/null +++ b/runescape-client/src/main/java/class308.java @@ -0,0 +1,67 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kj") +public class class308 { + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-119" + ) + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3686 + GrandExchangeOfferAgeComparator.clientPreferences.roofsHidden = !GrandExchangeOfferAgeComparator.clientPreferences.roofsHidden; // L: 3687 + Tile.savePreferences(); // L: 3688 + if (GrandExchangeOfferAgeComparator.clientPreferences.roofsHidden) { // L: 3689 + DevicePcmPlayerProvider.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + DevicePcmPlayerProvider.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3690 + } + } + + if (var0.equalsIgnoreCase("displayfps")) { // L: 3692 + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3693 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3694 + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { // L: 3695 + if (var0.equalsIgnoreCase("errortest")) { // L: 3696 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3697 + KeyHandler.worldMap.showCoord = !KeyHandler.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3698 + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3699 + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { // L: 3700 + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3701 + FloorDecoration.method2986(); + } + } + + PacketBufferNode var1 = class4.getPacketBufferNode(ClientPacket.field2331, Client.packetWriter.isaacCipher); // L: 3704 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3705 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3706 + Client.packetWriter.addNode(var1); // L: 3707 + } // L: 3708 +} diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class311.java similarity index 91% rename from runescape-client/src/main/java/class310.java rename to runescape-client/src/main/java/class311.java index 9b9396cfae..2bd700ac4f 100644 --- a/runescape-client/src/main/java/class310.java +++ b/runescape-client/src/main/java/class311.java @@ -1,8 +1,10 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kn") -public class class310 { - @ObfuscatedName("z") +@ObfuscatedName("kh") +public class class311 { + @ObfuscatedName("f") + @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { if (var2 == var0) { // L: 12 if (var3 == var1) { // L: 13 @@ -49,7 +51,8 @@ public class class310 { } // L: 49 - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 var0[var1++] = 0; // L: 366 diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java deleted file mode 100644 index 4d776d488d..0000000000 --- a/runescape-client/src/main/java/class322.java +++ /dev/null @@ -1,62 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ly") -public enum class322 implements Enumerated { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - field3841(1, 0), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - field3842(5, 2), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - field3843(2, 5), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - field3848(4, 6), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - field3845(3, 7), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - field3846(0, 8); - - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -437447657 - ) - final int field3847; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1336869107 - ) - final int field3844; - - class322(int var3, int var4) { - this.field3847 = var3; // L: 18 - this.field3844 = var4; // L: 19 - } // L: 20 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" - ) - public int rsOrdinal() { - return this.field3844; // L: 23 - } -} diff --git a/runescape-client/src/main/java/class323.java b/runescape-client/src/main/java/class323.java new file mode 100644 index 0000000000..2a26bbca0f --- /dev/null +++ b/runescape-client/src/main/java/class323.java @@ -0,0 +1,212 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lh") +public enum class323 implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llh;" + ) + field3849(4, 0), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Llh;" + ) + field3848(2, 2), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Llh;" + ) + field3855(5, 5), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Llh;" + ) + field3850(1, 6), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Llh;" + ) + field3851(0, 7), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Llh;" + ) + field3852(3, 8); + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lle;" + ) + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1864683271 + ) + final int field3853; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -475570997 + ) + final int field3847; + + class323(int var3, int var4) { + this.field3853 = var3; // L: 18 + this.field3847 = var4; // L: 19 + } // L: 20 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "23" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3847; // L: 23 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Lmc;I)Ljava/lang/String;", + garbageValue = "586268379" + ) + public static String method6048(CharSequence var0, LoginType var1) { + if (var0 == null) { // L: 40 + return null; + } else { + int var2 = 0; // L: 41 + + int var3; + for (var3 = var0.length(); var2 < var3 && Tiles.method1223(var0.charAt(var2)); ++var2) { // L: 42 43 + } + + while (var3 > var2 && Tiles.method1223(var0.charAt(var3 - 1))) { // L: 44 + --var3; + } + + int var4 = var3 - var2; // L: 45 + if (var4 >= 1) { // L: 47 + byte var6; + if (var1 == null) { // L: 51 + var6 = 12; // L: 52 + } else { + switch(var1.field4070) { // L: 55 + case 6: + var6 = 20; // L: 57 + break; // L: 58 + default: + var6 = 12; // L: 60 + } + } + + if (var4 <= var6) { // L: 64 + StringBuilder var10 = new StringBuilder(var4); // L: 68 + + for (int var11 = var2; var11 < var3; ++var11) { // L: 69 + char var7 = var0.charAt(var11); // L: 70 + if (class9.method124(var7)) { // L: 71 + char var8; + switch(var7) { // L: 74 + case ' ': + case '-': + case '_': + case ' ': + var8 = '_'; // L: 105 + break; // L: 106 + case '#': + case '[': + case ']': + var8 = var7; // L: 88 + break; // L: 89 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var8 = 'a'; // L: 117 + break; // L: 118 + case 'Ç': + case 'ç': + var8 = 'c'; // L: 96 + break; // L: 97 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var8 = 'e'; // L: 83 + break; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var8 = 'i'; // L: 147 + break; // L: 148 + case 'Ñ': + case 'ñ': + var8 = 'n'; // L: 92 + break; // L: 93 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var8 = 'o'; // L: 129 + break; // L: 130 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var8 = 'u'; // L: 139 + break; // L: 140 + case 'ß': + var8 = 'b'; // L: 154 + break; + case 'ÿ': + case 'Ÿ': + var8 = 'y'; // L: 151 + break; // L: 152 + default: + var8 = Character.toLowerCase(var7); // L: 99 + } + + if (var8 != 0) { // L: 159 + var10.append(var8); // L: 160 + } + } + } + + if (var10.length() == 0) { // L: 162 + return null; + } + + return var10.toString(); // L: 163 + } + } + + return null; // L: 66 + } + } +} diff --git a/runescape-client/src/main/java/class335.java b/runescape-client/src/main/java/class335.java deleted file mode 100644 index 3e7690af96..0000000000 --- a/runescape-client/src/main/java/class335.java +++ /dev/null @@ -1,27 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("lj") -public class class335 { - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -245984031 - ) - static int SpriteBuffer_spriteCount; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -112832063 - ) - static int SpriteBuffer_spriteWidth; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 707136589 - ) - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("i") - static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("o") - static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("x") - static int[] SpriteBuffer_spriteHeights; -} diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index c632a4411c..bb23b2b25b 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -1,101 +1,452 @@ +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("le") +@ObfuscatedName("li") public class class336 { - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILcy;ZB)I", - garbageValue = "-81" + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -691755619 ) - static int method6380(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3201 - Interpreter.Interpreter_intStackSize -= 2; // L: 3202 - Client.field769 = (short)class197.method3741(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); // L: 3203 - if (Client.field769 <= 0) { // L: 3204 - Client.field769 = 256; + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1823110703 + ) + @Export("SpriteBuffer_spriteWidth") + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -2023472681 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("m") + @Export("SpriteBuffer_xOffsets") + static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("q") + @Export("SpriteBuffer_spriteWidths") + static int[] SpriteBuffer_spriteWidths; + @ObfuscatedName("k") + @Export("SpriteBuffer_spriteHeights") + static int[] SpriteBuffer_spriteHeights; + + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "374882055" + ) + @Export("load") + static void load() { + int var26; + if (Client.titleLoadingStage == 0) { // L: 1922 + ModeWhere.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1923 + + for (var26 = 0; var26 < 4; ++var26) { // L: 1924 + Client.collisionMaps[var26] = new CollisionMap(104, 104); } - Client.field928 = (short)class197.method3741(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3205 - if (Client.field928 <= 0) { // L: 3206 - Client.field928 = 256; - } - - return 1; // L: 3207 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3209 - Interpreter.Interpreter_intStackSize -= 2; // L: 3210 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3211 - if (Client.zoomHeight <= 0) { // L: 3212 - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3213 - if (Client.zoomWidth <= 0) { // L: 3214 - Client.zoomWidth = 320; - } - - return 1; // L: 3215 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3217 - Interpreter.Interpreter_intStackSize -= 4; // L: 3218 - Client.field931 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3219 - if (Client.field931 <= 0) { // L: 3220 - Client.field931 = 1; - } - - Client.field932 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3221 - if (Client.field932 <= 0) { // L: 3222 - Client.field932 = 32767; - } else if (Client.field932 < Client.field931) { // L: 3223 - Client.field932 = Client.field931; - } - - Client.field938 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3224 - if (Client.field938 <= 0) { // L: 3225 - Client.field938 = 1; - } - - Client.field934 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3226 - if (Client.field934 <= 0) { // L: 3227 - Client.field934 = 32767; - } else if (Client.field934 < Client.field938) { // L: 3228 - Client.field934 = Client.field938; - } - - return 1; // L: 3229 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3231 - if (Client.viewportWidget != null) { // L: 3232 - class231.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3233 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3234 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3235 + InterfaceParent.sceneMinimapSprite = new Sprite(512, 512); // L: 1925 + Login.Login_loadingText = "Starting game engine..."; // L: 1926 + Login.Login_loadingPercent = 5; // L: 1927 + Client.titleLoadingStage = 20; // L: 1928 + } else if (Client.titleLoadingStage == 20) { // L: 1931 + Login.Login_loadingText = "Prepared visibility map"; // L: 1932 + Login.Login_loadingPercent = 10; // L: 1933 + Client.titleLoadingStage = 30; // L: 1934 + } else if (Client.titleLoadingStage == 30) { // L: 1937 + MenuAction.archive0 = ReflectionCheck.newArchive(0, false, true, true); // L: 1938 + WorldMapManager.archive1 = ReflectionCheck.newArchive(1, false, true, true); // L: 1939 + WorldMapSection3.archive2 = ReflectionCheck.newArchive(2, true, false, true); // L: 1940 + FaceNormal.archive3 = ReflectionCheck.newArchive(3, false, true, true); // L: 1941 + Username.archive4 = ReflectionCheck.newArchive(4, false, true, true); // L: 1942 + Varcs.archive5 = ReflectionCheck.newArchive(5, true, true, true); // L: 1943 + ApproximateRouteStrategy.archive6 = ReflectionCheck.newArchive(6, true, true, true); // L: 1944 + class236.archive7 = ReflectionCheck.newArchive(7, false, true, true); // L: 1945 + GrandExchangeOffer.archive8 = ReflectionCheck.newArchive(8, false, true, true); // L: 1946 + WorldMapData_1.archive9 = ReflectionCheck.newArchive(9, false, true, true); // L: 1947 + class281.archive10 = ReflectionCheck.newArchive(10, false, true, true); // L: 1948 + AbstractByteArrayCopier.archive11 = ReflectionCheck.newArchive(11, false, true, true); // L: 1949 + ViewportMouse.archive12 = ReflectionCheck.newArchive(12, false, true, true); // L: 1950 + class8.archive13 = ReflectionCheck.newArchive(13, true, false, true); // L: 1951 + AbstractByteArrayCopier.archive14 = ReflectionCheck.newArchive(14, false, true, true); // L: 1952 + class1.archive15 = ReflectionCheck.newArchive(15, false, true, true); // L: 1953 + class23.archive17 = ReflectionCheck.newArchive(17, true, true, true); // L: 1954 + ModelData0.archive18 = ReflectionCheck.newArchive(18, false, true, true); // L: 1955 + class60.archive19 = ReflectionCheck.newArchive(19, false, true, true); // L: 1956 + Tiles.archive20 = ReflectionCheck.newArchive(20, false, true, true); // L: 1957 + Login.Login_loadingText = "Connecting to update server"; // L: 1958 + Login.Login_loadingPercent = 20; // L: 1959 + Client.titleLoadingStage = 40; // L: 1960 + } else if (Client.titleLoadingStage != 40) { // L: 1963 + if (Client.titleLoadingStage == 45) { // L: 2010 + boolean var28 = !Client.isLowDetail; // L: 2011 + PcmPlayer.field1442 = 22050; // L: 2014 + PcmPlayer.PcmPlayer_stereo = var28; // L: 2015 + FontName.field3694 = 2; // L: 2016 + MidiPcmStream var27 = new MidiPcmStream(); // L: 2018 + var27.method3863(9, 128); // L: 2019 + class195.pcmPlayer0 = class13.method146(GameShell.taskHandler, 0, 22050); // L: 2020 + class195.pcmPlayer0.setStream(var27); // L: 2021 + TileItemPile.method2909(class1.archive15, AbstractByteArrayCopier.archive14, Username.archive4, var27); // L: 2022 + class23.pcmPlayer1 = class13.method146(GameShell.taskHandler, 1, 2048); // L: 2023 + GrandExchangeEvents.pcmStreamMixer = new PcmStreamMixer(); // L: 2024 + class23.pcmPlayer1.setStream(GrandExchangeEvents.pcmStreamMixer); // L: 2025 + NetSocket.decimator = new Decimator(22050, PcmPlayer.field1442); // L: 2026 + Login.Login_loadingText = "Prepared sound engine"; // L: 2027 + Login.Login_loadingPercent = 35; // L: 2028 + Client.titleLoadingStage = 50; // L: 2029 + WorldMapAreaData.WorldMapElement_fonts = new Fonts(GrandExchangeOffer.archive8, class8.archive13); // L: 2030 + } else if (Client.titleLoadingStage == 50) { // L: 2033 + var26 = FontName.method5456().length; // L: 2034 + Client.fontsMap = WorldMapAreaData.WorldMapElement_fonts.createMap(FontName.method5456()); // L: 2035 + if (Client.fontsMap.size() < var26) { // L: 2036 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var26 + "%"; // L: 2037 + Login.Login_loadingPercent = 40; // L: 2038 + } else { + DevicePcmPlayerProvider.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 2041 + WorldMapCacheName.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 2042 + ReflectionCheck.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 2043 + Skills.platformInfo = Client.platformInfoProvider.get(); // L: 2044 + Login.Login_loadingText = "Loaded fonts"; // L: 2045 + Login.Login_loadingPercent = 40; // L: 2046 + Client.titleLoadingStage = 60; // L: 2047 + } } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3238 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3239 - } + int var3; + int var4; + Archive var21; + Archive var22; + if (Client.titleLoadingStage == 60) { // L: 2050 + var21 = class281.archive10; // L: 2052 + var22 = GrandExchangeOffer.archive8; // L: 2053 + var3 = 0; // L: 2055 + if (var21.tryLoadFileByNames("title.jpg", "")) { // L: 2056 + ++var3; + } - return 1; // L: 3241 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3243 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3244 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3245 - return 1; // L: 3246 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3248 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapManager.method725(Client.field769); // L: 3249 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapManager.method725(Client.field928); // L: 3250 - return 1; // L: 3251 - } else if (var0 == 6220) { // L: 3253 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3254 - return 1; // L: 3255 - } else if (var0 == 6221) { // L: 3257 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3258 - return 1; // L: 3259 - } else if (var0 == 6222) { // L: 3261 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorDecoration.canvasWidth; // L: 3262 - return 1; // L: 3263 - } else if (var0 == 6223) { // L: 3265 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GameShell.canvasHeight; // L: 3266 - return 1; // L: 3267 + if (var22.tryLoadFileByNames("logo", "")) { // L: 2057 + ++var3; + } + + if (var22.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 2058 + ++var3; + } + + if (var22.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 2059 + ++var3; + } + + if (var22.tryLoadFileByNames("titlebox", "")) { // L: 2060 + ++var3; + } + + if (var22.tryLoadFileByNames("titlebutton", "")) { // L: 2061 + ++var3; + } + + if (var22.tryLoadFileByNames("runes", "")) { // L: 2062 + ++var3; + } + + if (var22.tryLoadFileByNames("title_mute", "")) { // L: 2063 + ++var3; + } + + if (var22.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 2064 + ++var3; + } + + if (var22.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 2065 + ++var3; + } + + if (var22.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 2066 + ++var3; + } + + if (var22.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 2067 + ++var3; + } + + var22.tryLoadFileByNames("sl_back", ""); // L: 2068 + var22.tryLoadFileByNames("sl_flags", ""); // L: 2069 + var22.tryLoadFileByNames("sl_arrows", ""); // L: 2070 + var22.tryLoadFileByNames("sl_stars", ""); // L: 2071 + var22.tryLoadFileByNames("sl_button", ""); // L: 2072 + var4 = class90.method2168(); // L: 2076 + if (var3 < var4) { // L: 2077 + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 2078 + Login.Login_loadingPercent = 50; // L: 2079 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 2082 + Login.Login_loadingPercent = 50; // L: 2083 + BuddyRankComparator.updateGameState(5); // L: 2084 + Client.titleLoadingStage = 70; // L: 2085 + } + } else if (Client.titleLoadingStage == 70) { // L: 2088 + if (!WorldMapSection3.archive2.isFullyLoaded()) { // L: 2089 + Login.Login_loadingText = "Loading config - " + WorldMapSection3.archive2.loadPercent() + "%"; // L: 2090 + Login.Login_loadingPercent = 60; // L: 2091 + } else { + Archive var24 = WorldMapSection3.archive2; // L: 2094 + FloorOverlayDefinition.FloorOverlayDefinition_archive = var24; // L: 2096 + ScriptFrame.method1224(WorldMapSection3.archive2); // L: 2098 + FileSystem.method3630(WorldMapSection3.archive2, class236.archive7); // L: 2099 + var21 = WorldMapSection3.archive2; // L: 2100 + var22 = class236.archive7; // L: 2101 + boolean var25 = Client.isLowDetail; // L: 2102 + ObjectDefinition.ObjectDefinition_archive = var21; // L: 2104 + GrandExchangeOfferAgeComparator.ObjectDefinition_modelsArchive = var22; // L: 2105 + ObjectDefinition.ObjectDefinition_isLowDetail = var25; // L: 2106 + Archive var23 = WorldMapSection3.archive2; // L: 2108 + Archive var5 = class236.archive7; // L: 2109 + NPCDefinition.NpcDefinition_archive = var23; // L: 2111 + NPCDefinition.NpcDefinition_modelArchive = var5; // L: 2112 + WorldMapAreaData.method791(WorldMapSection3.archive2); // L: 2114 + Archive var6 = WorldMapSection3.archive2; // L: 2115 + Archive var7 = class236.archive7; // L: 2116 + boolean var8 = Client.isMembersWorld; // L: 2117 + Font var9 = DevicePcmPlayerProvider.fontPlain11; // L: 2118 + ItemDefinition.ItemDefinition_archive = var6; // L: 2120 + UserComparator9.ItemDefinition_modelArchive = var7; // L: 2121 + SoundCache.ItemDefinition_inMembersWorld = var8; // L: 2122 + HealthBar.ItemDefinition_fileCount = ItemDefinition.ItemDefinition_archive.getGroupFileCount(10); // L: 2123 + VerticalAlignment.ItemDefinition_fontPlain11 = var9; // L: 2124 + Archive var10 = WorldMapSection3.archive2; // L: 2126 + Archive var11 = MenuAction.archive0; // L: 2127 + Archive var12 = WorldMapManager.archive1; // L: 2128 + SequenceDefinition.SequenceDefinition_archive = var10; // L: 2130 + SequenceDefinition.SequenceDefinition_animationsArchive = var11; // L: 2131 + DefaultsGroup.SequenceDefinition_skeletonsArchive = var12; // L: 2132 + class182.method3716(WorldMapSection3.archive2, class236.archive7); // L: 2134 + Archive var13 = WorldMapSection3.archive2; // L: 2135 + VarbitDefinition.VarbitDefinition_archive = var13; // L: 2137 + FaceNormal.method3393(WorldMapSection3.archive2); // L: 2139 + Varps.method4126(FaceNormal.archive3, class236.archive7, GrandExchangeOffer.archive8, class8.archive13); // L: 2140 + GrandExchangeOfferUnitPriceComparator.method211(WorldMapSection3.archive2); // L: 2141 + Messages.method2328(WorldMapSection3.archive2); // L: 2142 + Messages.method2339(WorldMapSection3.archive2); // L: 2143 + Archive var14 = WorldMapSection3.archive2; // L: 2144 + ParamDefinition.ParamDefinition_archive = var14; // L: 2146 + FriendSystem.varcs = new Varcs(); // L: 2148 + Archive var15 = WorldMapSection3.archive2; // L: 2149 + Archive var16 = GrandExchangeOffer.archive8; // L: 2150 + Archive var17 = class8.archive13; // L: 2151 + HitSplatDefinition.HitSplatDefinition_archive = var15; // L: 2153 + HitSplatDefinition.field3350 = var16; // L: 2154 + HitSplatDefinition.HitSplatDefinition_fontsArchive = var17; // L: 2155 + Archive var18 = WorldMapSection3.archive2; // L: 2157 + Archive var19 = GrandExchangeOffer.archive8; // L: 2158 + HealthBarDefinition.HealthBarDefinition_archive = var18; // L: 2160 + HealthBarDefinition.HitSplatDefinition_spritesArchive = var19; // L: 2161 + UserComparator4.method3504(WorldMapSection3.archive2, GrandExchangeOffer.archive8); // L: 2163 + Login.Login_loadingText = "Loaded config"; // L: 2164 + Login.Login_loadingPercent = 60; // L: 2165 + Client.titleLoadingStage = 80; // L: 2166 + } + } else if (Client.titleLoadingStage == 80) { // L: 2169 + var26 = 0; // L: 2170 + if (UserComparator5.compass == null) { // L: 2171 + UserComparator5.compass = FloorDecoration.SpriteBuffer_getSprite(GrandExchangeOffer.archive8, FontName.spriteIds.compass, 0); + } else { + ++var26; // L: 2172 + } + + if (class219.redHintArrowSprite == null) { // L: 2173 + class219.redHintArrowSprite = FloorDecoration.SpriteBuffer_getSprite(GrandExchangeOffer.archive8, FontName.spriteIds.field3835, 0); + } else { + ++var26; // L: 2174 + } + + if (AbstractWorldMapIcon.mapSceneSprites == null) { // L: 2175 + AbstractWorldMapIcon.mapSceneSprites = UserComparator5.method3540(GrandExchangeOffer.archive8, FontName.spriteIds.mapScenes, 0); + } else { + ++var26; // L: 2176 + } + + if (World.headIconPkSprites == null) { // L: 2177 + World.headIconPkSprites = HorizontalAlignment.method4882(GrandExchangeOffer.archive8, FontName.spriteIds.headIconsPk, 0); + } else { + ++var26; // L: 2178 + } + + if (TaskHandler.headIconPrayerSprites == null) { // L: 2179 + TaskHandler.headIconPrayerSprites = HorizontalAlignment.method4882(GrandExchangeOffer.archive8, FontName.spriteIds.field3836, 0); + } else { + ++var26; // L: 2180 + } + + if (class337.headIconHintSprites == null) { // L: 2181 + class337.headIconHintSprites = HorizontalAlignment.method4882(GrandExchangeOffer.archive8, FontName.spriteIds.field3839, 0); + } else { + ++var26; // L: 2182 + } + + if (ScriptEvent.mapMarkerSprites == null) { // L: 2183 + ScriptEvent.mapMarkerSprites = HorizontalAlignment.method4882(GrandExchangeOffer.archive8, FontName.spriteIds.field3841, 0); + } else { + ++var26; // L: 2184 + } + + if (class60.crossSprites == null) { // L: 2185 + class60.crossSprites = HorizontalAlignment.method4882(GrandExchangeOffer.archive8, FontName.spriteIds.field3837, 0); + } else { + ++var26; // L: 2186 + } + + if (Entity.mapDotSprites == null) { // L: 2187 + Entity.mapDotSprites = HorizontalAlignment.method4882(GrandExchangeOffer.archive8, FontName.spriteIds.field3834, 0); + } else { + ++var26; // L: 2188 + } + + if (WorldMapSection0.scrollBarSprites == null) { // L: 2189 + WorldMapSection0.scrollBarSprites = UserComparator5.method3540(GrandExchangeOffer.archive8, FontName.spriteIds.field3842, 0); + } else { + ++var26; // L: 2190 + } + + if (SpriteMask.modIconSprites == null) { // L: 2191 + SpriteMask.modIconSprites = UserComparator5.method3540(GrandExchangeOffer.archive8, FontName.spriteIds.field3844, 0); + } else { + ++var26; // L: 2192 + } + + if (var26 < 11) { // L: 2193 + Login.Login_loadingText = "Loading sprites - " + var26 * 100 / 12 + "%"; // L: 2194 + Login.Login_loadingPercent = 70; // L: 2195 + } else { + AbstractFont.AbstractFont_modIconSprites = SpriteMask.modIconSprites; // L: 2198 + class219.redHintArrowSprite.normalize(); // L: 2199 + int var1 = (int)(Math.random() * 21.0D) - 10; // L: 2200 + int var2 = (int)(Math.random() * 21.0D) - 10; // L: 2201 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 2202 + var4 = (int)(Math.random() * 41.0D) - 20; // L: 2203 + AbstractWorldMapIcon.mapSceneSprites[0].shiftColors(var1 + var4, var2 + var4, var4 + var3); // L: 2204 + Login.Login_loadingText = "Loaded sprites"; // L: 2205 + Login.Login_loadingPercent = 70; // L: 2206 + Client.titleLoadingStage = 90; // L: 2207 + } + } else if (Client.titleLoadingStage == 90) { // L: 2210 + if (!WorldMapData_1.archive9.isFullyLoaded()) { // L: 2211 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2212 + Login.Login_loadingPercent = 90; // L: 2213 + } else { + class278.textureProvider = new TextureProvider(WorldMapData_1.archive9, GrandExchangeOffer.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); // L: 2216 + Rasterizer3D.Rasterizer3D_setTextureLoader(class278.textureProvider); // L: 2217 + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 2218 + Client.titleLoadingStage = 100; // L: 2219 + } + } else if (Client.titleLoadingStage == 100) { // L: 2222 + var26 = class278.textureProvider.getLoadedPercentage(); // L: 2223 + if (var26 < 100) { // L: 2224 + Login.Login_loadingText = "Loading textures - " + var26 + "%"; // L: 2225 + Login.Login_loadingPercent = 90; // L: 2226 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 2229 + Login.Login_loadingPercent = 90; // L: 2230 + Client.titleLoadingStage = 110; // L: 2231 + } + } else if (Client.titleLoadingStage == 110) { // L: 2234 + class204.mouseRecorder = new MouseRecorder(); // L: 2235 + GameShell.taskHandler.newThreadTask(class204.mouseRecorder, 10); // L: 2236 + Login.Login_loadingText = "Loaded input handler"; // L: 2237 + Login.Login_loadingPercent = 92; // L: 2238 + Client.titleLoadingStage = 120; // L: 2239 + } else if (Client.titleLoadingStage == 120) { // L: 2242 + if (!class281.archive10.tryLoadFileByNames("huffman", "")) { // L: 2243 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2244 + Login.Login_loadingPercent = 94; // L: 2245 + } else { + Huffman var0 = new Huffman(class281.archive10.takeFileByNames("huffman", "")); // L: 2248 + class4.method77(var0); // L: 2249 + Login.Login_loadingText = "Loaded wordpack"; // L: 2250 + Login.Login_loadingPercent = 94; // L: 2251 + Client.titleLoadingStage = 130; // L: 2252 + } + } else if (Client.titleLoadingStage == 130) { // L: 2255 + if (!FaceNormal.archive3.isFullyLoaded()) { // L: 2256 + Login.Login_loadingText = "Loading interfaces - " + FaceNormal.archive3.loadPercent() * 4 / 5 + "%"; // L: 2257 + Login.Login_loadingPercent = 96; // L: 2258 + } else if (!ViewportMouse.archive12.isFullyLoaded()) { // L: 2261 + Login.Login_loadingText = "Loading interfaces - " + (80 + ViewportMouse.archive12.loadPercent() / 6) + "%"; // L: 2262 + Login.Login_loadingPercent = 96; // L: 2263 + } else if (!class8.archive13.isFullyLoaded()) { // L: 2266 + Login.Login_loadingText = "Loading interfaces - " + (96 + class8.archive13.loadPercent() / 50) + "%"; // L: 2267 + Login.Login_loadingPercent = 96; // L: 2268 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 2271 + Login.Login_loadingPercent = 98; // L: 2272 + Client.titleLoadingStage = 140; // L: 2273 + } + } else if (Client.titleLoadingStage == 140) { // L: 2276 + Login.Login_loadingPercent = 100; // L: 2277 + if (!class60.archive19.tryLoadGroupByName(WorldMapCacheName.field320.name)) { // L: 2278 + Login.Login_loadingText = "Loading world map - " + class60.archive19.groupLoadPercentByName(WorldMapCacheName.field320.name) / 10 + "%"; // L: 2279 + } else { + if (KeyHandler.worldMap == null) { // L: 2282 + KeyHandler.worldMap = new WorldMap(); // L: 2283 + KeyHandler.worldMap.init(class60.archive19, ModelData0.archive18, Tiles.archive20, ReflectionCheck.fontBold12, Client.fontsMap, AbstractWorldMapIcon.mapSceneSprites); // L: 2284 + } + + Login.Login_loadingText = "Loaded world map"; // L: 2286 + Client.titleLoadingStage = 150; // L: 2287 + } + } else if (Client.titleLoadingStage == 150) { // L: 2290 + BuddyRankComparator.updateGameState(10); // L: 2291 + } + } } else { - return 2; // L: 3269 + byte var20 = 0; // L: 1964 + var26 = var20 + MenuAction.archive0.percentage() * 4 / 100; // L: 1965 + var26 += WorldMapManager.archive1.percentage() * 4 / 100; // L: 1966 + var26 += WorldMapSection3.archive2.percentage() * 2 / 100; // L: 1967 + var26 += FaceNormal.archive3.percentage() * 2 / 100; // L: 1968 + var26 += Username.archive4.percentage() * 6 / 100; // L: 1969 + var26 += Varcs.archive5.percentage() * 4 / 100; // L: 1970 + var26 += ApproximateRouteStrategy.archive6.percentage() * 2 / 100; // L: 1971 + var26 += class236.archive7.percentage() * 56 / 100; // L: 1972 + var26 += GrandExchangeOffer.archive8.percentage() * 2 / 100; // L: 1973 + var26 += WorldMapData_1.archive9.percentage() * 2 / 100; // L: 1974 + var26 += class281.archive10.percentage() * 2 / 100; // L: 1975 + var26 += AbstractByteArrayCopier.archive11.percentage() * 2 / 100; // L: 1976 + var26 += ViewportMouse.archive12.percentage() * 2 / 100; // L: 1977 + var26 += class8.archive13.percentage() * 2 / 100; // L: 1978 + var26 += AbstractByteArrayCopier.archive14.percentage() * 2 / 100; // L: 1979 + var26 += class1.archive15.percentage() * 2 / 100; // L: 1980 + var26 += class60.archive19.percentage() / 100; // L: 1981 + var26 += ModelData0.archive18.percentage() / 100; // L: 1982 + var26 += Tiles.archive20.percentage() / 100; // L: 1983 + var26 += class23.archive17.method4420() && class23.archive17.isFullyLoaded() ? 1 : 0; // L: 1984 + if (var26 != 100) { // L: 1985 + if (var26 != 0) { // L: 1986 + Login.Login_loadingText = "Checking for updates - " + var26 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 1987 + } else { + ArchiveDiskActionHandler.method4404(MenuAction.archive0, "Animations"); // L: 1990 + ArchiveDiskActionHandler.method4404(WorldMapManager.archive1, "Skeletons"); // L: 1991 + ArchiveDiskActionHandler.method4404(Username.archive4, "Sound FX"); // L: 1992 + ArchiveDiskActionHandler.method4404(Varcs.archive5, "Maps"); // L: 1993 + ArchiveDiskActionHandler.method4404(ApproximateRouteStrategy.archive6, "Music Tracks"); // L: 1994 + ArchiveDiskActionHandler.method4404(class236.archive7, "Models"); // L: 1995 + ArchiveDiskActionHandler.method4404(GrandExchangeOffer.archive8, "Sprites"); // L: 1996 + ArchiveDiskActionHandler.method4404(AbstractByteArrayCopier.archive11, "Music Jingles"); // L: 1997 + ArchiveDiskActionHandler.method4404(AbstractByteArrayCopier.archive14, "Music Samples"); // L: 1998 + ArchiveDiskActionHandler.method4404(class1.archive15, "Music Patches"); // L: 1999 + ArchiveDiskActionHandler.method4404(class60.archive19, "World Map"); // L: 2000 + ArchiveDiskActionHandler.method4404(ModelData0.archive18, "World Map Geography"); // L: 2001 + ArchiveDiskActionHandler.method4404(Tiles.archive20, "World Map Ground"); // L: 2002 + FontName.spriteIds = new GraphicsDefaults(); // L: 2003 + FontName.spriteIds.decode(class23.archive17); // L: 2004 + Login.Login_loadingText = "Loaded update list"; // L: 2005 + Login.Login_loadingPercent = 30; // L: 2006 + Client.titleLoadingStage = 45; // L: 2007 + } } - } + } // L: 1929 1935 1961 1988 2008 2031 2039 2048 2080 2086 2092 2167 2196 2208 2214 2220 2227 2232 2240 2246 2253 2259 2264 2269 2274 2280 2288 2292 2294 } diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java new file mode 100644 index 0000000000..f380e37f52 --- /dev/null +++ b/runescape-client/src/main/java/class337.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lq") +public class class337 { + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "[Llc;" + ) + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; +} diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java deleted file mode 100644 index 27bd37c75a..0000000000 --- a/runescape-client/src/main/java/class346.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mp") -public class class346 { - @ObfuscatedName("m") - static final int[] field4050; - @ObfuscatedName("n") - static final int[] field4053; - - static { - field4050 = new int[2048]; // L: 13 - field4053 = new int[2048]; // L: 14 - double var0 = 0.0030679615757712823D; // L: 17 - - for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4050[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 - field4053[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20 - } - - } // L: 22 -} diff --git a/runescape-client/src/main/java/class347.java b/runescape-client/src/main/java/class347.java new file mode 100644 index 0000000000..9a0d45ef25 --- /dev/null +++ b/runescape-client/src/main/java/class347.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mo") +public class class347 { + @ObfuscatedName("t") + static final int[] field4056; + @ObfuscatedName("e") + static final int[] field4059; + + static { + field4056 = new int[2048]; // L: 13 + field4059 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 + + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4056[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19 + field4059[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 + } + + } // L: 22 +} diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class349.java similarity index 56% rename from runescape-client/src/main/java/class348.java rename to runescape-client/src/main/java/class349.java index 43a1258d85..f5bead21de 100644 --- a/runescape-client/src/main/java/class348.java +++ b/runescape-client/src/main/java/class349.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mi") -public class class348 { - @ObfuscatedName("s") - static final char[] field4067; - @ObfuscatedName("t") - static final char[] field4065; +@ObfuscatedName("mn") +public class class349 { + @ObfuscatedName("l") + static final char[] field4075; + @ObfuscatedName("m") + static final char[] field4073; static { - field4067 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4065 = new char[]{'[', ']', '#'}; // L: 9 + field4075 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4073 = new char[]{'[', ']', '#'}; // L: 9 } } diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index 9fe51bc286..69a7b215f8 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -1,65 +1,302 @@ +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("ag") public class class39 { - @ObfuscatedName("z") + @ObfuscatedName("pv") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Llb;" ) - static final class39 field279; - @ObfuscatedName("k") + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lag;" ) - static final class39 field280; - @ObfuscatedName("g") - static int[][] field282; - @ObfuscatedName("h") + static final class39 field287; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lag;" ) - static SoundCache soundCache; - @ObfuscatedName("s") + static final class39 field285; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -812273923 + intValue = -235911215 ) + @Export("value") final int value; static { - field279 = new class39(0); // L: 4 - field280 = new class39(1); // L: 5 + field287 = new class39(0); // L: 4 + field285 = new class39(1); // L: 5 } class39(int var1) { - this.value = var1; + this.value = var1; // L: 9 } // L: 10 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BB)Lat;", - garbageValue = "87" + descriptor = "([BB)Llc;", + garbageValue = "0" ) - static WorldMapSprite method613(byte[] var0) { - return var0 == null ? new WorldMapSprite() : new WorldMapSprite(MouseHandler.convertJpgToSprite(var0).pixels); // L: 19 20 + @Export("convertJpgToSprite") + public static final Sprite convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; // L: 20 + + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); // L: 24 + int[] var4 = new int[var3 * var2]; // L: 25 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 + var5.grabPixels(); // L: 27 + return new Sprite(var4, var2, var3); // L: 28 + } catch (IOException var7) { // L: 30 + } catch (InterruptedException var8) { // L: 31 + } + + return new Sprite(0, 0); // L: 32 } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "91" + descriptor = "(Lks;IS)V", + garbageValue = "-7425" ) - public static boolean Widget_hasContinueOption(int var0) { - return (var0 & 1) != 0; // L: 9 - } + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + GrandExchangeEvent.method172(var0); // L: 73 - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "488436516" - ) - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; // L: 3862 - } + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 75 + int var4 = Players.Players_pendingUpdateIndices[var3]; // L: 76 + Player var5 = Client.players[var4]; // L: 77 + int var6 = var0.readUnsignedByte(); // L: 78 + if ((var6 & 16) != 0) { // L: 79 + var6 += var0.readUnsignedByte() << 8; + } + + byte var7 = -1; // L: 81 + int var8; + if ((var6 & 2048) != 0) { // L: 82 + for (var8 = 0; var8 < 3; ++var8) { // L: 83 + var5.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + int var9; + if ((var6 & 2) != 0) { // L: 85 + var8 = var0.readUnsignedShort(); // L: 86 + if (var8 == 65535) { // L: 87 + var8 = -1; + } + + var9 = var0.method5668(); // L: 88 + Varps.performPlayerAnimation(var5, var8, var9); // L: 89 + } + + if ((var6 & 256) != 0) { // L: 91 + var7 = var0.method5669(); // L: 92 + } + + int var11; + int var12; + int var15; + if ((var6 & 8) != 0) { // L: 94 + var8 = var0.method5659(); // L: 95 + PlayerType var16 = (PlayerType)class195.findEnumerated(WorldMapLabelSize.PlayerType_values(), var0.method5619()); // L: 96 + boolean var10 = var0.readUnsignedByte() == 1; // L: 97 + var11 = var0.method5668(); // L: 98 + var12 = var0.offset; // L: 99 + if (var5.username != null && var5.appearance != null) { // L: 100 + boolean var13 = false; // L: 101 + if (var16.isUser && WorldMapLabelSize.friendSystem.isIgnored(var5.username)) { // L: 102 103 + var13 = true; + } + + if (!var13 && Client.field795 == 0 && !var5.isHidden) { // L: 105 + Players.field1280.offset = 0; // L: 106 + var0.method5833(Players.field1280.array, 0, var11); // L: 107 + Players.field1280.offset = 0; // L: 108 + String var14 = AbstractFont.escapeBrackets(WorldMapSection0.method328(Tile.method3004(Players.field1280))); // L: 109 + var5.overheadText = var14.trim(); // L: 110 + var5.overheadTextColor = var8 >> 8; // L: 111 + var5.overheadTextEffect = var8 & 255; // L: 112 + var5.overheadTextCyclesRemaining = 150; // L: 113 + var5.isAutoChatting = var10; // L: 114 + var5.field974 = var5 != PlayerType.localPlayer && var16.isUser && "" != Client.field710 && var14.toLowerCase().indexOf(Client.field710) == -1; // L: 115 + if (var16.isPrivileged) { // L: 117 + var15 = var10 ? 91 : 1; + } else { + var15 = var10 ? 90 : 2; // L: 118 + } + + if (var16.modIcon != -1) { // L: 119 + DevicePcmPlayerProvider.addGameMessage(var15, PrivateChatMode.method6034(var16.modIcon) + var5.username.getName(), var14); + } else { + DevicePcmPlayerProvider.addGameMessage(var15, var5.username.getName(), var14); // L: 120 + } + } + } + + var0.offset = var12 + var11; // L: 123 + } + + if ((var6 & 32) != 0) { // L: 125 + var5.field1003 = var0.method5675(); // L: 126 + if (var5.pathLength == 0) { // L: 127 + var5.orientation = var5.field1003; // L: 128 + var5.field1003 = -1; // L: 129 + } + } + + if ((var6 & 128) != 0) { // L: 132 + var5.overheadText = var0.readStringCp1252NullTerminated(); // L: 133 + if (var5.overheadText.charAt(0) == '~') { // L: 134 + var5.overheadText = var5.overheadText.substring(1); // L: 135 + DevicePcmPlayerProvider.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 136 + } else if (var5 == PlayerType.localPlayer) { // L: 138 + DevicePcmPlayerProvider.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 139 + } + + var5.isAutoChatting = false; // L: 141 + var5.overheadTextColor = 0; // L: 142 + var5.overheadTextEffect = 0; // L: 143 + var5.overheadTextCyclesRemaining = 150; // L: 144 + } + + if ((var6 & 4096) != 0) { // L: 146 + var5.spotAnimation = var0.readUnsignedShort(); // L: 147 + var8 = var0.method5685(); // L: 148 + var5.field1016 = var8 >> 16; // L: 149 + var5.field1015 = (var8 & 65535) + Client.cycle; // L: 150 + var5.spotAnimationFrame = 0; // L: 151 + var5.spotAnimationFrameCycle = 0; // L: 152 + if (var5.field1015 > Client.cycle) { // L: 153 + var5.spotAnimationFrame = -1; + } + + if (var5.spotAnimation == 65535) { // L: 154 + var5.spotAnimation = -1; + } + } + + if ((var6 & 64) != 0) { // L: 156 + var5.targetIndex = var0.method5675(); // L: 157 + if (var5.targetIndex == 65535) { // L: 158 + var5.targetIndex = -1; + } + } + + if ((var6 & 4) != 0) { // L: 160 + var8 = var0.method5650(); // L: 161 + byte[] var22 = new byte[var8]; // L: 162 + Buffer var17 = new Buffer(var22); // L: 163 + var0.method5689(var22, 0, var8); // L: 164 + Players.field1284[var4] = var17; // L: 165 + var5.read(var17); // L: 166 + } + + if ((var6 & 1) != 0) { // L: 168 + var8 = var0.readUnsignedByte(); // L: 169 + int var18; + int var19; + int var21; + if (var8 > 0) { // L: 170 + for (var9 = 0; var9 < var8; ++var9) { // L: 171 + var11 = -1; // L: 173 + var12 = -1; // L: 174 + var21 = -1; // L: 175 + var19 = var0.readUShortSmart(); // L: 176 + if (var19 == 32767) { // L: 177 + var19 = var0.readUShortSmart(); // L: 178 + var12 = var0.readUShortSmart(); // L: 179 + var11 = var0.readUShortSmart(); // L: 180 + var21 = var0.readUShortSmart(); // L: 181 + } else if (var19 != 32766) { // L: 183 + var12 = var0.readUShortSmart(); // L: 184 + } else { + var19 = -1; // L: 186 + } + + var18 = var0.readUShortSmart(); // L: 187 + var5.addHitSplat(var19, var12, var11, var21, Client.cycle, var18); // L: 188 + } + } + + var9 = var0.method5668(); // L: 191 + if (var9 > 0) { // L: 192 + for (var19 = 0; var19 < var9; ++var19) { // L: 193 + var11 = var0.readUShortSmart(); // L: 194 + var12 = var0.readUShortSmart(); // L: 195 + if (var12 != 32767) { // L: 196 + var21 = var0.readUShortSmart(); // L: 197 + var18 = var0.method5668(); // L: 198 + var15 = var12 > 0 ? var0.readUnsignedByte() : var18; // L: 199 + var5.addHealthBar(var11, Client.cycle, var12, var21, var18, var15); // L: 200 + } else { + var5.removeHealthBar(var11); // L: 202 + } + } + } + } + + if ((var6 & 1024) != 0) { // L: 206 + var5.field1017 = var0.method5837(); // L: 207 + var5.field1019 = var0.readByte(); // L: 208 + var5.field1018 = var0.method5837(); // L: 209 + var5.field1020 = var0.method5837(); // L: 210 + var5.field1009 = var0.method5659() + Client.cycle; // L: 211 + var5.field1024 = var0.method5797() + Client.cycle; // L: 212 + var5.field1023 = var0.method5659(); // L: 213 + if (var5.field664) { // L: 214 + var5.field1017 += var5.tileX; // L: 215 + var5.field1019 += var5.tileY; // L: 216 + var5.field1018 += var5.tileX; // L: 217 + var5.field1020 += var5.tileY; // L: 218 + var5.pathLength = 0; // L: 219 + } else { + var5.field1017 += var5.pathX[0]; // L: 222 + var5.field1019 += var5.pathY[0]; // L: 223 + var5.field1018 += var5.pathX[0]; // L: 224 + var5.field1020 += var5.pathY[0]; // L: 225 + var5.pathLength = 1; // L: 226 + } + + var5.field1034 = 0; // L: 228 + } + + if ((var6 & 512) != 0) { // L: 230 + Players.field1295[var4] = var0.method5669(); // L: 231 + } + + if (var5.field664) { // L: 233 + if (var7 == 127) { // L: 234 + var5.resetPath(var5.tileX, var5.tileY); + } else { + byte var20; + if (var7 != -1) { // L: 237 + var20 = var7; + } else { + var20 = Players.field1295[var4]; // L: 238 + } + + var5.method1335(var5.tileX, var5.tileY, var20); // L: 239 + } + } + } + + if (var0.offset - var2 != var1) { // L: 246 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 247 + } + } // L: 249 } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 7a295c2804..8deb2255be 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,117 +1,106 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("z") final class class4 implements class0 { - @ObfuscatedName("fd") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkr;" + descriptor = "(Ljava/lang/Object;Lkb;I)V", + garbageValue = "192866787" ) - static Font fontBold12; + public void vmethod69(Object var1, Buffer var2) { + this.method67((String)var1, var2); + } - @ObfuscatedName("z") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkf;B)V", - garbageValue = "21" + descriptor = "(Lkb;I)Ljava/lang/Object;", + garbageValue = "-1094020977" ) - public void vmethod70(Object var1, Buffer var2) { - this.method59((String)var1, var2); // L: 46 - } // L: 47 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lkf;I)Ljava/lang/Object;", - garbageValue = "-453860591" - ) - public Object vmethod61(Buffer var1) { + public Object vmethod72(Buffer var1) { return var1.readStringCp1252NullTerminated(); // L: 42 } + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lkb;B)V", + garbageValue = "-103" + ) + void method67(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lhi;S)V", + garbageValue = "-19591" + ) + public static void method77(Huffman var0) { + class219.huffman = var0; // L: 14 + } // L: 15 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lgz;Lmh;B)Lgk;", + garbageValue = "10" + ) + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = ChatChannel.method2363(); // L: 27 + var2.clientPacket = var0; // L: 28 + var2.clientPacketLength = var0.length; // L: 29 + if (var2.clientPacketLength == -1) { // L: 30 + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); // L: 31 + } else if (var2.clientPacketLength <= 18) { // L: 32 + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { // L: 33 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 34 + } + + var2.packetBuffer.setIsaacCipher(var1); // L: 35 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 + var2.index = 0; // L: 37 + return var2; // L: 38 + } + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lkf;I)V", - garbageValue = "-758974757" + descriptor = "(IIB)Lbk;", + garbageValue = "-20" ) - void method59(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); // L: 38 - } // L: 39 + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 39 + return var2.getMessage(var1); // L: 40 + } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "-1502572430" + descriptor = "(B)V", + garbageValue = "43" ) - public static void method73(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; // L: 17 - } // L: 18 + static void method78() { + ItemContainer.itemContainers = new NodeHashTable(32); // L: 78 + } // L: 79 - @ObfuscatedName("iw") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "([Lhq;Lhq;ZB)V", - garbageValue = "73" + descriptor = "([BIII)I", + garbageValue = "-56891300" ) - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1105005447 * -1556531767 : var1.width * 1613274363 * 1200164403; // L: 9211 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1626628049 * 298473777 : var1.height * 1137118319 * 1991496335; // L: 9212 - KeyHandler.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9213 - if (var1.children != null) { // L: 9214 - KeyHandler.resizeInterface(var1.children, var1.id, var3, var4, var2); + public static int method81(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 45 + + for (int var4 = var1; var4 < var2; ++var4) { // L: 46 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47 } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9215 - if (var5 != null) { // L: 9216 - int var6 = var5.group; // L: 9217 - if (WorldMapSprite.loadInterface(var6)) { // L: 9219 - KeyHandler.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 9220 - } - } - - if (var1.contentType == 1337) { // L: 9223 - } - - } // L: 9224 - - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(Lhq;I)Z", - garbageValue = "1437525598" - ) - static final boolean method60(Widget var0) { - int var1 = var0.contentType; // L: 10523 - if (var1 == 205) { // L: 10524 - Client.logoutTimer = 250; // L: 10525 - return true; // L: 10526 - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { // L: 10528 - var2 = (var1 - 300) / 2; // L: 10529 - var3 = var1 & 1; // L: 10530 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 10531 - } - - if (var1 >= 314 && var1 <= 323) { // L: 10533 - var2 = (var1 - 314) / 2; // L: 10534 - var3 = var1 & 1; // L: 10535 - Client.playerAppearance.method4102(var2, var3 == 1); // L: 10536 - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); // L: 10538 - } - - if (var1 == 325) { // L: 10539 - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { // L: 10540 - PacketBufferNode var4 = Client.getPacketBufferNode(ClientPacket.field2307, Client.packetWriter.isaacCipher); // L: 10542 - Client.playerAppearance.write(var4.packetBuffer); // L: 10543 - Client.packetWriter.addNode(var4); // L: 10544 - return true; // L: 10545 - } else { - return false; // L: 10547 - } - } + var3 = ~var3; // L: 49 + return var3; // L: 50 } } diff --git a/runescape-client/src/main/java/class41.java b/runescape-client/src/main/java/class41.java index a80e8263bf..73874f7e58 100644 --- a/runescape-client/src/main/java/class41.java +++ b/runescape-client/src/main/java/class41.java @@ -1,159 +1,67 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("aw") public class class41 { - @ObfuscatedName("jc") - @ObfuscatedSignature( - descriptor = "Ldt;" + @ObfuscatedName("eb") + @ObfuscatedGetter( + intValue = -1092142465 ) - static TextureProvider textureProvider; + @Export("port3") + static int port3; - @ObfuscatedName("z") + @ObfuscatedName("hb") @ObfuscatedSignature( - descriptor = "(I)[Lis;", - garbageValue = "306746421" + descriptor = "(IIB)V", + garbageValue = "9" ) - public static StudioGame[] method624() { - return new StudioGame[]{StudioGame.game4, StudioGame.game3, StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game5, StudioGame.runescape}; // L: 17 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IILgk;Lft;B)Z", - garbageValue = "68" - ) - static final boolean method619(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; // L: 190 - int var5 = var1; // L: 191 - byte var6 = 64; // L: 192 - byte var7 = 64; // L: 193 - int var8 = var0 - var6; // L: 194 - int var9 = var1 - var7; // L: 195 - class182.directions[var6][var7] = 99; // L: 196 - class182.distances[var6][var7] = 0; // L: 197 - byte var10 = 0; // L: 198 - int var11 = 0; // L: 199 - class182.bufferX[var10] = var0; // L: 200 - byte var10001 = var10; - int var18 = var10 + 1; - class182.bufferY[var10001] = var1; // L: 201 - int[][] var12 = var3.flags; // L: 202 - - while (var18 != var11) { // L: 203 - var4 = class182.bufferX[var11]; // L: 204 - var5 = class182.bufferY[var11]; // L: 205 - var11 = var11 + 1 & 4095; // L: 206 - int var16 = var4 - var8; // L: 207 - int var17 = var5 - var9; // L: 208 - int var13 = var4 - var3.xInset; // L: 209 - int var14 = var5 - var3.yInset; // L: 210 - if (var2.hasArrived(2, var4, var5, var3)) { // L: 211 - class182.field2135 = var4; // L: 212 - class182.field2136 = var5; // L: 213 - return true; // L: 214 - } - - int var15 = class182.distances[var16][var17] + 1; // L: 216 - if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 217 218 219 220 - class182.bufferX[var18] = var4 - 1; // L: 221 - class182.bufferY[var18] = var5; // L: 222 - var18 = var18 + 1 & 4095; // L: 223 - class182.directions[var16 - 1][var17] = 2; // L: 224 - class182.distances[var16 - 1][var17] = var15; // L: 225 - } - - if (var16 < 126 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 227 228 229 230 - class182.bufferX[var18] = var4 + 1; // L: 231 - class182.bufferY[var18] = var5; // L: 232 - var18 = var18 + 1 & 4095; // L: 233 - class182.directions[var16 + 1][var17] = 8; // L: 234 - class182.distances[var16 + 1][var17] = var15; // L: 235 - } - - if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 237 238 239 240 - class182.bufferX[var18] = var4; // L: 241 - class182.bufferY[var18] = var5 - 1; // L: 242 - var18 = var18 + 1 & 4095; // L: 243 - class182.directions[var16][var17 - 1] = 1; // L: 244 - class182.distances[var16][var17 - 1] = var15; // L: 245 - } - - if (var17 < 126 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 247 248 249 250 - class182.bufferX[var18] = var4; // L: 251 - class182.bufferY[var18] = var5 + 1; // L: 252 - var18 = var18 + 1 & 4095; // L: 253 - class182.directions[var16][var17 + 1] = 4; // L: 254 - class182.distances[var16][var17 + 1] = var15; // L: 255 - } - - if (var16 > 0 && var17 > 0 && class182.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) { // L: 257 258 259 260 261 - class182.bufferX[var18] = var4 - 1; // L: 262 - class182.bufferY[var18] = var5 - 1; // L: 263 - var18 = var18 + 1 & 4095; // L: 264 - class182.directions[var16 - 1][var17 - 1] = 3; // L: 265 - class182.distances[var16 - 1][var17 - 1] = var15; // L: 266 - } - - if (var16 < 126 && var17 > 0 && class182.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) { // L: 268 269 270 271 272 - class182.bufferX[var18] = var4 + 1; // L: 273 - class182.bufferY[var18] = var5 - 1; // L: 274 - var18 = var18 + 1 & 4095; // L: 275 - class182.directions[var16 + 1][var17 - 1] = 9; // L: 276 - class182.distances[var16 + 1][var17 - 1] = var15; // L: 277 - } - - if (var16 > 0 && var17 < 126 && class182.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) { // L: 279 280 281 282 283 - class182.bufferX[var18] = var4 - 1; // L: 284 - class182.bufferY[var18] = var5 + 1; // L: 285 - var18 = var18 + 1 & 4095; // L: 286 - class182.directions[var16 - 1][var17 + 1] = 6; // L: 287 - class182.distances[var16 - 1][var17 + 1] = var15; // L: 288 - } - - if (var16 < 126 && var17 < 126 && class182.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) { // L: 290 291 292 293 294 - class182.bufferX[var18] = var4 + 1; // L: 295 - class182.bufferY[var18] = var5 + 1; // L: 296 - var18 = var18 + 1 & 4095; // L: 297 - class182.directions[var16 + 1][var17 + 1] = 12; // L: 298 - class182.distances[var16 + 1][var17 + 1] = var15; // L: 299 - } - } - - class182.field2135 = var4; // L: 302 - class182.field2136 = var5; // L: 303 - return false; // L: 304 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2053521560" - ) - public static int method622() { - return KeyHandler.KeyHandler_idleCycles; // L: 174 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1795227808" - ) - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 1088 - Login.Login_response2 = "Enter your username/email & password."; // L: 1089 - Login.Login_response3 = ""; // L: 1090 - Login.loginIndex = 2; // L: 1091 - if (var0) { // L: 1092 - Login.Login_password = ""; - } - - ScriptFrame.method1192(); // L: 1093 - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1095 - Login.currentLoginField = 1; // L: 1096 + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[GrandExchangeOfferUnitPriceComparator.Client_plane][var0][var1]; // L: 7422 + if (var2 == null) { // L: 7423 + ModeWhere.scene.removeGroundItemPile(GrandExchangeOfferUnitPriceComparator.Client_plane, var0, var1); // L: 7424 } else { - Login.currentLoginField = 0; // L: 1099 - } + long var3 = -99999999L; // L: 7427 + TileItem var5 = null; // L: 7428 - } // L: 1102 + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7429 7430 7438 + ItemDefinition var7 = AbstractWorldMapData.ItemDefinition_get(var6.id); // L: 7431 + long var11 = (long)var7.price; // L: 7432 + if (var7.isStackable == 1) { + var11 *= (long)(var6.quantity + 1); // L: 7433 + } + + if (var11 > var3) { // L: 7434 + var3 = var11; // L: 7435 + var5 = var6; // L: 7436 + } + } + + if (var5 == null) { // L: 7440 + ModeWhere.scene.removeGroundItemPile(GrandExchangeOfferUnitPriceComparator.Client_plane, var0, var1); // L: 7441 + } else { + var2.addLast(var5); // L: 7444 + TileItem var13 = null; // L: 7445 + TileItem var8 = null; // L: 7446 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7447 7448 7453 + if (var5.id != var6.id) { // L: 7449 + if (var13 == null) { // L: 7450 + var13 = var6; + } + + if (var13.id != var6.id && var8 == null) { // L: 7451 + var8 = var6; + } + } + } + + long var9 = GrandExchangeOfferOwnWorldComparator.calculateTag(var0, var1, 3, false, 0); // L: 7455 + ModeWhere.scene.newGroundItemPile(GrandExchangeOfferUnitPriceComparator.Client_plane, var0, var1, GrandExchangeOfferWorldComparator.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, GrandExchangeOfferUnitPriceComparator.Client_plane), var5, var9, var13, var8); // L: 7456 + } + } + } // L: 7425 7442 7457 } diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 274ad4c214..511c62b1e4 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -1,31 +1,31 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("q") public class class5 implements class12 { class5() { } // L: 8 - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkf;)Lkf;" + descriptor = "(Lkb;)Lkb;" ) - public Buffer vmethod127(Buffer var1) { + public Buffer vmethod145(Buffer var1) { Buffer var2 = new Buffer(100); // L: 11 - this.method78(var1, var2); // L: 12 + this.method84(var1, var2); // L: 12 return var2; // L: 13 } - @ObfuscatedName("k") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkf;Lkf;)V" + descriptor = "(Lkb;Lkb;)V" ) - void method78(Buffer var1, Buffer var2) { + void method84(Buffer var1, Buffer var2) { class10 var3 = new class10(var1); // L: 17 class6 var4 = new class6(var3); // L: 18 long var5; - for (var5 = 0L; !var4.method80(var3.method125(), var3.method126(), var5); ++var5) { // L: 19 20 21 + for (var5 = 0L; !var4.method89(var3.method135(), var3.method134(), var5); ++var5) { // L: 19 20 21 } var2.writeLong(var5); // L: 23 diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java index f557d27d25..5e2e4e6e3d 100644 --- a/runescape-client/src/main/java/class52.java +++ b/runescape-client/src/main/java/class52.java @@ -1,24 +1,88 @@ -import net.runelite.mapping.ObfuscatedGetter; +import java.awt.FontMetrics; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bl") +@ObfuscatedName("bb") public final class class52 { - @ObfuscatedName("gk") - @ObfuscatedGetter( - intValue = 1416486083 - ) - static int field396; - - @ObfuscatedName("jm") + @ObfuscatedName("a") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("av") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "(Lhq;I)V", - garbageValue = "2097597667" + descriptor = "Les;" ) - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field881) { // L: 10259 - Client.field882[var0.rootIndex] = true; // L: 10260 + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("gw") + @Export("regions") + static int[] regions; + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "-1899471565" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 143 + int var4 = 0; // L: 144 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 145 + int var6 = var0[var5 + var1] & 255; // L: 146 + if (var6 != 0) { // L: 147 + if (var6 >= 128 && var6 < 160) { // L: 148 + char var7 = class298.cp1252AsciiExtension[var6 - 128]; // L: 149 + if (var7 == 0) { // L: 150 + var7 = '?'; + } + + var6 = var7; // L: 151 + } + + var3[var4++] = (char)var6; // L: 153 + } } - } // L: 10262 + return new String(var3, 0, var4); // L: 155 + } + + @ObfuscatedName("em") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "793107384" + ) + static boolean method897() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1899 + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1900 + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1901 + if (!var0.isLoaded()) { + return false; // L: 1902 + } + + ++Client.archiveLoadersDone; // L: 1903 + } + + return true; // L: 1905 + } else { + return true; // L: 1904 + } + } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1432177323" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + class9.method132(); // L: 11482 + if (DevicePcmPlayerProvider.clanChat != null) { // L: 11483 + DevicePcmPlayerProvider.clanChat.invalidateIgnoreds(); // L: 11484 + } + + } // L: 11486 } diff --git a/runescape-client/src/main/java/class56.java b/runescape-client/src/main/java/class56.java index d94bee365b..6854251f30 100644 --- a/runescape-client/src/main/java/class56.java +++ b/runescape-client/src/main/java/class56.java @@ -3,14 +3,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("bh") +@ObfuscatedName("bc") public class class56 { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "232599941" + garbageValue = "-1898995849" ) - public static Object method899(Applet var0, String var1, Object[] var2) throws Throwable { + public static Object method944(Applet var0, String var1, Object[] var2) throws Throwable { return JSObject.getWindow(var0).call(var1, var2); // L: 13 } } diff --git a/runescape-client/src/main/java/class58.java b/runescape-client/src/main/java/class58.java index 13dfd984e3..3425ce1edd 100644 --- a/runescape-client/src/main/java/class58.java +++ b/runescape-client/src/main/java/class58.java @@ -1,271 +1,350 @@ import javax.imageio.ImageIO; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bg") +@ObfuscatedName("bl") public class class58 { - @ObfuscatedName("g") + @ObfuscatedName("sz") @ObfuscatedGetter( - intValue = -1766812037 + longValue = -2922274226149570533L ) - static int gameCyclesToDo; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lgn;" + static long field444; + @ObfuscatedName("ey") + @ObfuscatedGetter( + intValue = -1623536047 ) - static Language clientLanguage; + static int field445; static { ImageIO.setUseCache(false); // L: 12 } // L: 13 - @ObfuscatedName("s") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1957401130" + descriptor = "(Lbd;II)V", + garbageValue = "-485493685" ) - public static void method907() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 44 - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 45 - } // L: 46 - - if (var0 == null) { - return; // L: 47 - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 48 - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "1050373784" - ) - public static int method912(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 25 - int var6 = var3; // L: 26 - var3 = var4; // L: 27 - var4 = var6; // L: 28 - } - - var2 &= 3; // L: 30 - if (var2 == 0) { // L: 31 - return var1; - } else if (var2 == 1) { // L: 32 - return 7 - var0 - (var3 - 1); + @Export("runScript") + static void runScript(ScriptEvent var0, int var1) { + Object[] var2 = var0.args; // L: 101 + Script var3; + int var17; + if (WorldMapIcon_0.isWorldMapEvent(var0.type)) { // L: 103 + WorldMapSection0.worldMapEvent = (WorldMapEvent)var2[0]; // L: 104 + WorldMapElement var4 = class194.WorldMapElement_get(WorldMapSection0.worldMapEvent.mapElement); // L: 105 + var3 = WorldMapManager.getWorldMapScript(var0.type, var4.objectId, var4.category); // L: 106 } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 33 + var17 = (Integer)var2[0]; // L: 109 + var3 = WorldMapSection0.getScript(var17); // L: 110 } + + if (var3 != null) { // L: 112 + MilliClock.Interpreter_intStackSize = 0; // L: 115 + UrlRequester.Interpreter_stringStackSize = 0; // L: 116 + var17 = -1; // L: 117 + int[] var5 = var3.opcodes; // L: 118 + int[] var6 = var3.intOperands; // L: 119 + byte var7 = -1; // L: 120 + Interpreter.Interpreter_frameDepth = 0; // L: 121 + Interpreter.field1130 = false; // L: 122 + + try { + int var10; + try { + Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; // L: 124 + int var8 = 0; // L: 125 + Interpreter.Interpreter_stringLocals = new String[var3.localStringCount]; // L: 126 + int var9 = 0; // L: 127 + + int var11; + String var18; + for (var10 = 1; var10 < var2.length; ++var10) { // L: 128 + if (var2[var10] instanceof Integer) { // L: 129 + var11 = (Integer)var2[var10]; // L: 130 + if (var11 == -2147483647) { // L: 131 + var11 = var0.mouseX; + } + + if (var11 == -2147483646) { // L: 132 + var11 = var0.mouseY; + } + + if (var11 == -2147483645) { // L: 133 + var11 = var0.widget != null ? var0.widget.id * -583486671 * -509491759 : -1; + } + + if (var11 == -2147483644) { // L: 134 + var11 = var0.opIndex; + } + + if (var11 == -2147483643) { // L: 135 + var11 = var0.widget != null ? var0.widget.childIndex * -1360175439 * 2048666193 : -1; + } + + if (var11 == -2147483642) { // L: 136 + var11 = var0.dragTarget != null ? var0.dragTarget.id * -583486671 * -509491759 : -1; + } + + if (var11 == -2147483641) { // L: 137 + var11 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1360175439 * 2048666193 : -1; + } + + if (var11 == -2147483640) { // L: 138 + var11 = var0.keyTyped; + } + + if (var11 == -2147483639) { // L: 139 + var11 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var8++] = var11; // L: 140 + } else if (var2[var10] instanceof String) { // L: 142 + var18 = (String)var2[var10]; // L: 143 + if (var18.equals("event_opbase")) { // L: 144 + var18 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var9++] = var18; // L: 145 + } + } + + var10 = 0; // L: 149 + Interpreter.field1119 = var0.field600; // L: 150 + + while (true) { + ++var10; // L: 152 + if (var10 > var1) { // L: 153 + throw new RuntimeException(); + } + + ++var17; // L: 154 + int var29 = var5[var17]; + int var20; + if (var29 >= 100) { // L: 155 + boolean var32; + if (var3.intOperands[var17] == 1) { // L: 353 + var32 = true; + } else { + var32 = false; // L: 354 + } + + var20 = VarcInt.method4562(var29, var3, var32); // L: 355 + switch(var20) { // L: 356 + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 363 + } + } else if (var29 == ScriptOpcodes.ICONST) { // L: 156 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = var6[var17]; // L: 157 + } else if (var29 == ScriptOpcodes.GET_VARP) { // L: 160 + var11 = var6[var17]; // L: 161 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; // L: 162 + } else if (var29 == ScriptOpcodes.SET_VARP) { // L: 165 + var11 = var6[var17]; // L: 166 + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 167 + class23.changeGameOptions(var11); // L: 168 + } else if (var29 == ScriptOpcodes.SCONST) { // L: 171 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; // L: 172 + } else if (var29 == ScriptOpcodes.JUMP) { // L: 175 + var17 += var6[var17]; // L: 176 + } else if (var29 == ScriptOpcodes.IF_ICMPNE) { // L: 179 + MilliClock.Interpreter_intStackSize -= 2; // L: 180 + if (Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]) { // L: 181 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { // L: 184 + MilliClock.Interpreter_intStackSize -= 2; // L: 185 + if (Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]) { // L: 186 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPLT) { // L: 189 + MilliClock.Interpreter_intStackSize -= 2; // L: 190 + if (Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]) { // L: 191 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGT) { // L: 194 + MilliClock.Interpreter_intStackSize -= 2; // L: 195 + if (Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]) { // L: 196 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.RETURN) { // L: 199 + if (Interpreter.Interpreter_frameDepth == 0) { // L: 200 + return; + } + + ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 201 + var3 = var34.script; // L: 202 + var5 = var3.opcodes; // L: 203 + var6 = var3.intOperands; // L: 204 + var17 = var34.pc; // L: 205 + Interpreter.Interpreter_intLocals = var34.intLocals; // L: 206 + Interpreter.Interpreter_stringLocals = var34.stringLocals; // L: 207 + } else if (var29 == ScriptOpcodes.GET_VARBIT) { // L: 210 + var11 = var6[var17]; // L: 211 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.getVarbit(var11); // L: 212 + } else if (var29 == ScriptOpcodes.SET_VARBIT) { // L: 215 + var11 = var6[var17]; // L: 216 + class169.method3571(var11, Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 217 + } else if (var29 == ScriptOpcodes.IF_ICMPLE) { // L: 220 + MilliClock.Interpreter_intStackSize -= 2; // L: 221 + if (Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]) { // L: 222 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGE) { // L: 225 + MilliClock.Interpreter_intStackSize -= 2; // L: 226 + if (Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]) { // L: 227 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.ILOAD) { // L: 230 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; // L: 231 + } else if (var29 == ScriptOpcodes.ISTORE) { // L: 234 + Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 235 + } else if (var29 == ScriptOpcodes.SLOAD) { // L: 238 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]]; // L: 239 + } else if (var29 == ScriptOpcodes.SSTORE) { // L: 242 + Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]; // L: 243 + } else if (var29 == ScriptOpcodes.JOIN_STRING) { // L: 246 + var11 = var6[var17]; // L: 247 + UrlRequester.Interpreter_stringStackSize -= var11; // L: 248 + String var31 = ApproximateRouteStrategy.method1324(Interpreter.Interpreter_stringStack, UrlRequester.Interpreter_stringStackSize, var11); // L: 249 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var31; // L: 250 + } else if (var29 == ScriptOpcodes.POP_INT) { // L: 253 + --MilliClock.Interpreter_intStackSize; // L: 254 + } else if (var29 == ScriptOpcodes.POP_STRING) { // L: 257 + --UrlRequester.Interpreter_stringStackSize; // L: 258 + } else { + int var15; + if (var29 != ScriptOpcodes.INVOKE) { // L: 261 + if (var29 == ScriptOpcodes.GET_VARC_INT) { // L: 284 + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = FriendSystem.varcs.getInt(var6[var17]); // L: 285 + } else if (var29 == ScriptOpcodes.SET_VARC_INT) { // L: 288 + FriendSystem.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 289 + } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { // L: 292 + var11 = var6[var17] >> 16; // L: 293 + var20 = var6[var17] & 65535; // L: 294 + int var21 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 295 + if (var21 < 0 || var21 > 5000) { // L: 296 + throw new RuntimeException(); // L: 297 + } + + Interpreter.Interpreter_arrayLengths[var11] = var21; // L: 299 + byte var22 = -1; // L: 300 + if (var20 == 105) { // L: 301 + var22 = 0; + } + + for (var15 = 0; var15 < var21; ++var15) { // L: 302 + Interpreter.Interpreter_arrays[var11][var15] = var22; + } + } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { // L: 305 + var11 = var6[var17]; // L: 306 + var20 = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 307 + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 308 + throw new RuntimeException(); // L: 309 + } + + Interpreter.Interpreter_intStack[++MilliClock.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; // L: 311 + } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { // L: 314 + var11 = var6[var17]; // L: 315 + MilliClock.Interpreter_intStackSize -= 2; // L: 316 + var20 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 317 + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 318 + throw new RuntimeException(); // L: 319 + } + + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 321 + } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 324 + var18 = FriendSystem.varcs.getStringOld(var6[var17]); // L: 325 + if (var18 == null) { // L: 326 + var18 = "null"; + } + + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var18; // L: 327 + } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 330 + FriendSystem.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]); // L: 331 + } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { // L: 334 + var18 = FriendSystem.varcs.getString(var6[var17]); // L: 335 + Interpreter.Interpreter_stringStack[++UrlRequester.Interpreter_stringStackSize - 1] = var18; // L: 336 + } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { // L: 339 + FriendSystem.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--UrlRequester.Interpreter_stringStackSize]); // L: 340 + } else { + if (var29 != ScriptOpcodes.SWITCH) { // L: 343 + throw new IllegalStateException(); // L: 349 + } + + IterableNodeHashTable var33 = var3.switches[var6[var17]]; // L: 344 + IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 345 + if (var30 != null) { // L: 346 + var17 += var30.integer; + } + } + } else { + var11 = var6[var17]; // L: 262 + Script var12 = WorldMapSection0.getScript(var11); // L: 263 + int[] var13 = new int[var12.localIntCount]; // L: 264 + String[] var14 = new String[var12.localStringCount]; // L: 265 + + for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { // L: 266 + var13[var15] = Interpreter.Interpreter_intStack[var15 + (MilliClock.Interpreter_intStackSize - var12.intArgumentCount)]; + } + + for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { // L: 267 + var14[var15] = Interpreter.Interpreter_stringStack[var15 + (UrlRequester.Interpreter_stringStackSize - var12.stringArgumentCount)]; + } + + MilliClock.Interpreter_intStackSize -= var12.intArgumentCount; // L: 268 + UrlRequester.Interpreter_stringStackSize -= var12.stringArgumentCount; // L: 269 + ScriptFrame var19 = new ScriptFrame(); // L: 270 + var19.script = var3; // L: 271 + var19.pc = var17; // L: 272 + var19.intLocals = Interpreter.Interpreter_intLocals; // L: 273 + var19.stringLocals = Interpreter.Interpreter_stringLocals; // L: 274 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; // L: 275 + var3 = var12; // L: 276 + var5 = var12.opcodes; // L: 277 + var6 = var12.intOperands; // L: 278 + var17 = -1; // L: 279 + Interpreter.Interpreter_intLocals = var13; // L: 280 + Interpreter.Interpreter_stringLocals = var14; // L: 281 + } + } + } + } catch (Exception var27) { // L: 369 + StringBuilder var24 = new StringBuilder(30); // L: 371 + var24.append("").append(var3.key).append(" "); // L: 372 + + for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { // L: 373 + var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); + } + + var24.append("").append(var7); // L: 374 + PacketWriter.RunException_sendStackTrace(var24.toString(), var27); // L: 375 + } + } finally { + if (Interpreter.field1130) { // L: 379 + Interpreter.field1128 = true; // L: 380 + ModeWhere.method3815(); // L: 381 + Interpreter.field1128 = false; // L: 382 + Interpreter.field1130 = false; // L: 383 + } + + } + } + } // L: 113 386 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1826105698" + ) + public static boolean method957() { + return class206.musicPlayerStatus != 0 ? true : class13.midiPcmStream.isReady(); // L: 65 66 } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "101066912" - ) - public static void method915(int var0) { - class206.musicPlayerStatus = 1; // L: 49 - class204.musicTrackArchive = null; // L: 50 - BuddyRankComparator.musicTrackGroupId = -1; // L: 51 - class206.musicTrackFileId = -1; // L: 52 - Tiles.musicTrackVolume = 0; // L: 53 - class206.musicTrackBoolean = false; // L: 54 - FaceNormal.pcmSampleLength = var0; // L: 55 - } // L: 56 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "1" - ) - static final void method914(int var0, int var1, int var2) { - int var3; - for (var3 = 0; var3 < 8; ++var3) { // L: 93 - for (int var4 = 0; var4 < 8; ++var4) { // L: 94 - Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; - } - } - - if (var1 > 0) { // L: 96 - for (var3 = 1; var3 < 8; ++var3) { // L: 97 - Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; - } - } - - if (var2 > 0) { // L: 99 - for (var3 = 1; var3 < 8; ++var3) { // L: 100 - 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) { // L: 102 - 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) { // L: 103 - 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) { // L: 104 - Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; - } - - } // L: 105 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(CLgn;I)I", - garbageValue = "65536" - ) - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; // L: 128 - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 129 - var0 = Character.toLowerCase(var0); // L: 130 - var2 = (var0 << 4) + 1; // L: 131 - } - - if (var0 == 241 && var1 == Language.Language_ES) { // L: 133 - var2 = 1762; - } - - return var2; // L: 134 - } - - @ObfuscatedName("el") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "50" - ) - static void getLoginError(int var0) { - if (var0 == -3) { // L: 2419 - UrlRequester.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 2420 - UrlRequester.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 2421 - UrlRequester.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 2422 - Login.loginIndex = 3; // L: 2423 - Login.field1213 = 1; // L: 2424 - } else if (var0 == 4) { // L: 2426 - class89.method2130(0); // L: 2427 - } else if (var0 == 5) { // L: 2429 - Login.field1213 = 2; // L: 2430 - UrlRequester.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."); // L: 2431 - } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2433 - if (var0 == 7) { // L: 2436 - UrlRequester.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 2437 - UrlRequester.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 2438 - UrlRequester.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 2439 - UrlRequester.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 2440 - UrlRequester.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 2441 - UrlRequester.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 2442 - UrlRequester.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 2443 - UrlRequester.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 2444 - UrlRequester.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 2445 - UrlRequester.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { // L: 2446 - Login.loginIndex = 12; // L: 2448 - Login.field1210 = 1; // L: 2449 - } else if (var0 == 19) { // L: 2452 - UrlRequester.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 2453 - UrlRequester.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 2454 - UrlRequester.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 2455 - UrlRequester.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 2456 - UrlRequester.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 2457 - UrlRequester.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 2458 - UrlRequester.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 2459 - UrlRequester.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 2460 - UrlRequester.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) { - UrlRequester.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2461 - } else if (var0 == 37) { // L: 2462 - UrlRequester.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 2463 - UrlRequester.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 2464 - Login.loginIndex = 8; // L: 2465 - } else { - if (var0 == 56) { // L: 2467 - UrlRequester.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2468 - CollisionMap.updateGameState(11); // L: 2469 - return; // L: 2470 - } - - if (var0 == 57) { // L: 2472 - UrlRequester.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2473 - CollisionMap.updateGameState(11); // L: 2474 - return; // L: 2475 - } - - if (var0 == 61) { // L: 2477 - Login.loginIndex = 7; // L: 2478 - } else { - UrlRequester.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2480 - } - } - } else { - UrlRequester.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2434 - } - - CollisionMap.updateGameState(10); // L: 2481 - } // L: 2482 - - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-693784957" - ) - static final void method913(int var0) { - if (WorldMapSprite.loadInterface(var0)) { // L: 10297 - Projectile.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 10298 - } - } // L: 10299 - - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "(Lbq;ZI)V", - garbageValue = "-1212325817" - ) - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 10505 - int var3 = (int)var0.key; // L: 10506 - var0.remove(); // L: 10507 - if (var1) { // L: 10508 - SecureRandomFuture.method2225(var2); - } - - for (IntegerNode var4 = (IntegerNode)Client.widgetFlags.first(); var4 != null; var4 = (IntegerNode)Client.widgetFlags.next()) { // L: 10510 - if ((long)var2 == (var4.key >> 48 & 65535L)) { // L: 10511 - var4.remove(); // L: 10512 - } - } - - Widget var5 = TileItem.getWidget(var3); // L: 10516 - if (var5 != null) { // L: 10517 - class52.invalidateWidget(var5); - } - - class2.method24(); // L: 10518 - if (Client.rootInterface != -1) { // L: 10519 - ClientPacket.runIntfCloseListeners(Client.rootInterface, 1); - } - - } // L: 10520 } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 6715ee791f..aeac198402 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -4,41 +4,41 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("x") +@ObfuscatedName("k") public class class6 implements class11 { - @ObfuscatedName("z") - final MessageDigest field32; + @ObfuscatedName("f") + final MessageDigest field21; @ObfuscatedSignature( - descriptor = "(Ln;)V" + descriptor = "(Le;)V" ) class6(class10 var1) { - this.field32 = this.method95(); // L: 14 + this.field21 = this.method105(); // L: 14 } // L: 15 - @ObfuscatedName("z") - boolean method80(int var1, String var2, long var3) { - byte[] var5 = this.method83(var2, var3); // L: 18 - return method84(var5) >= var1; // L: 19 + @ObfuscatedName("f") + boolean method89(int var1, String var2, long var3) { + byte[] var5 = this.method91(var2, var3); // L: 18 + return method87(var5) >= var1; // L: 19 } - @ObfuscatedName("t") - byte[] method83(String var1, long var2) { + @ObfuscatedName("m") + byte[] method91(String var1, long var2) { StringBuilder var4 = new StringBuilder(); // L: 56 var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field32.reset(); // L: 58 + this.field21.reset(); // L: 58 try { - this.field32.update(var4.toString().getBytes("UTF-8")); // L: 60 + this.field21.update(var4.toString().getBytes("UTF-8")); // L: 60 } catch (UnsupportedEncodingException var6) { // L: 62 var6.printStackTrace(); // L: 63 } - return this.field32.digest(); // L: 65 + return this.field21.digest(); // L: 65 } - @ObfuscatedName("i") - MessageDigest method95() { + @ObfuscatedName("z") + MessageDigest method105() { try { return MessageDigest.getInstance("SHA-256"); // L: 70 } catch (NoSuchAlgorithmException var2) { // L: 72 @@ -47,14 +47,14 @@ public class class6 implements class11 { } } - @ObfuscatedName("k") - static int method84(byte[] var0) { + @ObfuscatedName("b") + static int method87(byte[] var0) { int var1 = 0; // L: 23 byte[] var2 = var0; // L: 25 for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 byte var4 = var2[var3]; // L: 27 - int var5 = method82(var4); // L: 29 + int var5 = method90(var4); // L: 29 var1 += var5; // L: 30 if (var5 != 8) { // L: 31 break; @@ -64,8 +64,8 @@ public class class6 implements class11 { return var1; // L: 37 } - @ObfuscatedName("s") - static int method82(byte var0) { + @ObfuscatedName("l") + static int method90(byte var0) { int var1 = 0; // L: 41 if (var0 == 0) { // L: 42 var1 = 8; // L: 43 diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 367ada753a..ec3bdddf15 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,135 +1,688 @@ 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("bp") +@ObfuscatedName("bo") public class class60 { - @ObfuscatedName("sa") - @ObfuscatedSignature( - descriptor = "Lcr;" - ) - public static FriendSystem friendSystem; - @ObfuscatedName("z") - static Applet applet; - @ObfuscatedName("k") - static String field451; - @ObfuscatedName("a") - static int[] field453; - @ObfuscatedName("ah") - protected static String null_string; - @ObfuscatedName("ef") + @ObfuscatedName("rh") @ObfuscatedGetter( - intValue = -1192539033 + intValue = -685259439 ) - static int field456; + static int field452; + @ObfuscatedName("f") + @Export("applet") + public static Applet applet; + @ObfuscatedName("b") + public static String field453; + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Lid;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "[Llc;" + ) + @Export("crossSprites") + static Sprite[] crossSprites; static { applet = null; // L: 10 - field451 = ""; // L: 11 + field453 = ""; } - @ObfuscatedName("t") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-14" + descriptor = "(Liw;Liw;IZI)Lex;", + garbageValue = "-908411627" ) - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 164 - if (KeyHandler.field423 == KeyHandler.field399) { // L: 165 - return false; + public static Frames method984(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; // L: 11 + int[] var5 = var0.getGroupFileIds(var2); // L: 12 + + for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 + byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 + if (var7 == null) { // L: 15 + var4 = false; // L: 16 } else { - PlayerAppearance.field2581 = KeyHandler.field420[KeyHandler.field423]; // L: 166 - PacketWriter.field1350 = KeyHandler.field419[KeyHandler.field423]; // L: 167 - KeyHandler.field423 = KeyHandler.field423 + 1 & 127; // L: 168 - return true; // L: 169 + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 + byte[] var9; + if (var3) { // L: 21 + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); // L: 22 + } + + if (var9 == null) { // L: 23 + var4 = false; + } } } - } - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIIB)I", - garbageValue = "-34" - ) - static final int method947(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 825 - int var4 = var0 & var2 - 1; // L: 826 - int var5 = var1 / var2; // L: 827 - int var6 = var1 & var2 - 1; // L: 828 - int var7 = TileItem.method2206(var3, var5); // L: 829 - int var8 = TileItem.method2206(var3 + 1, var5); // L: 830 - int var9 = TileItem.method2206(var3, var5 + 1); // L: 831 - int var10 = TileItem.method2206(var3 + 1, var5 + 1); // L: 832 - int var11 = ArchiveDisk.method5991(var7, var8, var4, var2); // L: 833 - int var12 = ArchiveDisk.method5991(var9, var10, var4, var2); // L: 834 - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 837 - int var13 = ((65536 - var14) * var11 >> 16) + (var14 * var12 >> 16); // L: 838 - return var13; // L: 840 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lhq;IS)V", - garbageValue = "15262" - ) - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2626 == null) { // L: 934 - throw new RuntimeException(); // L: 935 + if (!var4) { + return null; // L: 25 } else { - if (var0.field2661 == null) { // L: 937 - var0.field2661 = new int[var0.field2626.length]; // L: 938 + try { + return new Frames(var0, var1, var2, var3); // L: 27 + } catch (Exception var11) { // L: 29 + return null; // L: 30 } - - var0.field2661[var1] = Integer.MAX_VALUE; // L: 940 } - } // L: 941 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "877979774" - ) - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 884 - var1 /= 2; - } - - if (var2 > 192) { // L: 885 - var1 /= 2; - } - - if (var2 > 217) { // L: 886 - var1 /= 2; - } - - if (var2 > 243) { // L: 887 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 888 - return var3; // L: 889 } - @ObfuscatedName("kh") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkf;II)V", - garbageValue = "-1719664383" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "687907076" ) - static void method937(Buffer var0, int var1) { - byte[] var2 = var0.array; // L: 10815 - if (Client.randomDatData == null) { // L: 10817 - Client.randomDatData = new byte[24]; - } + static final void method983(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your friend list").toString(); // L: 119 + DevicePcmPlayerProvider.addGameMessage(30, "", var1); // L: 121 + } // L: 123 - class310.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 10818 - if (JagexCache.JagexCache_randomDat != null) { // L: 10821 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 10823 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 10824 - } catch (Exception var4) { // L: 10826 + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lkq;Lkq;Lkq;B)V", + garbageValue = "106" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (ItemContainer.canvasWidth - 765) / 2; // L: 1008 + Login.loginBoxX = Login.xPadding + 202; // L: 1009 + AttackOption.loginBoxCenter = Login.loginBoxX + 180; // L: 1010 + byte var3; + int var4; + int var8; + int var10; + int var25; + int var31; + int var38; + if (Login.worldSelectOpen) { // L: 1011 + if (EnumDefinition.worldSelectBackSprites == null) { // L: 1013 + EnumDefinition.worldSelectBackSprites = ParamDefinition.method4677(GrandExchangeOffer.archive8, "sl_back", ""); } - } - } // L: 10829 + Archive var39; + IndexedSprite[] var41; + int var42; + if (FaceNormal.worldSelectFlagSprites == null) { // L: 1014 + var39 = GrandExchangeOffer.archive8; // L: 1016 + var38 = var39.getGroupId("sl_flags"); // L: 1018 + var42 = var39.getFileId(var38, ""); // L: 1019 + var41 = UserComparator5.method3540(var39, var38, var42); // L: 1020 + FaceNormal.worldSelectFlagSprites = var41; // L: 1022 + } + + if (class301.worldSelectArrows == null) { // L: 1024 + var39 = GrandExchangeOffer.archive8; // L: 1026 + var38 = var39.getGroupId("sl_arrows"); // L: 1028 + var42 = var39.getFileId(var38, ""); // L: 1029 + var41 = UserComparator5.method3540(var39, var38, var42); // L: 1030 + class301.worldSelectArrows = var41; // L: 1032 + } + + if (GameObject.worldSelectStars == null) { // L: 1034 + var39 = GrandExchangeOffer.archive8; // L: 1036 + var38 = var39.getGroupId("sl_stars"); // L: 1038 + var42 = var39.getFileId(var38, ""); // L: 1039 + var41 = UserComparator5.method3540(var39, var38, var42); // L: 1040 + GameObject.worldSelectStars = var41; // L: 1042 + } + + if (class323.worldSelectLeftSprite == null) { // L: 1044 + class323.worldSelectLeftSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOffer.archive8, "leftarrow", ""); + } + + if (class280.worldSelectRightSprite == null) { // L: 1045 + class280.worldSelectRightSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOffer.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1046 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1047 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1048 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1049 + if (GameObject.worldSelectStars != null) { // L: 1050 + GameObject.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1051 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1052 + GameObject.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1053 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1054 + } + + if (class301.worldSelectArrows != null) { // L: 1056 + var31 = Login.xPadding + 280; // L: 1057 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1058 + class301.worldSelectArrows[2].drawAt(var31, 4); + } else { + class301.worldSelectArrows[0].drawAt(var31, 4); // L: 1059 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1060 + class301.worldSelectArrows[3].drawAt(var31 + 15, 4); + } else { + class301.worldSelectArrows[1].drawAt(var31 + 15, 4); // L: 1061 + } + + var0.draw("World", var31 + 32, 17, 16777215, -1); // L: 1062 + var4 = Login.xPadding + 390; // L: 1063 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1064 + class301.worldSelectArrows[2].drawAt(var4, 4); + } else { + class301.worldSelectArrows[0].drawAt(var4, 4); // L: 1065 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1066 + class301.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + class301.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1067 + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1068 + var38 = Login.xPadding + 500; // L: 1069 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1070 + class301.worldSelectArrows[2].drawAt(var38, 4); + } else { + class301.worldSelectArrows[0].drawAt(var38, 4); // L: 1071 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1072 + class301.worldSelectArrows[3].drawAt(var38 + 15, 4); + } else { + class301.worldSelectArrows[1].drawAt(var38 + 15, 4); // L: 1073 + } + + var0.draw("Location", var38 + 32, 17, 16777215, -1); // L: 1074 + var42 = Login.xPadding + 610; // L: 1075 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1076 + class301.worldSelectArrows[2].drawAt(var42, 4); + } else { + class301.worldSelectArrows[0].drawAt(var42, 4); // L: 1077 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1078 + class301.worldSelectArrows[3].drawAt(var42 + 15, 4); + } else { + class301.worldSelectArrows[1].drawAt(var42 + 15, 4); // L: 1079 + } + + var0.draw("Type", var42 + 32, 17, 16777215, -1); // L: 1080 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1082 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1083 + Login.hoveredWorldIndex = -1; // L: 1084 + if (EnumDefinition.worldSelectBackSprites != null) { // L: 1085 + var3 = 88; // L: 1086 + byte var35 = 19; // L: 1087 + var38 = 765 / (var3 + 1) - 1; // L: 1088 + var42 = 480 / (var35 + 1); // L: 1089 + + do { + var25 = var42; // L: 1091 + var8 = var38; // L: 1092 + if (var42 * (var38 - 1) >= World.World_count) { // L: 1093 + --var38; + } + + if (var38 * (var42 - 1) >= World.World_count) { // L: 1094 + --var42; + } + + if (var38 * (var42 - 1) >= World.World_count) { // L: 1095 + --var42; + } + } while(var25 != var42 || var8 != var38); // L: 1096 + + var25 = (765 - var3 * var38) / (var38 + 1); // L: 1098 + if (var25 > 5) { // L: 1099 + var25 = 5; + } + + var8 = (480 - var35 * var42) / (var42 + 1); // L: 1100 + if (var8 > 5) { // L: 1101 + var8 = 5; + } + + int var28 = (765 - var3 * var38 - var25 * (var38 - 1)) / 2; // L: 1102 + var10 = (480 - var35 * var42 - var8 * (var42 - 1)) / 2; // L: 1103 + int var36 = (var42 + World.World_count - 1) / var42; // L: 1104 + Login.worldSelectPagesCount = var36 - var38; // L: 1105 + if (class323.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1106 + class323.worldSelectLeftSprite.drawAt(8, HealthBar.canvasHeight / 2 - class323.worldSelectLeftSprite.subHeight / 2); // L: 1107 + } + + if (class280.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1109 + class280.worldSelectRightSprite.drawAt(ItemContainer.canvasWidth - class280.worldSelectRightSprite.subWidth - 8, HealthBar.canvasHeight / 2 - class280.worldSelectRightSprite.subHeight / 2); // L: 1110 + } + + int var12 = var10 + 23; // L: 1112 + int var13 = var28 + Login.xPadding; // L: 1113 + int var14 = 0; // L: 1114 + boolean var15 = false; // L: 1115 + int var16 = Login.worldSelectPage; // L: 1116 + + int var17; + for (var17 = var42 * var16; var17 < World.World_count && var16 - Login.worldSelectPage < var38; ++var17) { // L: 1117 1118 + World var18 = DefaultsGroup.World_worlds[var17]; // L: 1121 + boolean var19 = true; // L: 1122 + String var20 = Integer.toString(var18.population); // L: 1123 + if (var18.population == -1) { // L: 1124 + var20 = "OFF"; // L: 1125 + var19 = false; // L: 1126 + } else if (var18.population > 1980) { // L: 1128 + var20 = "FULL"; // L: 1129 + var19 = false; // L: 1130 + } + + int var22 = 0; // L: 1133 + byte var21; + if (var18.isBeta()) { // L: 1134 + if (var18.isMembersOnly()) { // L: 1135 + var21 = 7; + } else { + var21 = 6; // L: 1136 + } + } else if (var18.isDeadman()) { // L: 1138 + var22 = 16711680; // L: 1139 + if (var18.isMembersOnly()) { // L: 1140 + var21 = 5; + } else { + var21 = 4; // L: 1141 + } + } else if (var18.method1880()) { // L: 1143 + if (var18.isMembersOnly()) { // L: 1144 + var21 = 9; + } else { + var21 = 8; // L: 1145 + } + } else if (var18.isPvp()) { // L: 1147 + if (var18.isMembersOnly()) { // L: 1148 + var21 = 3; + } else { + var21 = 2; // L: 1149 + } + } else if (var18.isMembersOnly()) { // L: 1152 + var21 = 1; + } else { + var21 = 0; // L: 1153 + } + + if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var13 + var3 && MouseHandler.MouseHandler_y < var35 + var12 && var19) { // L: 1155 + Login.hoveredWorldIndex = var17; // L: 1156 + EnumDefinition.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var12, 128, 16777215); // L: 1157 + var15 = true; // L: 1158 + } else { + EnumDefinition.worldSelectBackSprites[var21].drawAt(var13, var12); // L: 1160 + } + + if (FaceNormal.worldSelectFlagSprites != null) { // L: 1161 + FaceNormal.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var13 + 29, var12); + } + + var0.drawCentered(Integer.toString(var18.id), var13 + 15, var35 / 2 + var12 + 5, var22, -1); // L: 1162 + var1.drawCentered(var20, var13 + 60, var35 / 2 + var12 + 5, 268435455, -1); // L: 1163 + var12 = var12 + var8 + var35; // L: 1164 + ++var14; // L: 1165 + if (var14 >= var42) { + var12 = var10 + 23; // L: 1166 + var13 = var13 + var25 + var3; // L: 1167 + var14 = 0; // L: 1168 + ++var16; // L: 1169 + } + } + + if (var15) { // L: 1172 + var17 = var1.stringWidth(DefaultsGroup.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1173 + int var29 = var1.ascent + 8; // L: 1174 + int var37 = MouseHandler.MouseHandler_y + 25; // L: 1175 + if (var37 + var29 > 480) { // L: 1176 + var37 = MouseHandler.MouseHandler_y - 25 - var29; // L: 1177 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var29, 16777120); // L: 1179 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var29, 0); // L: 1180 + var1.drawCentered(DefaultsGroup.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var37 + var1.ascent + 4, 0, -1); // L: 1181 + } + } + + class22.rasterProvider.drawFull(0, 0); // L: 1184 + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1188 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1189 + SecureRandomFuture.logoSprite.drawAt(Login.xPadding + 382 - SecureRandomFuture.logoSprite.subWidth / 2, 18); // L: 1190 + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1191 + var3 = 20; // L: 1192 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1193 + var4 = 253 - var3; // L: 1194 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1195 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1196 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1197 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1198 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1199 + } + + String var5; + String var6; + String var7; + short var30; + short var32; + if (Client.gameState == 20) { // L: 1201 + Tiles.titleboxSprite.drawAt(Login.loginBoxX + 180 - Tiles.titleboxSprite.subWidth / 2, 271 - Tiles.titleboxSprite.subHeight / 2); // L: 1202 + var30 = 201; // L: 1203 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1204 + var31 = var30 + 15; // L: 1205 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1206 + var31 += 15; // L: 1207 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1208 + var31 += 15; // L: 1209 + var31 += 7; // L: 1210 + if (Login.loginIndex != 4) { // L: 1211 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var31, 16777215, 0); // L: 1212 + var32 = 200; // L: 1213 + var5 = GrandExchangeOfferAgeComparator.clientPreferences.hideUsername ? LoginPacket.method3747(Login.Login_username) : Login.Login_username; // L: 1216 + + for (var6 = var5; var0.stringWidth(var6) > var32; var6 = var6.substring(0, var6.length() - 1)) { // L: 1218 1219 1220 + } + + var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var31, 16777215, 0); // L: 1222 + var31 += 15; // L: 1223 + + for (var7 = LoginPacket.method3747(Login.Login_password); var0.stringWidth(var7) > var32; var7 = var7.substring(1)) { // L: 1224 1225 1226 + } + + var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var31, 16777215, 0); // L: 1228 + var31 += 15; // L: 1229 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 1232 + Tiles.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1233 + short var23; + if (Login.loginIndex == 0) { // L: 1234 + var30 = 251; // L: 1235 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1236 + var31 = var30 + 30; // L: 1237 + var4 = Login.loginBoxX + 180 - 80; // L: 1238 + var23 = 291; // L: 1239 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1240 + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1241 + var4 = Login.loginBoxX + 180 + 80; // L: 1242 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1243 + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1244 + } else if (Login.loginIndex == 1) { // L: 1246 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1247 + var30 = 236; // L: 1248 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1249 + var31 = var30 + 15; // L: 1250 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1251 + var31 += 15; // L: 1252 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1253 + var31 += 15; // L: 1254 + var4 = Login.loginBoxX + 180 - 80; // L: 1255 + var23 = 321; // L: 1256 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1257 + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1258 + var4 = Login.loginBoxX + 180 + 80; // L: 1259 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1260 + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1261 + } else if (Login.loginIndex == 2) { // L: 1263 + var30 = 201; // L: 1264 + var0.drawCentered(Login.Login_response1, AttackOption.loginBoxCenter, var30, 16776960, 0); // L: 1265 + var31 = var30 + 15; // L: 1266 + var0.drawCentered(Login.Login_response2, AttackOption.loginBoxCenter, var31, 16776960, 0); // L: 1267 + var31 += 15; // L: 1268 + var0.drawCentered(Login.Login_response3, AttackOption.loginBoxCenter, var31, 16776960, 0); // L: 1269 + var31 += 15; // L: 1270 + var31 += 7; // L: 1271 + var0.draw("Login: ", AttackOption.loginBoxCenter - 110, var31, 16777215, 0); // L: 1272 + var32 = 200; // L: 1273 + var5 = GrandExchangeOfferAgeComparator.clientPreferences.hideUsername ? LoginPacket.method3747(Login.Login_username) : Login.Login_username; // L: 1276 + + for (var6 = var5; var0.stringWidth(var6) > var32; var6 = var6.substring(1)) { // L: 1278 1279 1280 + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), AttackOption.loginBoxCenter - 70, var31, 16777215, 0); // L: 1282 + var31 += 15; // L: 1283 + + for (var7 = LoginPacket.method3747(Login.Login_password); var0.stringWidth(var7) > var32; var7 = var7.substring(1)) { // L: 1284 1285 1286 + } + + var0.draw("Password: " + var7 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), AttackOption.loginBoxCenter - 108, var31, 16777215, 0); // L: 1288 + var31 += 15; // L: 1289 + var30 = 277; // L: 1290 + var8 = AttackOption.loginBoxCenter + -117; // L: 1291 + IndexedSprite var9 = TaskHandler.method3609(Client.Login_isUsernameRemembered, Login.field1230); // L: 1292 + var9.drawAt(var8, var30); // L: 1293 + var8 = var8 + var9.subWidth + 5; // L: 1294 + var1.draw("Remember username", var8, var30 + 13, 16776960, 0); // L: 1295 + var8 = AttackOption.loginBoxCenter + 24; // L: 1296 + var9 = TaskHandler.method3609(GrandExchangeOfferAgeComparator.clientPreferences.hideUsername, Login.field1229); // L: 1297 + var9.drawAt(var8, var30); // L: 1298 + var8 = var8 + var9.subWidth + 5; // L: 1299 + var1.draw("Hide username", var8, var30 + 13, 16776960, 0); // L: 1300 + var31 = var30 + 15; // L: 1301 + var10 = AttackOption.loginBoxCenter - 80; // L: 1302 + short var11 = 321; // L: 1303 + Login.titlebuttonSprite.drawAt(var10 - 73, var11 - 20); // L: 1304 + var0.drawCentered("Login", var10, var11 + 5, 16777215, 0); // L: 1305 + var10 = AttackOption.loginBoxCenter + 80; // L: 1306 + Login.titlebuttonSprite.drawAt(var10 - 73, var11 - 20); // L: 1307 + var0.drawCentered("Cancel", var10, var11 + 5, 16777215, 0); // L: 1308 + var30 = 357; // L: 1309 + switch(Login.field1217) { // L: 1310 + case 2: + UserComparator10.field2002 = "Having trouble logging in?"; // L: 1315 + break; + default: + UserComparator10.field2002 = "Can't login? Click here."; // L: 1312 + } + + class89.field1163 = new Bounds(AttackOption.loginBoxCenter, var30, var1.stringWidth(UserComparator10.field2002), 11); // L: 1318 + ClientPreferences.field1089 = new Bounds(AttackOption.loginBoxCenter, var30, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1319 + var1.drawCentered(UserComparator10.field2002, AttackOption.loginBoxCenter, var30, 16777215, 0); // L: 1320 + } else if (Login.loginIndex == 3) { // L: 1322 + var30 = 201; // L: 1323 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1324 + var31 = var30 + 20; // L: 1325 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1326 + var31 += 15; // L: 1327 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1328 + var31 += 15; // L: 1329 + var4 = Login.loginBoxX + 180; // L: 1330 + var23 = 276; // L: 1331 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1332 + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1333 + var4 = Login.loginBoxX + 180; // L: 1334 + var23 = 326; // L: 1335 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1336 + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1337 + } else { + short var34; + if (Login.loginIndex == 4) { // L: 1339 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1340 + var30 = 236; // L: 1341 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1342 + var31 = var30 + 15; // L: 1343 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1344 + var31 += 15; // L: 1345 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1346 + var31 += 15; // L: 1347 + var0.draw("PIN: " + LoginPacket.method3747(EnumDefinition.otp) + (Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var31, 16777215, 0); // L: 1348 + var31 -= 8; // L: 1349 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var31, 16776960, 0); // L: 1350 + var31 += 15; // L: 1351 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var31, 16776960, 0); // L: 1352 + var4 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1353 + var38 = var31 - var0.ascent; // L: 1354 + IndexedSprite var33; + if (Login.field1227) { // L: 1356 + var33 = Login.options_buttons_2Sprite; // L: 1357 + } else { + var33 = Login.options_buttons_0Sprite; // L: 1360 + } + + var33.drawAt(var4, var38); // L: 1362 + var31 += 15; // L: 1363 + var25 = Login.loginBoxX + 180 - 80; // L: 1364 + var34 = 321; // L: 1365 + Login.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1366 + var0.drawCentered("Continue", var25, var34 + 5, 16777215, 0); // L: 1367 + var25 = Login.loginBoxX + 180 + 80; // L: 1368 + Login.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1369 + var0.drawCentered("Cancel", var25, var34 + 5, 16777215, 0); // L: 1370 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var34 + 36, 255, 0); // L: 1371 + } else if (Login.loginIndex == 5) { // L: 1373 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1374 + var30 = 221; // L: 1375 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1376 + var31 = var30 + 15; // L: 1377 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1378 + var31 += 15; // L: 1379 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1380 + var31 += 15; // L: 1381 + var31 += 14; // L: 1382 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var31, 16777215, 0); // L: 1383 + var32 = 174; // L: 1384 + var5 = GrandExchangeOfferAgeComparator.clientPreferences.hideUsername ? LoginPacket.method3747(Login.Login_username) : Login.Login_username; // L: 1387 + + for (var6 = var5; var0.stringWidth(var6) > var32; var6 = var6.substring(1)) { // L: 1389 1390 1391 + } + + var0.draw(AbstractFont.escapeBrackets(var6) + (Client.cycle % 40 < 20 ? Client.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var31, 16777215, 0); // L: 1393 + var31 += 15; // L: 1394 + var25 = Login.loginBoxX + 180 - 80; // L: 1395 + var34 = 321; // L: 1396 + Login.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1397 + var0.drawCentered("Recover", var25, var34 + 5, 16777215, 0); // L: 1398 + var25 = Login.loginBoxX + 180 + 80; // L: 1399 + Login.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1400 + var0.drawCentered("Back", var25, var34 + 5, 16777215, 0); // L: 1401 + var34 = 356; // L: 1402 + var1.drawCentered("Still having trouble logging in?", AttackOption.loginBoxCenter, var34, 268435455, 0); // L: 1403 + } else if (Login.loginIndex == 6) { // L: 1405 + var30 = 201; // L: 1406 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1407 + var31 = var30 + 15; // L: 1408 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1409 + var31 += 15; // L: 1410 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1411 + var31 += 15; // L: 1412 + var4 = Login.loginBoxX + 180; // L: 1413 + var23 = 321; // L: 1414 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1415 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1416 + } else if (Login.loginIndex == 7) { // L: 1418 + var30 = 216; // L: 1419 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1420 + var31 = var30 + 15; // L: 1421 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1422 + var31 += 15; // L: 1423 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1424 + var31 += 15; // L: 1425 + var4 = Login.loginBoxX + 180 - 80; // L: 1426 + var23 = 321; // L: 1427 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1428 + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1429 + var4 = Login.loginBoxX + 180 + 80; // L: 1430 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1431 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1432 + } else if (Login.loginIndex == 8) { // L: 1434 + var30 = 216; // L: 1435 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1436 + var31 = var30 + 15; // L: 1437 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1438 + var31 += 15; // L: 1439 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1440 + var31 += 15; // L: 1441 + var4 = Login.loginBoxX + 180 - 80; // L: 1442 + var23 = 321; // L: 1443 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1444 + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1445 + var4 = Login.loginBoxX + 180 + 80; // L: 1446 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1447 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1448 + } else if (Login.loginIndex == 12) { // L: 1450 + var30 = 201; // L: 1451 + String var24 = ""; // L: 1452 + var5 = ""; // L: 1453 + var6 = ""; // L: 1454 + switch(Login.field1216) { // L: 1455 + case 0: + var24 = "Your account has been disabled."; // L: 1465 + var5 = Strings.field2839; // L: 1466 + var6 = ""; // L: 1467 + break; // L: 1468 + case 1: + var24 = "Account locked as we suspect it has been stolen."; // L: 1458 + var5 = Strings.field3046; // L: 1459 + var6 = ""; // L: 1460 + break; + default: + HealthBar.Login_promptCredentials(false); // L: 1472 + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1476 + var31 = var30 + 15; // L: 1477 + var2.drawCentered(var5, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1478 + var31 += 15; // L: 1479 + var2.drawCentered(var6, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1480 + var31 += 15; // L: 1481 + var25 = Login.loginBoxX + 180; // L: 1482 + var34 = 276; // L: 1483 + Login.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1484 + var0.drawCentered("Support Page", var25, var34 + 5, 16777215, 0); // L: 1485 + var25 = Login.loginBoxX + 180; // L: 1486 + var34 = 326; // L: 1487 + Login.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1488 + var0.drawCentered("Back", var25, var34 + 5, 16777215, 0); // L: 1489 + } else if (Login.loginIndex == 24) { // L: 1491 + var30 = 221; // L: 1492 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1493 + var31 = var30 + 15; // L: 1494 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1495 + var31 += 15; // L: 1496 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1497 + var31 += 15; // L: 1498 + var4 = Login.loginBoxX + 180; // L: 1499 + var23 = 301; // L: 1500 + Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1501 + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1502 + } + } + } + + if (Client.gameState >= 10) { // L: 1505 + int[] var26 = new int[4]; // L: 1506 + Rasterizer2D.Rasterizer2D_getClipArray(var26); // L: 1507 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, HealthBar.canvasHeight); // L: 1508 + Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1509 + Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1510 + Rasterizer2D.Rasterizer2D_setClipArray(var26); // L: 1511 + } + + DefaultsGroup.title_muteSprite[GrandExchangeOfferAgeComparator.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1513 + if (Client.gameState > 5 && Language.Language_EN == FontName.clientLanguage) { // L: 1514 + if (MouseHandler.field523 != null) { // L: 1515 + var31 = Login.xPadding + 5; // L: 1516 + var32 = 463; // L: 1517 + byte var40 = 100; // L: 1518 + byte var27 = 35; // L: 1519 + MouseHandler.field523.drawAt(var31, var32); // L: 1520 + var0.drawCentered("World" + " " + Client.worldId, var40 / 2 + var31, var27 / 2 + var32 - 2, 16777215, 0); // L: 1521 + if (class248.World_request != null) { // L: 1522 + var1.drawCentered("Loading...", var40 / 2 + var31, var27 / 2 + var32 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var40 / 2 + var31, var27 / 2 + var32 + 12, 16777215, 0); // L: 1523 + } + } else { + MouseHandler.field523 = Canvas.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOffer.archive8, "sl_button", ""); // L: 1526 + } + } + + } + } // L: 1186 1529 } diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java index ac035d9ead..7b1add7e2a 100644 --- a/runescape-client/src/main/java/class69.java +++ b/runescape-client/src/main/java/class69.java @@ -1,62 +1,684 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bx") +@ObfuscatedName("br") public class class69 { - @ObfuscatedName("y") - static String[] field570; - - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "928633152" + descriptor = "Lle;" ) - public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { // L: 9 - int var4 = (var3 + var2) / 2; // L: 10 - int var5 = var2; // L: 11 - String var6 = var0[var4]; // L: 12 - var0[var4] = var0[var3]; // L: 13 - var0[var3] = var6; // L: 14 - short var7 = var1[var4]; // L: 15 - var1[var4] = var1[var3]; // L: 16 - var1[var3] = var7; // L: 17 + static IndexedSprite field583; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ldd;" + ) + @Export("pcmPlayerProvider") + public static PlayerProvider pcmPlayerProvider; - for (int var8 = var2; var8 < var3; ++var8) { // L: 18 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 - String var9 = var0[var8]; // L: 20 - var0[var8] = var0[var5]; // L: 21 - var0[var5] = var9; // L: 22 - short var10 = var1[var8]; // L: 23 - var1[var8] = var1[var5]; // L: 24 - var1[var5++] = var10; // L: 25 + @ObfuscatedName("f") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 + if (var0 % 37L == 0L) { // L: 17 + return null; + } else { + int var2 = 0; // L: 18 + + for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 19 20 22 + ++var2; // L: 21 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 24 25 34 + long var6 = var0; // L: 26 + var0 /= 37L; // L: 27 + var8 = class299.base37Table[(int)(var6 - 37L * var0)]; // L: 28 + if (var8 == '_') { // L: 29 + int var9 = var5.length() - 1; // L: 30 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31 + var8 = 160; // L: 32 + } + } + + var5.reverse(); // L: 36 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37 + return var5.toString(); // L: 38 + } + } else { + return null; + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILco;ZI)I", + garbageValue = "-2072046578" + ) + static int method1266(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 732 + var0 -= 1000; // L: 733 + var3 = UserComparator4.getWidget(Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]); // L: 734 + } else { + var3 = var2 ? MouseRecorder.field621 : Interpreter.field1122; // L: 736 + } + + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var3); // L: 737 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 738 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 758 + var3.modelType = 2; // L: 759 + var3.modelId = Interpreter.Interpreter_intStack[--MilliClock.Interpreter_intStackSize]; // L: 760 + return 1; // L: 761 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 763 + var3.modelType = 3; // L: 764 + var3.modelId = PlayerType.localPlayer.appearance.getChatHeadId(); // L: 765 + return 1; // L: 766 + } else { + return 2; // L: 768 + } + } else { + MilliClock.Interpreter_intStackSize -= 2; // L: 739 + int var4 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize]; // L: 740 + int var5 = Interpreter.Interpreter_intStack[MilliClock.Interpreter_intStackSize + 1]; // L: 741 + var3.itemId = var4; // L: 742 + var3.itemQuantity = var5; // L: 743 + ItemDefinition var6 = AbstractWorldMapData.ItemDefinition_get(var4); // L: 744 + var3.modelAngleX = var6.xan2d; // L: 745 + var3.modelAngleY = var6.yan2d; // L: 746 + var3.modelAngleZ = var6.zan2d; // L: 747 + var3.modelOffsetX = var6.offsetX2d; // L: 748 + var3.modelOffsetY = var6.offsetY2d; // L: 749 + var3.modelZoom = var6.zoom2d; // L: 750 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 751 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 752 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 753 + } + + if (var3.field2678 > 0) { // L: 754 + var3.modelZoom = var3.modelZoom * 32 / var3.field2678; + } else if (var3.rawWidth > 0) { // L: 755 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 756 + } + } + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "319100634" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 8808 + Widget var0 = ItemContainer.getWidgetChild(class307.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8809 + if (var0 != null && var0.onTargetLeave != null) { // L: 8810 + ScriptEvent var1 = new ScriptEvent(); // L: 8811 + var1.widget = var0; // L: 8812 + var1.args = var0.onTargetLeave; // L: 8813 + Entity.runScriptEvent(var1); // L: 8814 + } + + Client.isSpellSelected = false; // L: 8816 + GrandExchangeOfferOwnWorldComparator.invalidateWidget(var0); // L: 8817 + } + } // L: 8818 + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "([Lht;IIIIIIIS)V", + garbageValue = "482" + ) + @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) { // L: 10348 + Widget var9 = var0[var8]; // L: 10349 + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapData_0.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10350 10351 10352 + if (var9.isIf3) { // L: 10353 + if (VertexNormal.isComponentHidden(var9)) { // L: 10354 + continue; + } + } else if (var9.type == 0 && var9 != GrandExchangeEvent.mousedOverWidgetIf1 && VertexNormal.isComponentHidden(var9)) { // L: 10357 + continue; + } + + int var10 = var9.x + var6; // L: 10359 + int var11 = var7 + var9.y; // L: 10360 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 10365 + var12 = var2; // L: 10366 + var13 = var3; // L: 10367 + var14 = var4; // L: 10368 + var15 = var5; // L: 10369 + } else { + int var16; + if (var9.type == 9) { // L: 10371 + var16 = var10; // L: 10372 + var17 = var11; // L: 10373 + var18 = var10 + var9.width; // L: 10374 + int var19 = var11 + var9.height; // L: 10375 + if (var18 < var10) { // L: 10376 + var16 = var18; // L: 10378 + var18 = var10; // L: 10379 + } + + if (var19 < var11) { // L: 10381 + var17 = var19; // L: 10383 + var19 = var11; // L: 10384 + } + + ++var18; // L: 10386 + ++var19; // L: 10387 + var12 = var16 > var2 ? var16 : var2; // L: 10388 + var13 = var17 > var3 ? var17 : var3; // L: 10389 + var14 = var18 < var4 ? var18 : var4; // L: 10390 + var15 = var19 < var5 ? var19 : var5; // L: 10391 + } else { + var16 = var10 + var9.width; // L: 10394 + var17 = var11 + var9.height; // L: 10395 + var12 = var10 > var2 ? var10 : var2; // L: 10396 + var13 = var11 > var3 ? var11 : var3; // L: 10397 + var14 = var16 < var4 ? var16 : var4; // L: 10398 + var15 = var17 < var5 ? var17 : var5; // L: 10399 + } + } + + if (var9 == Client.clickedWidget) { // L: 10401 + Client.field705 = true; // L: 10402 + Client.field931 = var10; // L: 10403 + Client.field701 = var11; // L: 10404 + } + + boolean var32 = false; // L: 10406 + if (var9.field2667) { // L: 10407 + switch(Client.field843) { // L: 10408 + case 0: + var32 = true; // L: 10410 + case 1: + default: + break; + case 2: + if (Client.field844 == var9.id >>> 16) { // L: 10413 + var32 = true; // L: 10414 + } + break; + case 3: + if (var9.id == Client.field844) { // L: 10418 + var32 = true; // L: 10419 + } + } + } + + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10424 + if (var9.isIf3) { // L: 10425 + ScriptEvent var26; + if (var9.noClickThrough) { // L: 10426 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10427 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10428 + if (var26.isMouseInputEvent) { // L: 10429 + var26.remove(); // L: 10430 + var26.widget.containsMouse = false; // L: 10431 + } + } + + if (GrandExchangeEvent.widgetDragDuration == 0) { // L: 10434 + Client.clickedWidget = null; // L: 10435 + Client.clickedWidgetParent = null; // L: 10436 + } + + if (!Client.isMenuOpen) { // L: 10438 + WorldMapSection2.addCancelMenuEntry(); // L: 10439 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10443 10444 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10445 + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10446 + var26.remove(); // L: 10447 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 10453 + var18 = MouseHandler.MouseHandler_y; // L: 10454 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10455 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10456 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10457 + } + + boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10459 + if (var9.contentType == 1337) { // L: 10460 + if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10461 + KeyHandler.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 10464 + class9.checkIfMinimapClicked(var9, var10, var11); // L: 10465 + } else { + if (var9.contentType == 1400) { // L: 10468 + KeyHandler.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10469 + } + + if (!Client.isMenuOpen && var33) { // L: 10471 + if (var9.contentType == 1400) { // L: 10472 + KeyHandler.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10473 + } else { + class238.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10476 + } + } + + boolean var21; + int var23; + if (var32) { // L: 10479 + for (int var20 = 0; var20 < var9.field2668.length; ++var20) { // L: 10480 + var21 = false; // L: 10481 + boolean var27 = false; // L: 10482 + if (!var21 && var9.field2668[var20] != null) { // L: 10483 + for (var23 = 0; var23 < var9.field2668[var20].length; ++var23) { // L: 10484 + boolean var24 = false; // L: 10485 + if (var9.field2594 != null) { // L: 10486 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2668[var20][var23]]; // L: 10487 + } + + if (TileItem.method2235(var9.field2668[var20][var23]) || var24) { // L: 10489 + var21 = true; // L: 10490 + if (var9.field2594 != null && var9.field2594[var20] > Client.cycle) { // L: 10491 + break; + } + + byte var31 = var9.field2649[var20][var23]; // L: 10492 + if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10493 10494 10495 10496 10497 + var27 = true; // L: 10499 + break; + } + } + } + } + + if (var27) { // L: 10505 + if (var20 < 10) { // L: 10506 + Messages.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 10507 + Widget_runOnTargetLeave(); // L: 10508 + class3.selectSpell(var9.id, var9.childIndex, JagexCache.Widget_unpackTargetMask(WorldMapData_0.getWidgetFlags(var9)), var9.itemId); // L: 10509 + Client.selectedSpellActionName = PendingSpawn.Widget_getSpellActionName(var9); // L: 10510 + if (Client.selectedSpellActionName == null) { // L: 10511 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + Client.colorStartTag(16777215); // L: 10512 + } + + var23 = var9.field2670[var20]; // L: 10514 + if (var9.field2594 == null) { // L: 10515 + var9.field2594 = new int[var9.field2668.length]; + } + + if (var9.field2671 == null) { // L: 10516 + var9.field2671 = new int[var9.field2668.length]; + } + + if (var23 != 0) { // L: 10517 + if (var9.field2594[var20] == 0) { // L: 10518 + var9.field2594[var20] = var23 + Client.cycle + var9.field2671[var20]; + } else { + var9.field2594[var20] = var23 + Client.cycle; // L: 10519 + } + } else { + var9.field2594[var20] = Integer.MAX_VALUE; // L: 10521 + } + } + + if (!var21 && var9.field2594 != null) { // L: 10523 10524 + var9.field2594[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 10528 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10529 + var33 = true; + } else { + var33 = false; // L: 10530 + } + + boolean var34 = false; // L: 10531 + if ((MouseHandler.MouseHandler_currentButton == 1 || !MusicPatchNode.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10532 + var34 = true; + } + + var21 = false; // L: 10533 + if ((MouseHandler.MouseHandler_lastButton == 1 || !MusicPatchNode.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10534 + var21 = true; + } + + if (var21) { // L: 10535 + class228.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { // L: 10536 + KeyHandler.worldMap.method6456(var17, var18, var33 & var34, var33 & var21); // L: 10537 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && MusicPatch.method4039(WorldMapData_0.getWidgetFlags(var9))) { // L: 10539 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 10540 + Client.field859 = true; // L: 10541 + Client.field860 = var10; // L: 10542 + Client.field861 = var11; // L: 10543 + } + + if (var9.hasListener) { // L: 10545 + ScriptEvent var22; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10546 + var22 = new ScriptEvent(); // L: 10547 + var22.isMouseInputEvent = true; // L: 10548 + var22.widget = var9; // L: 10549 + var22.mouseY = Client.mouseWheelRotation; // L: 10550 + var22.args = var9.onScroll; // L: 10551 + Client.scriptEvents.addFirst(var22); // L: 10552 + } + + if (Client.clickedWidget != null || GameBuild.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10554 + var21 = false; // L: 10555 + var34 = false; // L: 10556 + var33 = false; // L: 10557 + } + + if (!var9.isClicked && var21) { // L: 10559 + var9.isClicked = true; // L: 10560 + if (var9.onClick != null) { // L: 10561 + var22 = new ScriptEvent(); // L: 10562 + var22.isMouseInputEvent = true; // L: 10563 + var22.widget = var9; // L: 10564 + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10565 + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10566 + var22.args = var9.onClick; // L: 10567 + Client.scriptEvents.addFirst(var22); // L: 10568 + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10571 10572 + var22 = new ScriptEvent(); // L: 10573 + var22.isMouseInputEvent = true; // L: 10574 + var22.widget = var9; // L: 10575 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10576 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10577 + var22.args = var9.onClickRepeat; // L: 10578 + Client.scriptEvents.addFirst(var22); // L: 10579 + } + + if (var9.isClicked && !var34) { // L: 10582 + var9.isClicked = false; // L: 10583 + if (var9.onRelease != null) { // L: 10584 + var22 = new ScriptEvent(); // L: 10585 + var22.isMouseInputEvent = true; // L: 10586 + var22.widget = var9; // L: 10587 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10588 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10589 + var22.args = var9.onRelease; // L: 10590 + Client.field939.addFirst(var22); // L: 10591 + } + } + + if (var34 && var9.onHold != null) { // L: 10594 10595 + var22 = new ScriptEvent(); // L: 10596 + var22.isMouseInputEvent = true; // L: 10597 + var22.widget = var9; // L: 10598 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10599 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10600 + var22.args = var9.onHold; // L: 10601 + Client.scriptEvents.addFirst(var22); // L: 10602 + } + + if (!var9.containsMouse && var33) { // L: 10605 + var9.containsMouse = true; // L: 10606 + if (var9.onMouseOver != null) { // L: 10607 + var22 = new ScriptEvent(); // L: 10608 + var22.isMouseInputEvent = true; // L: 10609 + var22.widget = var9; // L: 10610 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10611 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10612 + var22.args = var9.onMouseOver; // L: 10613 + Client.scriptEvents.addFirst(var22); // L: 10614 + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10617 10618 + var22 = new ScriptEvent(); // L: 10619 + var22.isMouseInputEvent = true; // L: 10620 + var22.widget = var9; // L: 10621 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10622 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10623 + var22.args = var9.onMouseRepeat; // L: 10624 + Client.scriptEvents.addFirst(var22); // L: 10625 + } + + if (var9.containsMouse && !var33) { // L: 10628 + var9.containsMouse = false; // L: 10629 + if (var9.onMouseLeave != null) { // L: 10630 + var22 = new ScriptEvent(); // L: 10631 + var22.isMouseInputEvent = true; // L: 10632 + var22.widget = var9; // L: 10633 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10634 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10635 + var22.args = var9.onMouseLeave; // L: 10636 + Client.field939.addFirst(var22); // L: 10637 + } + } + + if (var9.onTimer != null) { // L: 10640 + var22 = new ScriptEvent(); // L: 10641 + var22.widget = var9; // L: 10642 + var22.args = var9.onTimer; // L: 10643 + Client.field881.addFirst(var22); // L: 10644 + } + + ScriptEvent var25; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.field868 > var9.field2727) { // L: 10646 + if (var9.varTransmitTriggers != null && Client.field868 - var9.field2727 <= 32) { // L: 10647 + label774: + for (var36 = var9.field2727; var36 < Client.field868; ++var36) { // L: 10654 + var23 = Client.field867[var36 & 31]; // L: 10655 + + for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10656 + if (var23 == var9.varTransmitTriggers[var35]) { // L: 10657 + var25 = new ScriptEvent(); // L: 10658 + var25.widget = var9; // L: 10659 + var25.args = var9.onVarTransmit; // L: 10660 + Client.scriptEvents.addFirst(var25); // L: 10661 + break label774; // L: 10662 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10648 + var22.widget = var9; // L: 10649 + var22.args = var9.onVarTransmit; // L: 10650 + Client.scriptEvents.addFirst(var22); // L: 10651 + } + + var9.field2727 = Client.field868; // L: 10667 + } + + if (var9.onInvTransmit != null && Client.field941 > var9.field2728) { // L: 10669 + if (var9.invTransmitTriggers != null && Client.field941 - var9.field2728 <= 32) { // L: 10670 + label750: + for (var36 = var9.field2728; var36 < Client.field941; ++var36) { // L: 10677 + var23 = Client.changedItemContainers[var36 & 31]; // L: 10678 + + for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10679 + if (var23 == var9.invTransmitTriggers[var35]) { // L: 10680 + var25 = new ScriptEvent(); // L: 10681 + var25.widget = var9; // L: 10682 + var25.args = var9.onInvTransmit; // L: 10683 + Client.scriptEvents.addFirst(var25); // L: 10684 + break label750; // L: 10685 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10671 + var22.widget = var9; // L: 10672 + var22.args = var9.onInvTransmit; // L: 10673 + Client.scriptEvents.addFirst(var22); // L: 10674 + } + + var9.field2728 = Client.field941; // L: 10690 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2729) { // L: 10692 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2729 <= 32) { // L: 10693 + label726: + for (var36 = var9.field2729; var36 < Client.changedSkillsCount; ++var36) { // L: 10700 + var23 = Client.changedSkills[var36 & 31]; // L: 10701 + + for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10702 + if (var23 == var9.statTransmitTriggers[var35]) { // L: 10703 + var25 = new ScriptEvent(); // L: 10704 + var25.widget = var9; // L: 10705 + var25.args = var9.onStatTransmit; // L: 10706 + Client.scriptEvents.addFirst(var25); // L: 10707 + break label726; // L: 10708 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10694 + var22.widget = var9; // L: 10695 + var22.args = var9.onStatTransmit; // L: 10696 + Client.scriptEvents.addFirst(var22); // L: 10697 + } + + var9.field2729 = Client.changedSkillsCount; // L: 10713 + } + + if (Client.chatCycle > var9.field2726 && var9.onChatTransmit != null) { // L: 10715 + var22 = new ScriptEvent(); // L: 10716 + var22.widget = var9; // L: 10717 + var22.args = var9.onChatTransmit; // L: 10718 + Client.scriptEvents.addFirst(var22); // L: 10719 + } + + if (Client.field874 > var9.field2726 && var9.onFriendTransmit != null) { // L: 10721 + var22 = new ScriptEvent(); // L: 10722 + var22.widget = var9; // L: 10723 + var22.args = var9.onFriendTransmit; // L: 10724 + Client.scriptEvents.addFirst(var22); // L: 10725 + } + + if (Client.field875 > var9.field2726 && var9.onClanTransmit != null) { // L: 10727 + var22 = new ScriptEvent(); // L: 10728 + var22.widget = var9; // L: 10729 + var22.args = var9.onClanTransmit; // L: 10730 + Client.scriptEvents.addFirst(var22); // L: 10731 + } + + if (Client.field885 > var9.field2726 && var9.onStockTransmit != null) { // L: 10733 + var22 = new ScriptEvent(); // L: 10734 + var22.widget = var9; // L: 10735 + var22.args = var9.onStockTransmit; // L: 10736 + Client.scriptEvents.addFirst(var22); // L: 10737 + } + + if (Client.field852 > var9.field2726 && var9.field2669 != null) { // L: 10739 + var22 = new ScriptEvent(); // L: 10740 + var22.widget = var9; // L: 10741 + var22.args = var9.field2669; // L: 10742 + Client.scriptEvents.addFirst(var22); // L: 10743 + } + + if (Client.field878 > var9.field2726 && var9.onMiscTransmit != null) { // L: 10745 + var22 = new ScriptEvent(); // L: 10746 + var22.widget = var9; // L: 10747 + var22.args = var9.onMiscTransmit; // L: 10748 + Client.scriptEvents.addFirst(var22); // L: 10749 + } + + var9.field2726 = Client.cycleCntr; // L: 10751 + if (var9.onKey != null) { // L: 10752 + for (var36 = 0; var36 < Client.field902; ++var36) { // L: 10753 + ScriptEvent var30 = new ScriptEvent(); // L: 10754 + var30.widget = var9; // L: 10755 + var30.keyTyped = Client.field904[var36]; // L: 10756 + var30.keyPressed = Client.field903[var36]; // L: 10757 + var30.args = var9.onKey; // L: 10758 + Client.scriptEvents.addFirst(var30); // L: 10759 + } + } + } + } + + if (!var9.isIf3) { // L: 10764 + if (Client.clickedWidget != null || GameBuild.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10765 + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10766 + if (var9.mouseOverRedirect >= 0) { // L: 10767 + GrandExchangeEvent.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + GrandExchangeEvent.mousedOverWidgetIf1 = var9; // L: 10768 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10770 + GrandExchangeOfferOwnWorldComparator.field677 = var9; // L: 10771 + } + + if (var9.scrollHeight > var9.height) { // L: 10773 + PacketBufferNode.method3759(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 10775 + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10776 + if (var9.children != null) { // L: 10777 + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 10778 + if (var28 != null) { // L: 10779 + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10780 + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10781 + if (var29.isMouseInputEvent) { // L: 10782 + var29.remove(); // L: 10783 + var29.widget.containsMouse = false; // L: 10784 + } + } + + if (GrandExchangeEvent.widgetDragDuration == 0) { // L: 10787 + Client.clickedWidget = null; // L: 10788 + Client.clickedWidgetParent = null; // L: 10789 + } + + if (!Client.isMenuOpen) { // L: 10791 + WorldMapSection2.addCancelMenuEntry(); // L: 10792 + } + } + + DynamicObject.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10795 + } + } + } } } - - var0[var3] = var0[var5]; // L: 29 - var0[var5] = var6; // L: 30 - var1[var3] = var1[var5]; // L: 31 - var1[var5] = var7; // L: 32 - sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 - sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 } - } // L: 36 - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(Lhq;IIII)V", - garbageValue = "1412729632" - ) - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 10637 - if (var4 != null) { // L: 10638 - if (Client.minimapState < 3) { // L: 10639 - LoginPacket.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); // L: 10640 - } - - } - } // L: 10641 + } // L: 10799 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index a1e2df3b64..97eef561ce 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,80 +1,99 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") +@ObfuscatedName("c") public enum class7 implements Enumerated { - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lw;" + descriptor = "Lc;" ) - field37(0, 0); + field26(0, 0); - @ObfuscatedName("g") - static int[] field39; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - static IndexedSprite field36; - @ObfuscatedName("if") - @ObfuscatedGetter( - intValue = 1039444805 - ) - static int field40; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1712649125 - ) - final int field35; @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 969088693 + intValue = -2134453371 ) - final int field38; + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 655499637 + ) + final int field23; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 299082675 + ) + final int field24; class7(int var3, int var4) { - this.field35 = var3; - this.field38 = var4; // L: 13 + this.field23 = var3; // L: 12 + this.field24 = var4; // L: 13 } // L: 14 - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "385513888" + descriptor = "(B)I", + garbageValue = "23" ) + @Export("rsOrdinal") public int rsOrdinal() { - return this.field38; // L: 17 + return this.field24; // L: 17 } - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lw;I)Lh;", - garbageValue = "1469756534" + descriptor = "(II)Z", + garbageValue = "1670201823" ) - public static class12 method102(class7 var0) { - switch(var0.field35) { // L: 9 - case 0: - return new class5(); // L: 12 - default: - throw new IllegalArgumentException(); // L: 16 - } + public static boolean method108(int var0) { + return var0 == WorldMapDecorationType.field2768.id; // L: 50 } - @ObfuscatedName("fk") + @ObfuscatedName("gc") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-2096801183" + descriptor = "(IIIIIIII)V", + garbageValue = "-1921843394" ) - static void queueSoundEffect(int var0, int var1, int var2) { - if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3277 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3278 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3279 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3280 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3281 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 3282 - ++Client.soundEffectCount; // L: 3283 + static final void method112(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + var5 = HorizontalAlignment.method4876(var5, var6); // L: 5444 + int var7 = 2048 - var3 & 2047; // L: 5445 + int var8 = 2048 - var4 & 2047; // L: 5446 + int var9 = 0; // L: 5447 + int var10 = 0; // L: 5448 + int var11 = var5; // L: 5449 + int var12; + int var13; + int var14; + if (var7 != 0) { // L: 5450 + var12 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 5451 + var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 5452 + var14 = var13 * var10 - var5 * var12 >> 16; // L: 5453 + var11 = var13 * var5 + var12 * var10 >> 16; // L: 5454 + var10 = var14; // L: 5455 } - } // L: 3285 + if (var8 != 0) { // L: 5457 + var12 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5458 + var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5459 + var14 = var11 * var12 + var13 * var9 >> 16; // L: 5460 + var11 = var13 * var11 - var9 * var12 >> 16; // L: 5461 + var9 = var14; // L: 5462 + } + + ItemContainer.cameraX = var0 - var9; // L: 5464 + ChatChannel.cameraY = var1 - var10; // L: 5465 + WorldMapManager.cameraZ = var2 - var11; // L: 5466 + World.cameraPitch = var3; // L: 5467 + ViewportMouse.cameraYaw = var4; // L: 5468 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (TileItem.oculusOrbFocalPointX >> 7 != PlayerType.localPlayer.x >> 7 || Interpreter.oculusOrbFocalPointY >> 7 != PlayerType.localPlayer.y >> 7)) { // L: 5469 5470 + var12 = PlayerType.localPlayer.plane; // L: 5471 + var13 = (TileItem.oculusOrbFocalPointX >> 7) + FloorDecoration.baseX; // L: 5472 + var14 = (Interpreter.oculusOrbFocalPointY >> 7) + WorldMapData_0.baseY; // L: 5473 + class2.method42(var13, var14, var12, true); // L: 5474 + } + + } // L: 5477 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 488b1907ac..7c7e5f38e9 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,79 +1,144 @@ import java.util.concurrent.Callable; -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("g") +@ObfuscatedName("u") public class class8 implements Callable { - @ObfuscatedName("rf") - @ObfuscatedGetter( - intValue = 796418753 - ) - static int field43; - @ObfuscatedName("pv") - static boolean ClanChat_inClanChat; - @ObfuscatedName("z") + @ObfuscatedName("ow") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lfq;" ) - final Buffer field45; - @ObfuscatedName("k") + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("at") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "Lh;" + descriptor = "Lid;" ) - final class12 field42; + @Export("archive13") + static Archive archive13; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lkb;" + ) + final Buffer field35; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Ln;" + ) + final class12 field31; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lm;" + descriptor = "Lt;" ) final class9 this$0; @ObfuscatedSignature( - descriptor = "(Lm;Lkf;Lh;)V" + descriptor = "(Lt;Lkb;Ln;)V" ) class8(class9 var1, Buffer var2, class12 var3) { this.this$0 = var1; // L: 47 - this.field45 = var2; // L: 48 - this.field42 = var3; // L: 49 + this.field35 = var2; // L: 48 + this.field31 = var3; // L: 49 } // L: 50 public Object call() { - return this.field42.vmethod127(this.field45); // L: 53 + return this.field31.vmethod145(this.field35); // L: 53 } - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-552632511" + descriptor = "(I)[Lih;", + garbageValue = "1246224952" ) - static void method105() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 - KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 - KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 - KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 - KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 - KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 - KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 - KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 - KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 - KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 - KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 - KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 - KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 - KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 - KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 - KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 - KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 - KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 - KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 - KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 - KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 - KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 - KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 - KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 + static class238[] method116() { + return new class238[]{class238.field3116, class238.field3113}; // L: 35 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IIII)J", + garbageValue = "1560484309" + ) + static long method117(int var0, int var1, int var2) { + return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "-2023789845" + ) + public static byte[] method113(CharSequence var0) { + int var1 = var0.length(); // L: 68 + byte[] var2 = new byte[var1]; // L: 69 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 70 + char var4 = var0.charAt(var3); // L: 71 + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 72 + var2[var3] = (byte)var4; + } else if (var4 == 8364) { // L: 73 + var2[var3] = -128; + } else if (var4 == 8218) { // L: 74 + var2[var3] = -126; + } else if (var4 == 402) { // L: 75 + var2[var3] = -125; + } else if (var4 == 8222) { // L: 76 + var2[var3] = -124; + } else if (var4 == 8230) { // L: 77 + var2[var3] = -123; + } else if (var4 == 8224) { // L: 78 + var2[var3] = -122; + } else if (var4 == 8225) { // L: 79 + var2[var3] = -121; + } else if (var4 == 710) { // L: 80 + var2[var3] = -120; + } else if (var4 == 8240) { // L: 81 + var2[var3] = -119; + } else if (var4 == 352) { // L: 82 + var2[var3] = -118; + } else if (var4 == 8249) { // L: 83 + var2[var3] = -117; + } else if (var4 == 338) { // L: 84 + var2[var3] = -116; + } else if (var4 == 381) { // L: 85 + var2[var3] = -114; + } else if (var4 == 8216) { // L: 86 + var2[var3] = -111; + } else if (var4 == 8217) { // L: 87 + var2[var3] = -110; + } else if (var4 == 8220) { // L: 88 + var2[var3] = -109; + } else if (var4 == 8221) { // L: 89 + var2[var3] = -108; + } else if (var4 == 8226) { // L: 90 + var2[var3] = -107; + } else if (var4 == 8211) { // L: 91 + var2[var3] = -106; + } else if (var4 == 8212) { // L: 92 + var2[var3] = -105; + } else if (var4 == 732) { // L: 93 + var2[var3] = -104; + } else if (var4 == 8482) { // L: 94 + var2[var3] = -103; + } else if (var4 == 353) { // L: 95 + var2[var3] = -102; + } else if (var4 == 8250) { // L: 96 + var2[var3] = -101; + } else if (var4 == 339) { // L: 97 + var2[var3] = -100; + } else if (var4 == 382) { // L: 98 + var2[var3] = -98; + } else if (var4 == 376) { // L: 99 + var2[var3] = -97; + } else { + var2[var3] = 63; // L: 100 + } } - } // L: 147 + return var2; // L: 102 + } } diff --git a/runescape-client/src/main/java/class89.java b/runescape-client/src/main/java/class89.java index a22242f092..f24961da29 100644 --- a/runescape-client/src/main/java/class89.java +++ b/runescape-client/src/main/java/class89.java @@ -1,94 +1,120 @@ import java.math.BigInteger; -import java.util.Iterator; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cn") public class class89 { - @ObfuscatedName("i") - static final BigInteger field1161; - @ObfuscatedName("o") - static final BigInteger field1164; + @ObfuscatedName("z") + static final BigInteger field1166; + @ObfuscatedName("q") + static final BigInteger field1167; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + static Bounds field1163; static { - field1161 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field1164 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + field1166 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field1167 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } - @ObfuscatedName("o") + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)Lbk;", + garbageValue = "971686415" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 44 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "39" + ) + static void method2163() { + Players.Players_count = 0; // L: 616 + + for (int var0 = 0; var0 < 2048; ++var0) { // L: 617 + Players.field1284[var0] = null; // L: 618 + Players.field1295[var0] = 1; // L: 619 + } + + } // L: 621 + + @ObfuscatedName("eg") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1737643934" + garbageValue = "-1081555887" ) - static void method2127() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 50 + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2933 + NetFileRequest.method4292(); // L: 2935 + MidiPcmStream.method3970(); // L: 2936 + KitDefinition.KitDefinition_cached.clear(); // L: 2938 + ObjectDefinition.ObjectDefinition_cached.clear(); // L: 2941 + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 2942 + ObjectDefinition.ObjectDefinition_cachedEntities.clear(); // L: 2943 + ObjectDefinition.ObjectDefinition_cachedModels.clear(); // L: 2944 + TileItem.method2239(); // L: 2946 + class200.method3803(); // L: 2947 + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2949 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2950 + Projectile.method2228(); // L: 2952 + class234.method4261(); // L: 2953 + MouseRecorder.method1283(); // L: 2954 + GrandExchangeOfferAgeComparator.method242(); // L: 2955 + WorldMapIcon_0.method297(); // L: 2956 + StructDefinition.method4699(); // L: 2957 + ParamDefinition.ParamDefinition_cached.clear(); // L: 2959 + class13.method150(); // L: 2961 + WorldMapIcon_1.method398(); // L: 2962 + Widget.Widget_cachedSprites.clear(); // L: 2964 + Widget.Widget_cachedModels.clear(); // L: 2965 + Widget.Widget_cachedFonts.clear(); // L: 2966 + Widget.Widget_cachedSpriteMasks.clear(); // L: 2967 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2969 + Script.Script_cached.clear(); // L: 2970 + MenuAction.archive0.clearFiles(); // L: 2971 + WorldMapManager.archive1.clearFiles(); // L: 2972 + FaceNormal.archive3.clearFiles(); // L: 2973 + Username.archive4.clearFiles(); // L: 2974 + Varcs.archive5.clearFiles(); // L: 2975 + ApproximateRouteStrategy.archive6.clearFiles(); // L: 2976 + class236.archive7.clearFiles(); // L: 2977 + GrandExchangeOffer.archive8.clearFiles(); // L: 2978 + WorldMapData_1.archive9.clearFiles(); // L: 2979 + class281.archive10.clearFiles(); // L: 2980 + AbstractByteArrayCopier.archive11.clearFiles(); // L: 2981 + ViewportMouse.archive12.clearFiles(); // L: 2982 + ModeWhere.scene.clear(); // L: 2984 - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); // L: 51 - var1.clearIsFromFriend(); // L: 53 + for (int var0 = 0; var0 < 4; ++var0) { // L: 2985 + Client.collisionMaps[var0].clear(); } - } // L: 56 + System.gc(); // L: 2986 + VertexNormal.method3133(2); // L: 2987 + Client.currentTrackGroupId = -1; // L: 2988 + Client.field916 = false; // L: 2989 - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1760703138" - ) - static void method2130(int var0) { - Login.loginIndex = 12; // L: 1733 - Login.field1210 = var0; // L: 1734 - } // L: 1735 - - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "602324309" - ) - static final void forceDisconnect(int var0) { - ViewportMouse.logOut(); // L: 2510 - switch(var0) { // L: 2511 - case 1: - Login.loginIndex = 24; // L: 2520 - UrlRequester.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2521 - break; - case 2: - GrandExchangeOfferTotalQuantityComparator.method169(); // L: 2514 - } - - } // L: 2526 - - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-29" - ) - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4945 - int var3 = ArchiveLoader.getTileHeight(var0, var1, Huffman.Client_plane) - var2; // L: 4950 - var0 -= VertexNormal.cameraX; // L: 4951 - var3 -= FaceNormal.cameraY; // L: 4952 - var1 -= AbstractWorldMapData.cameraZ; // L: 4953 - int var4 = Rasterizer3D.Rasterizer3D_sine[PacketBuffer.cameraPitch]; // L: 4954 - int var5 = Rasterizer3D.Rasterizer3D_cosine[PacketBuffer.cameraPitch]; // L: 4955 - int var6 = Rasterizer3D.Rasterizer3D_sine[ServerPacket.cameraYaw]; // L: 4956 - int var7 = Rasterizer3D.Rasterizer3D_cosine[ServerPacket.cameraYaw]; // L: 4957 - int var8 = var6 * var1 + var0 * var7 >> 16; // L: 4958 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 4959 - var0 = var8; // L: 4960 - var8 = var5 * var3 - var4 * var1 >> 16; // L: 4961 - var1 = var3 * var4 + var5 * var1 >> 16; // L: 4962 - if (var1 >= 50) { // L: 4964 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 4965 - Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 4966 - } else { - Client.viewportTempX = -1; // L: 4969 - Client.viewportTempY = -1; // L: 4970 + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 2991 + if (var1.stream1 != null) { // L: 2992 + GrandExchangeEvents.pcmStreamMixer.removeSubStream(var1.stream1); // L: 2993 + var1.stream1 = null; // L: 2994 } - } else { - Client.viewportTempX = -1; // L: 4946 - Client.viewportTempY = -1; // L: 4947 + if (var1.stream2 != null) { // L: 2996 + GrandExchangeEvents.pcmStreamMixer.removeSubStream(var1.stream2); // L: 2997 + var1.stream2 = null; // L: 2998 + } } - } // L: 4948 4972 + + ObjectSound.objectSounds.clear(); // L: 3001 + BuddyRankComparator.updateGameState(10); // L: 3003 + } // L: 3004 } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index 50407aaea2..e8ef75976b 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -1,244 +1,292 @@ +import java.util.Iterator; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") +@ObfuscatedName("t") public class class9 { - @ObfuscatedName("ql") + @ObfuscatedName("f") + ExecutorService field44; + @ObfuscatedName("b") + Future field41; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Lkb;" ) - static Decimator decimator; - @ObfuscatedName("z") - ExecutorService field52; - @ObfuscatedName("k") - Future field48; - @ObfuscatedName("s") + final Buffer field43; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Ln;" ) - final Buffer field49; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lh;" - ) - final class12 field50; + final class12 field40; @ObfuscatedSignature( - descriptor = "(Lkf;Lh;)V" + descriptor = "(Lkb;Ln;)V" ) public class9(Buffer var1, class12 var2) { - this.field52 = Executors.newSingleThreadExecutor(); // L: 10 - this.field49 = var1; // L: 16 - this.field50 = var2; // L: 17 - this.method118(); // L: 18 - } // L: 19 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "16" - ) - public boolean method109() { - return this.field48.isDone(); // L: 22 + this.field44 = Executors.newSingleThreadExecutor(); // L: 10 + this.field43 = var1; + this.field40 = var2; + this.method129(); // L: 18 } - @ObfuscatedName("k") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "208933439" + ) + public boolean method120() { + return this.field41.isDone(); + } + + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1920645781" + garbageValue = "1441030159" ) - public void method110() { - this.field52.shutdown(); // L: 26 - this.field52 = null; // L: 27 - } // L: 28 + public void method121() { + this.field44.shutdown(); + this.field44 = null; + } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lkf;", - garbageValue = "-1217218558" + descriptor = "(I)Lkb;", + garbageValue = "590307722" ) public Buffer method122() { try { - return (Buffer)this.field48.get(); // L: 32 + return (Buffer)this.field41.get(); } catch (Exception var2) { // L: 34 return null; // L: 35 } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "113" + descriptor = "(I)V", + garbageValue = "-2106026130" ) - void method118() { - this.field48 = this.field52.submit(new class8(this, this.field49, this.field50)); // L: 40 + void method129() { + this.field41 = this.field44.submit(new class8(this, this.field43, this.field40)); // L: 40 } // L: 41 - @ObfuscatedName("gr") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "653540515" + descriptor = "(CB)Z", + garbageValue = "-47" ) - static final int method111() { - if (Tile.clientPreferences.roofsHidden) { // L: 4331 - return Huffman.Client_plane; + static final boolean method124(char var0) { + if (Character.isISOControl(var0)) { // L: 16 + return false; + } else if (class3.isAlphaNumeric(var0)) { // L: 17 + return true; } else { - int var0 = 3; // L: 4332 - if (PacketBuffer.cameraPitch < 310) { // L: 4333 - label168: { - int var1; - int var2; - if (Client.oculusOrbState == 1) { // L: 4336 - var1 = GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7; // L: 4337 - var2 = MouseHandler.oculusOrbFocalPointY >> 7; // L: 4338 - } else { - var1 = WorldMapLabelSize.localPlayer.x >> 7; // L: 4341 - var2 = WorldMapLabelSize.localPlayer.y >> 7; // L: 4342 - } + char[] var1 = class349.field4075; // L: 19 - int var3 = VertexNormal.cameraX >> 7; // L: 4344 - int var4 = AbstractWorldMapData.cameraZ >> 7; // L: 4345 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 4346 - if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 4347 - if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4348 - var0 = Huffman.Client_plane; - } - - int var5; - if (var1 > var3) { // L: 4350 - var5 = var1 - var3; - } else { - var5 = var3 - var1; // L: 4351 - } - - int var6; - if (var2 > var4) { // L: 4353 - var6 = var2 - var4; - } else { - var6 = var4 - var2; // L: 4354 - } - - int var7; - int var8; - if (var5 > var6) { // L: 4355 - var7 = var6 * 65536 / var5; // L: 4356 - var8 = 32768; // L: 4357 - - while (true) { - if (var3 == var1) { // L: 4358 - break label168; - } - - if (var3 < var1) { - ++var3; // L: 4359 - } else if (var3 > var1) { // L: 4360 - --var3; - } - - if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4361 - var0 = Huffman.Client_plane; - } - - var8 += var7; // L: 4362 - if (var8 >= 65536) { // L: 4363 - var8 -= 65536; // L: 4364 - if (var4 < var2) { // L: 4365 - ++var4; - } else if (var4 > var2) { // L: 4366 - --var4; - } - - if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4367 - var0 = Huffman.Client_plane; - } - } - } - } else { - if (var6 > 0) { // L: 4371 - var7 = var5 * 65536 / var6; // L: 4372 - var8 = 32768; // L: 4373 - - while (var4 != var2) { // L: 4374 - if (var4 < var2) { // L: 4375 - ++var4; - } else if (var4 > var2) { // L: 4376 - --var4; - } - - if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4377 - var0 = Huffman.Client_plane; - } - - var8 += var7; // L: 4378 - if (var8 >= 65536) { // L: 4379 - var8 -= 65536; // L: 4380 - if (var3 < var1) { // L: 4381 - ++var3; - } else if (var3 > var1) { // L: 4382 - --var3; - } - - if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4383 - var0 = Huffman.Client_plane; - } - } - } - } - break label168; - } - } - - return Huffman.Client_plane; - } - - return Huffman.Client_plane; + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { // L: 20 + var3 = var1[var2]; // L: 21 + if (var0 == var3) { // L: 22 + return true; } } - if (WorldMapLabelSize.localPlayer.x >= 0 && WorldMapLabelSize.localPlayer.y >= 0 && WorldMapLabelSize.localPlayer.x < 13312 && WorldMapLabelSize.localPlayer.y < 13312) { // L: 4388 - if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][WorldMapLabelSize.localPlayer.x >> 7][WorldMapLabelSize.localPlayer.y >> 7] & 4) != 0) { // L: 4389 - var0 = Huffman.Client_plane; + var1 = class349.field4073; // L: 26 + + for (var2 = 0; var2 < var1.length; ++var2) { // L: 27 + var3 = var1[var2]; // L: 28 + if (var0 == var3) { + return true; // L: 29 + } + } + + return false; // L: 32 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Lks;IS)Z", + garbageValue = "21881" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 541 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 542 + if (var0.readBits(1) != 0) { // L: 543 + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); // L: 544 + var4 = var0.readBits(13); // L: 545 + boolean var12 = var0.readBits(1) == 1; // L: 546 + if (var12) { // L: 547 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 548 + throw new RuntimeException(); // L: 549 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 551 + var11.index = var1; // L: 552 + if (Players.field1284[var1] != null) { // L: 553 + var11.read(Players.field1284[var1]); } - return var0; // L: 4390 + var11.orientation = Players.Players_orientations[var1]; // L: 554 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 555 + var7 = Players.Players_regions[var1]; // L: 556 + var8 = var7 >> 28; // L: 557 + var9 = var7 >> 14 & 255; // L: 558 + var10 = var7 & 255; // L: 559 + var11.pathTraversed[0] = Players.field1295[var1]; // L: 560 + var11.plane = (byte)var8; // L: 561 + var11.resetPath((var9 << 13) + var3 - FloorDecoration.baseX, (var10 << 13) + var4 - WorldMapData_0.baseY); // L: 562 + var11.field664 = false; // L: 563 + return true; // L: 564 + } + } else if (var2 == 1) { // L: 566 + var3 = var0.readBits(2); // L: 567 + var4 = Players.Players_regions[var1]; // L: 568 + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 569 + return false; // L: 570 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 572 + var3 = var0.readBits(5); // L: 573 + var4 = var3 >> 3; // L: 574 + var5 = var3 & 7; // L: 575 + var6 = Players.Players_regions[var1]; // L: 576 + var7 = (var6 >> 28) + var4 & 3; // L: 577 + var8 = var6 >> 14 & 255; // L: 578 + var9 = var6 & 255; // L: 579 + if (var5 == 0) { // L: 580 + --var8; // L: 581 + --var9; // L: 582 + } + + if (var5 == 1) { // L: 584 + --var9; + } + + if (var5 == 2) { // L: 585 + ++var8; // L: 586 + --var9; // L: 587 + } + + if (var5 == 3) { // L: 589 + --var8; + } + + if (var5 == 4) { // L: 590 + ++var8; + } + + if (var5 == 5) { // L: 591 + --var8; // L: 592 + ++var9; // L: 593 + } + + if (var5 == 6) { // L: 595 + ++var9; + } + + if (var5 == 7) { // L: 596 + ++var8; // L: 597 + ++var9; // L: 598 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 600 + return false; // L: 601 } else { - return Huffman.Client_plane; + var3 = var0.readBits(18); // L: 603 + var4 = var3 >> 16; // L: 604 + var5 = var3 >> 8 & 255; // L: 605 + var6 = var3 & 255; // L: 606 + var7 = Players.Players_regions[var1]; // L: 607 + var8 = (var7 >> 28) + var4 & 3; // L: 608 + var9 = var5 + (var7 >> 14) & 255; // L: 609 + var10 = var6 + var7 & 255; // L: 610 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 611 + return false; // L: 612 } } } - @ObfuscatedName("gg") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "-1834411387" + descriptor = "(I)V", + garbageValue = "1826644624" ) - 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; // L: 6609 + static void method132() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 61 - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6610 6611 6616 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 6612 - var9 = var10; // L: 6613 - break; + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 62 + var1.clearIsFromIgnored(); // L: 64 + } + + } // L: 67 + + @ObfuscatedName("fv") + @ObfuscatedSignature( + descriptor = "(Lht;III)V", + garbageValue = "549022721" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3627 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !MusicPatchNode.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3628 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3629 + if (var3 == null) { // L: 3630 + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3631 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3632 + if (var3.contains(var4, var5)) { // L: 3633 + var4 -= var3.width / 2; // L: 3634 + var5 -= var3.height / 2; // L: 3635 + int var6 = Client.camAngleY & 2047; // L: 3636 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3637 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3638 + int var9 = var5 * var7 + var4 * var8 >> 11; // L: 3639 + int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3640 + int var11 = var9 + PlayerType.localPlayer.x >> 7; // L: 3641 + int var12 = PlayerType.localPlayer.y - var10 >> 7; // L: 3642 + PacketBufferNode var13 = class4.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); // L: 3644 + var13.packetBuffer.writeByte(18); // L: 3645 + var13.packetBuffer.method5674(var11 + FloorDecoration.baseX); // L: 3646 + var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3647 + var13.packetBuffer.writeShortLE(var12 + WorldMapData_0.baseY); // L: 3648 + var13.packetBuffer.writeByte(var4); // L: 3649 + var13.packetBuffer.writeByte(var5); // L: 3650 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3651 + var13.packetBuffer.writeByte(57); // L: 3652 + var13.packetBuffer.writeByte(0); // L: 3653 + var13.packetBuffer.writeByte(0); // L: 3654 + var13.packetBuffer.writeByte(89); // L: 3655 + var13.packetBuffer.writeShort(PlayerType.localPlayer.x); // L: 3656 + var13.packetBuffer.writeShort(PlayerType.localPlayer.y); // L: 3657 + var13.packetBuffer.writeByte(63); // L: 3658 + Client.packetWriter.addNode(var13); // L: 3659 + Client.destinationX = var11; // L: 3660 + Client.destinationY = var12; // L: 3661 + } } - } - if (var9 == null) { // L: 6618 - var9 = new PendingSpawn(); // L: 6619 - var9.plane = var0; // L: 6620 - var9.type = var3; // L: 6621 - var9.x = var1; // L: 6622 - var9.y = var2; // L: 6623 - WorldMapIcon_1.method375(var9); // L: 6624 - Client.pendingSpawns.addFirst(var9); // L: 6625 } - - var9.id = var4; // L: 6627 - var9.field964 = var5; // L: 6628 - var9.orientation = var6; // L: 6629 - var9.delay = var7; // L: 6630 - var9.hitpoints = var8; // L: 6631 - } // L: 6632 + } // L: 3664 } diff --git a/runescape-client/src/main/java/class90.java b/runescape-client/src/main/java/class90.java index f3066f558e..ebd2c7d000 100644 --- a/runescape-client/src/main/java/class90.java +++ b/runescape-client/src/main/java/class90.java @@ -1,268 +1,46 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cw") public class class90 { - @ObfuscatedName("gh") - static int[] regions; - - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "4" + descriptor = "Lkb;" ) - public static void method2138(String var0, String var1, int var2, int var3) throws IOException { - GZipDecompressor.idxCount = var3; // L: 40 - SoundSystem.cacheGamebuild = var2; // L: 41 + @Export("NetCache_reference") + static Buffer NetCache_reference; - try { - WorldMapRegion.field277 = System.getProperty("os.name"); // L: 43 - } catch (Exception var33) { // L: 45 - WorldMapRegion.field277 = "Unknown"; // L: 46 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-246202754" + ) + static int method2168() { + return 12; // L: 123 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-214239745" + ) + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 70 + if (var1 == null) { // L: 71 + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 72 73 } + } - JagexCache.field2094 = WorldMapRegion.field277.toLowerCase(); // L: 48 - - try { - UserComparator2.userHomeDirectory = System.getProperty("user.home"); // L: 50 - if (UserComparator2.userHomeDirectory != null) { // L: 51 - UserComparator2.userHomeDirectory = UserComparator2.userHomeDirectory + "/"; - } - } catch (Exception var32) { // L: 53 - } - - try { - if (JagexCache.field2094.startsWith("win")) { // L: 55 - if (UserComparator2.userHomeDirectory == null) { // L: 56 - UserComparator2.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (UserComparator2.userHomeDirectory == null) { // L: 59 - UserComparator2.userHomeDirectory = System.getenv("HOME"); - } - - if (UserComparator2.userHomeDirectory != null) { // L: 61 - UserComparator2.userHomeDirectory = UserComparator2.userHomeDirectory + "/"; - } - } catch (Exception var31) { // L: 63 - } - - if (UserComparator2.userHomeDirectory == null) { // L: 64 - UserComparator2.userHomeDirectory = "~/"; - } - - UserComparator4.field2005 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", UserComparator2.userHomeDirectory, "/tmp/", ""}; // L: 65 - class69.field570 = new String[]{".jagex_cache_" + SoundSystem.cacheGamebuild, ".file_store_" + SoundSystem.cacheGamebuild}; // L: 66 - int var18 = 0; - - label272: - while (var18 < 4) { - String var6 = var18 == 0 ? "" : "" + var18; // L: 70 - JagexCache.JagexCache_locationFile = new File(UserComparator2.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 - String var7 = null; // L: 72 - String var8 = null; // L: 73 - boolean var9 = false; // L: 74 - Buffer var11; - int var12; - int var14; - File var38; - if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 - try { - AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 78 - - for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83 - var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81 - if (var12 == -1) { // L: 82 - throw new IOException(); - } - } - - var11.offset = 0; // L: 85 - var12 = var11.readUnsignedByte(); // L: 86 - if (var12 < 1 || var12 > 3) { // L: 87 - throw new IOException("" + var12); - } - - int var13 = 0; // L: 88 - if (var12 > 1) { // L: 89 - var13 = var11.readUnsignedByte(); - } - - if (var12 <= 2) { // L: 90 - var7 = var11.readStringCp1252NullCircumfixed(); // L: 91 - if (var13 == 1) { // L: 92 - var8 = var11.readStringCp1252NullCircumfixed(); - } - } else { - var7 = var11.readCESU8(); // L: 95 - if (var13 == 1) { // L: 96 - var8 = var11.readCESU8(); - } - } - - var10.close(); // L: 98 - } catch (IOException var35) { // L: 100 - var35.printStackTrace(); // L: 101 - } - - if (var7 != null) { // L: 103 - var38 = new File(var7); // L: 104 - if (!var38.exists()) { // L: 105 - var7 = null; // L: 106 - } - } - - if (var7 != null) { // L: 109 - var38 = new File(var7, "test.dat"); // L: 110 - - boolean var40; - try { - RandomAccessFile var19 = new RandomAccessFile(var38, "rw"); // L: 114 - var14 = var19.read(); // L: 115 - var19.seek(0L); // L: 116 - var19.write(var14); // L: 117 - var19.seek(0L); // L: 118 - var19.close(); // L: 119 - var38.delete(); // L: 120 - var40 = true; // L: 121 - } catch (Exception var30) { // L: 123 - var40 = false; // L: 124 - } - - if (!var40) { // L: 127 - var7 = null; // L: 128 - } - } - } - - if (var7 == null && var18 == 0) { // L: 132 - label246: - for (int var20 = 0; var20 < class69.field570.length; ++var20) { // L: 133 - for (int var21 = 0; var21 < UserComparator4.field2005.length; ++var21) { // L: 134 - File var22 = new File(UserComparator4.field2005[var21] + class69.field570[var20] + File.separatorChar + var0 + File.separatorChar); // L: 135 - if (var22.exists()) { // L: 136 - File var23 = new File(var22, "test.dat"); // L: 138 - - boolean var42; - try { - RandomAccessFile var15 = new RandomAccessFile(var23, "rw"); // L: 141 - int var16 = var15.read(); // L: 142 - var15.seek(0L); // L: 143 - var15.write(var16); // L: 144 - var15.seek(0L); // L: 145 - var15.close(); // L: 146 - var23.delete(); // L: 147 - var42 = true; // L: 148 - } catch (Exception var29) { // L: 150 - var42 = false; // L: 151 - } - - if (var42) { // L: 154 - var7 = var22.toString(); // L: 155 - var9 = true; // L: 156 - break label246; // L: 157 - } - } - } - } - } - - if (var7 == null) { // L: 163 - var7 = UserComparator2.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 164 - var9 = true; // L: 165 - } - - File var37; - if (var8 != null) { // L: 167 - var37 = new File(var8); // L: 168 - var38 = new File(var7); // L: 169 - - try { - File[] var47 = var37.listFiles(); // L: 171 - File[] var44 = var47; // L: 173 - - for (var14 = 0; var14 < var44.length; ++var14) { // L: 174 - File var43 = var44[var14]; // L: 175 - File var24 = new File(var38, var43.getName()); // L: 177 - boolean var17 = var43.renameTo(var24); // L: 178 - if (!var17) { // L: 179 - throw new IOException(); - } - } - } catch (Exception var34) { // L: 184 - var34.printStackTrace(); // L: 185 - } - - var9 = true; // L: 187 - } - - if (var9) { // L: 189 - var37 = new File(var7); // L: 190 - var11 = null; // L: 191 - - try { - AccessFile var48 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 195 - Buffer var45 = new Buffer(500); // L: 196 - var45.writeByte(3); // L: 197 - var45.writeByte(var11 != null ? 1 : 0); // L: 198 - var45.writeCESU8(var37.getPath()); // L: 199 - if (var11 != null) { // L: 200 - var45.writeCESU8(""); - } - - var48.write(var45.array, 0, var45.offset); // L: 201 - var48.close(); // L: 202 - } catch (IOException var28) { // L: 204 - var28.printStackTrace(); // L: 205 - } - } - - File var5 = new File(var7); // L: 209 - JagexCache.cacheDir = var5; // L: 211 - if (!JagexCache.cacheDir.exists()) { // L: 212 - JagexCache.cacheDir.mkdirs(); - } - - File[] var36 = JagexCache.cacheDir.listFiles(); // L: 213 - if (var36 != null) { // L: 214 - File[] var39 = var36; // L: 216 - - for (int var25 = 0; var25 < var39.length; ++var25) { // L: 217 - File var26 = var39[var25]; // L: 218 - - boolean var46; - try { - RandomAccessFile var41 = new RandomAccessFile(var26, "rw"); // L: 223 - var12 = var41.read(); // L: 224 - var41.seek(0L); // L: 225 - var41.write(var12); // L: 226 - var41.seek(0L); // L: 227 - var41.close(); // L: 228 - var46 = true; // L: 230 - } catch (Exception var27) { // L: 232 - var46 = false; // L: 233 - } - - if (!var46) { // L: 236 - ++var18; // L: 67 - continue label272; - } - } - } - break; - } - - WorldMapDecoration.method406(JagexCache.cacheDir); // L: 243 - GraphicsObject.method2091(); // L: 244 - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(AbstractWorldMapIcon.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 245 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(AbstractWorldMapIcon.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 246 - JagexCache.JagexCache_idxFiles = new BufferedFile[GZipDecompressor.idxCount]; // L: 247 - - for (var18 = 0; var18 < GZipDecompressor.idxCount; ++var18) { // L: 248 - JagexCache.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(AbstractWorldMapIcon.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 249 - } - - } // L: 251 + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1147462173" + ) + public static int method2169(String var0) { + return var0.length() + 2; // L: 126 + } } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index 85aa7b6526..67eeb877d5 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -1,103 +1,45 @@ +import java.io.IOException; import java.math.BigInteger; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cq") public class class92 { - @ObfuscatedName("z") - static final BigInteger field1186; - @ObfuscatedName("k") - static final BigInteger field1187; - @ObfuscatedName("g") - static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("f") + static final BigInteger field1198; + @ObfuscatedName("b") + static final BigInteger field1197; static { - field1186 = new BigInteger("10001", 16); // L: 6 - field1187 = new BigInteger("966c96603c214f0c82e83159c85817fafbe6be59656eefede88f4b3d88a54a724b2cf5240c069e8654478ce882c03760ca0e6df1b9aa477f1357a6b74f87019581982517b5ade0af529e696b3b4c0ba5b89b4ff13e051485664f934bfb5cc71851706403454af6668eaa8ffc75f37c1e6f9f7fe62c32dad12e06a330baa04413", 16); // L: 7 + field1198 = new BigInteger("10001", 16); // L: 6 + field1197 = new BigInteger("a06bfdd9568298f630b8bd054ad4e6672231dffed57b38134e601756fa2a3443a6f0b423799b2d930bdc4c4213e63731504e130f4b4b1d5b21c8327e3f188eb1be3d8c1eca5ebe82c769bf3ef14b288fdd291fc951e5547262f62c171254701308d6106038c718cd10d503c59d12a4ed849a8eb4b3fae3f15212e22ae4918a4f", 16); // L: 7 } - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)Z", - garbageValue = "-1472251746" + descriptor = "(B)[B", + garbageValue = "60" ) - static boolean method2141(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 38 - boolean var3 = false; // L: 39 - boolean var4 = false; // L: 40 - int var5 = 0; // L: 41 - int var6 = var0.length(); // L: 42 + public static byte[] method2172() { + byte[] var0 = new byte[24]; // L: 310 - for (int var7 = 0; var7 < var6; ++var7) { // L: 43 - char var8 = var0.charAt(var7); // L: 44 - if (var7 == 0) { // L: 45 - if (var8 == '-') { // L: 46 - var3 = true; // L: 47 - continue; - } + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 312 + JagexCache.JagexCache_randomDat.readFully(var0); // L: 313 - if (var8 == '+') { // L: 50 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 52 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; // L: 53 - } else { - if (var8 < 'a' || var8 > 'z') { // L: 54 - return false; // L: 55 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 56 - return false; - } - - if (var3) { // L: 57 - var10 = -var10; - } - - int var9 = var5 * var1 + var10; // L: 58 - if (var9 / var1 != var5) { // L: 59 - return false; - } - - var5 = var9; // L: 60 - var4 = true; // L: 61 + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 314 315 316 } - return var4; // L: 63 - } else { - throw new IllegalArgumentException("" + var1); + if (var1 >= 24) { + throw new IOException(); // L: 318 + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { // L: 321 + var0[var2] = -1; + } } - } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1375275397" - ) - public static final void method2142() { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 94 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 95 - } // L: 96 - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "0" - ) - public static void method2143(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = Client.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); // L: 10863 - var4.packetBuffer.writeShort(var1); // L: 10864 - var4.packetBuffer.method5662(0); // L: 10865 - var4.packetBuffer.writeShort(var0); // L: 10866 - var4.packetBuffer.method5644(var2); // L: 10867 - Client.packetWriter.addNode(var4); // L: 10868 + return var0; // L: 323 } }